Added support for device registration from android
Merge branch 'master' of https://github.com/sh4d0wz/Lifeline

Conflicts:
	mule/lifeline/flows/lifeline.mflow