Registering of devices
Merge branch 'develop' of https://github.com/ninjablocks/client into develop