added some more automatically generated stuff that should be ignored by default
Merge branch 'develop'

Conflicts:
	.gitignore