merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	seree/WebRoot/WEB-INF/classes/.gitignore