fix bug global url
Fix bug JSON format
Merge branch 'master' of https://github.com/vpoulain/alveolus-frontend

Conflicts:
	app/partials/user.html