Merge https://github.com/Gravezappa/Caffee.git
Merge https://github.com/Gravezappa/Caffee.git

Conflicts:
	src/main/java/com/caffee/servlets/BookServlet.java
	src/main/java/com/caffee/servlets/ImageServlet.java
	src/main/webapp/WEB-INF/JSP/book.jsp