Merge branch 'master' of https://github.com/rpk7524/asksg
Add domain entities.
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/main/java/edu/rit/asksg/domain/Conversation_Roo_JavaBean.aj
	core/src/main/java/edu/rit/asksg/domain/Conversation_Roo_Jpa_Entity.aj
	core/src/main/java/edu/rit/asksg/domain/Message_Roo_JavaBean.aj
	core/src/main/java/edu/rit/asksg/domain/Message_Roo_Jpa_Entity.aj
	core/src/test/java/edu/rit/asksg/domain/ConversationDataOnDemand_Roo_DataOnDemand.aj
	core/src/test/java/edu/rit/asksg/domain/MessageDataOnDemand_Roo_DataOnDemand.aj
	core/src/test/java/edu/rit/asksg/domain/MessageIntegrationTest_Roo_IntegrationTest.aj
	web/src/main/java/edu/rit/asksg/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
	web/src/main/java/edu/rit/asksg/web/ConversationController_Roo_Controller.aj
	web/src/main/java/edu/rit/asksg/web/MessageController_Roo_Controller.aj
	web/src/main/webapp/WEB-INF/views/conversations/create.jspx
Add domain entities.