Message history
Merge origin/develop into develop

Conflicts:
	protected/views/profile/registrationFlow_1.php
Message history view
Calendar fixes and integration with silicon gardens
Merge origin/develop into develop