Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	jquery-cors-cas-ajax/app/scripts/jquery-cors-cas-ajax.js
	mod2/src/main/java/com/steviesmith/mod2/ContentTypeConvertingFilter.java