Merge origin/master

Conflicts:
	Booxtore-ejb/src/java/com/booxtore/business/BookAccessor.java
	Booxtore-war/web/navigation.html
Merge origin/master