Merge origin/Dev

Conflicts:
	Booxtore-war/web/img/books_thmb/1.jpg
	Booxtore-war/web/img/books_thmb/2.jpg
	Booxtore-war/web/img/books_thmb/hd2-1.jpg
	Booxtore-war/web/navigation.html
Merge origin/master
Merge origin/Dev

Conflicts:
	Booxtore-war/web/img/books_thmb/1.jpg
	Booxtore-war/web/img/books_thmb/2.jpg
	Booxtore-war/web/img/books_thmb/hd2-1.jpg
	Booxtore-war/web/navigation.html