removed tests
updated
Merge develop

Conflicts:
	.gitignore
cleanup
trying to get temp folders into repo but not their content
Merge branch 'develop'