GetActualUser
Merge branch 'master' of https://github.com/meip/bettermeeting

Conflicts:
	public/partials/meeting/note.html