Started converting XML-based configuration to Annotation-based configuration. See applicationContexts.xml for new bean definitions.
Converted adminIndexController, statisticsController, runStatisticsController, currentlyAuthoredProjectsController, compatibilityCheckController.
Removed deprecated SimpleFormController from admin, student, contactWISE folders
Removed deprecated AbstractWizardFormController and replaced with @Controller: PasswordReminderWizardController and CreateRunController
Converted the controllers in the forgotaccount and teacher folders into annotation based controllers.
Continued converting XML-based configuration to Annotation-based configuration. See applicationContexts.xml for new bean definitions.
Converted LibraryController
Merged Geoff's changes with mine, resolved conflicts and errors.

Merge branch 'spring4.0.x' of https://github.com/WISE-Community/WISE into spring4.0.x

# By Geoffrey Kwan
# Via Geoffrey Kwan
* 'spring4.0.x' of https://github.com/WISE-Community/WISE:
  Converted the controllers in the forgotaccount and teacher folders into annotation based controllers.

Conflicts:
	src/main/resources/configurations/applicationContexts.xml
	src/main/resources/configurations/dispatcherServletContexts.xml
Upgraded Spring dependency from 3.2.9->4.0.5, removed compile-time errors
force call toString() on period name to get the integer value when setting up a run
- Continued converting XML-based configuration to Annotation-based configuration. See applicationContexts.xml for new bean definitions. Converted newsItemController, viewAllUsersController, enableDisableUserController, manageUserRolesController
updated java sdk version from 1.6 -> 1.7 so we can work with web socket api
use log4j for logging
Removed CustomContextLoader, which is replaced by CustomContextLoaderListener in spring 4.
Upgraded hibernate 3.6.10->4.3.5.  Woohoo!
Updated text on FAQ page
Portal: more Simplified Chinese translations by Nathan Z
- Continued converting XML-based configuration to Annotation-based configuration: IndexController, LoginController, PreviewProjectController, PreviewProjectListController, ExportProjectController
Put all hibernate configuration inside sessionFactory bean definition in applicationContexts.xml.
Removed hibernate.cfg.xml.
Replaced session.beginTransaction() and session.getTransaction().commit() with @Transactional annotation.
Continued converting XML-based configuration to Annotation-based configuration: updateRunController, teacherIndexController, manageAllProjectsController, managePortalController, studentIndexController
Continued converting XML-based configuration to Annotation-based configuration:
studentAttendanceService, announcementService, messageService, newsItemService, portalService, portalStatisticsService, wiseUpService,
bridgeController, messageController, importExternalProjectController, startProjectController, manageAnnouncementController