Spring Security
Merge remote branch 'origin/master'

Conflicts:
	WebContent/resources/JS/script.js