Unable to update email fixed
Merge branch 'master' of https://github.com/horensen/nusbridge

Conflicts:
	app_datastore.py
	nusbridge.py