Merge branch 'feature/admin_api' of github.com:atomicobject/kinetic-c into feature/admin_api