Merge branch 'develop'

Conflicts:
	.project
removed unused files und imports