+ Update to branch
+ Update to branch
Merge branch 'Branch_master'

Conflicts:
	Stew/Stew-war/web/changelanguage.jsp
	Stew/Stew-war/web/index.jsp