Trying to get a Twilio test to work.
Fixed Twilio test. Now successfully texts me.
Dunno why this doesn't work. Test passes though.
Merge remote-tracking branch 'origin/master' into daniel

Conflicts:
	src/main/java/edu/rit/asksg/analytics/Chatterbox_Roo_Jpa_Entity.aj
	src/main/java/edu/rit/asksg/domain/Conversation_Roo_JavaBean.aj
	src/main/java/edu/rit/asksg/domain/Twilio_Roo_Jpa_Entity.aj
	src/main/java/edu/rit/asksg/domain/config/EmailConfig_Roo_Jpa_Entity.aj
	src/main/java/edu/rit/asksg/domain/config/ProviderConfig_Roo_JavaBean.aj
	src/main/java/edu/rit/asksg/domain/config/ProviderConfig_Roo_Jpa_Entity.aj
	src/main/java/edu/rit/asksg/domain/config/RedditConfig_Roo_Jpa_Entity.aj
	src/main/java/edu/rit/asksg/domain/config/SpringSocialConfig_Roo_JavaBean.aj
	src/main/java/edu/rit/asksg/domain/config/SpringSocialConfig_Roo_Jpa_Entity.aj
	src/main/java/edu/rit/asksg/domain/config/SpringSocialConfig_Roo_Json.aj
	src/main/java/edu/rit/asksg/domain/config/TwilioConfig_Roo_Jpa_Entity.aj
	src/main/java/edu/rit/asksg/service/ConfigServiceImpl_Roo_Service.aj
	src/main/java/edu/rit/asksg/service/ConfigService_Roo_Service.aj
	src/main/java/edu/rit/asksg/web/ConfigController_Roo_Controller_Json.aj
Hopefully fixing issue that prevented system startup.