added temp directories for caching, but ignoring their contents
added temp directories for caching, but ignoring their contents
Merge develop

Conflicts:
	.gitignore
Merge branch 'develop'