Commit 1 5-4-2012
Update POMs for UW development branch
Merge branch 'master' into uw-master
Merge remote-tracking branch 'uw/uw-uiwork' into uw-master
FinalGradesPortletView
Merge remote-tracking branch 'uw/uw-uiwork' into uw-master
Initial integration of UW grades webservice
Enable caching of term and course summary data
Switch to release of grades WS
Add attach-classes to war plugin
FinalGradesGGG
FinalGradesUI
Merge remote-tracking branch 'uw/uw-uiwork' into uw-master
Update module names
updated grades.jsp to use spring:message for H2 tag
updated message.properties to use term and grades spring:message
tags
Updated DemCourseDao.java to use catalog number instead of class number
Merge remote-tracking branch 'uw/uw-master' into uw-master

Conflicts:
	courses-portlet-webapp/src/main/webapp/WEB-INF/jsp/grades.jsp
Add error handling views

Fix module names
Add error handling views for missing emplid and exceptions
Clean up logging config
Add timeouts to self-populating cache locks
Added code for CurGPA
Merge branch 'uw-master' of https://vogeljames@github.com/UW-Madison-DoIT/CoursesPortlet.git into uw-master
Added code to show school before course code