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

Conflicts:
	logs/caffee.log
	src/main/java/com/caffee/servlets/caffeeServlet.java
	src/main/resources/hibernate.cfg.xml
Merge https://github.com/Gravezappa/Caffee

Conflicts:
	logs/caffee.log
	src/main/java/com/caffee/servlets/caffeeServlet.java