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

Conflicts:
	.idea/artifacts/Caffee_war_exploded.xml
	.idea/workspace.xml
	Caffee.iml
Merge https://github.com/Gravezappa/Caffee