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

Conflicts:
	src/main/webapp/WEB-INF/tiles.xml
Merge https://github.com/Gravezappa/Caffee.git