Merge branch 'Branch_master'

Conflicts:
	Stew/Stew-war/web/changelanguage.jsp
	Stew/Stew-war/web/index.jsp
Merge branch 'master' of https://github.com/tthanhlong/stew_server-1.1 into Branch_master

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