fixed #275. changed update password to sync password
fixed layout for location trigger edit
added ability to send device id with OhmageAnalytics
updated version info
Merge branch '2.14' into mobilize

Conflicts:
	AndroidManifest.xml
we want to log the device id for mobilize