[WCP-44] Refactoring email templates to use Velocity instead of being stored in Spring config file
[WCP-44] Removing mail messages and subjects from Spring context file. Moved Subject functionality to webapp.properties. Refactored message types / templates to be managed by an enum instead of hardcoded.
Revert "WCP-33 First JPA2 DAO implemented"

This reverts commit 693b2904701f552fff88892589d5b50206da3c83.
[WCP-44] Refactoring MailTemplateServiceIT to test the Velocity generated email message infrastructure. Refactoring MailTemplateServiceImpl to be more test friendly.
[WCP-44] Moving classpath generation for Velocity template into MailMessages to be more self contained.
Merge remote-tracking branch 'origin/uw-master' into uw-master
[WCP-51] Refactoring Spring Autowired injection to use overriden setter methods instead of direct fields
[WCP-56] Configuring portlet to make use of the Jasig Resource Server for CSS and JavaScript
[WCP-56] Adding compressJs controll to inline JavaScript
[WCP-5] Commenting out Internal Participant UI and Controller logic
[WCP-5] Refactoring logic for populating external participant data for display in edit session to fit with current iteration of the data model.
Revert "Revert "WCP-33 First JPA2 DAO implemented""

This reverts commit 07fa1c65e9e13dc0b40db862d1eb0c1961c9cc72.
Merge branch 'uw-master' into WCP-33

Conflicts:
	blackboardvc-portlet-webapp/src/main/java/org/jasig/portlet/blackboardvcportlet/mvc/sessionmngr/BlackboardVCPortletEditController.java
	blackboardvc-portlet-webapp/src/main/java/org/jasig/portlet/blackboardvcportlet/service/impl/RecordingServiceImpl.java
	blackboardvc-portlet-webapp/src/main/java/org/jasig/portlet/blackboardvcportlet/service/impl/SessionServiceImpl.java
Progres on merging