changed .NET to Version 4
added uml diagram
Merge branch 'dev' of https://github.com/Softwareprojekt/Sisyphus into dev

Conflicts:
	.gitignore