Merge branch 'master' of github.com:Jasig/cas into gh-pages

Conflicts:
	.gitignore
	README.md
	pom.xml
Merge branch 'gh-pages' of github.com:Jasig/cas into gh-pages