Merge remote-tracking branch 'origin/master'

Conflicts:
	WebRoot/WEB-INF/classes/.gitignore
	WebRoot/index.html