Merge origin/master

Conflicts:
	Booxtore-war/src/java/com/booxtore/webBusiness/managedBeans/Auth.java
Merge origin/master