spring 4
Merge branch 'develop' of github.com:smmckay/encoding-junk into develop

Conflicts:
	pom.xml
	src/main/java/us/abbies/b/encodingutil/WebAppConfig.java
	src/main/java/us/abbies/b/encodingutil/WebAppController.java
	src/main/java/us/abbies/b/encodingutil/WebAppInitializer.java
	src/main/java/us/abbies/b/encodingutil/validation/CanDecodeCharset.java
	src/main/java/us/abbies/b/encodingutil/validation/CanEncodeCharset.java
	src/main/webapp/index.html
	src/main/webapp/static/css/bootstrap-theme.css
	src/main/webapp/static/css/bootstrap-theme.min.css
	src/main/webapp/static/css/bootstrap.css
	src/main/webapp/static/css/bootstrap.min.css
	src/main/webapp/static/fonts/glyphicons-halflings-regular.eot
	src/main/webapp/static/fonts/glyphicons-halflings-regular.svg
	src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf
	src/main/webapp/static/fonts/glyphicons-halflings-regular.woff
	src/main/webapp/static/js/bootstrap.js
	src/main/webapp/static/js/bootstrap.min.js
	src/main/webapp/static/js/encodingutil.js
	src/test/java/us/abbies/b/encodingutil/WebAppControllerTest.java