Merge origin/master

Conflicts:
	Booxtore-war/web/WEB-INF/glassfish-web.xml
	Booxtore-war/web/index.html
Merge origin/master