Show proper header message for user and admin.
Merge branch 'master' into show_proper_header

Conflicts:
	app/assets/javascripts/kiitos/user_dashboard.js.coffee
Merge pull request #62 from crowdint/show_proper_header

Show proper header message for user and admin.