Merge branch 'Messaging1' of https://github.com/myadventure/MyadVenture into Messaging1

Conflicts:
	grails-app/controllers/TEC/MessageController.groovy
	grails-app/views/message/_form.gsp
	grails-app/views/profile/page.gsp
	target/classes/TEC/MessageController.class
Merged message
message merge