Delete .cache
Merge branch 'master' into designtest

Conflicts:
	.cache