no message
Merge branch 'develop' of https://github.com/psychic-archer/BrainstormR into develop

Conflicts:
	private/class/User/User.class.php