Merge origin/master

Conflicts:
	Booxtore-war/web/admin_area/navigation.html
Merge origin/master
Merge origin/master

Conflicts:
	Booxtore-war/web/admin_area/navigation.html