Merge origin/master

Conflicts:
	bookStore/src/bookstore/BookStore.java
Merge origin/master