Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	Booxtore-war/web/books.html
	Booxtore-war/web/navigation.html
	Booxtore-war/web/test.html