Commented out the port-mappings tag in the Spring security configs.
Deleted the requires-channel attribute from the intercept-url tags for the login views in the Spring security configs.
Changed Spring security configuration from XML to Java.
Added CSRF token to login form even though CSRF needs to be fully implemented.
Merge branch 'master' into alt_security

Conflicts:
	src/main/webapp/WEB-INF/jsp/page/login/loginBody.jsp
	src/main/webapp/WEB-INF/spring/securityContext.xml
Enabled Spring Security CSRF.
Merge branch 'master' into alt_security
Added a custom port mapper for the web security config.
Commented out skipping the required channel settings in production in the web security config.
Changed the production HTTPS port to 443 in the web security config
Undid temporary changes to the web security config.
Merge branch 'master' into alt_security
Added a security filter to redirect /loginForm and /login to HTTPS in production.
Used the "X-Forwarded-Proto" request header to determine the scheme of the original URL in HyePyeSecurityFilter.
Fixed bugs and added logging in the HyePyeSecurityFilter.requiresRedirect method.
Simplified logging in HyePyeSecurityFilter.