user login ... json in response
Merge branch 'master' of https://github.com/mozillamonks/OfficeSharing

Conflicts:
	app.js