v1
Merge branch 'master' of github.com:christravis/play-global-security-example

Conflicts:
	LICENSE