Fix Welcome, user text on header
Merge branch 'release' of https://github.com/interactive-events/web-app into release

Conflicts:
	app/scripts/controllers/singleevent.js