Initial commit for caching
Merge remote-tracking branch 'origin/master' into caching

Conflicts:
	src/model/Model.java
Merge remote-tracking branch 'origin/caching'