ignore cache
Merge branch 'development'

Conflicts:
	.gitignore
Deleting existing cache
Merge branch 'development'