Leveldesign weiter vervollständigt
Merge branch 'gui_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into gui_edit
kA warum dieser commit wieder ne Extrawurst braucht ;)
ReleaseMerge 18.05.2014

Conflicts:
	Project/Assets/Scenes/Leveldesign.unity
	Project/Project-csharp.sln
	Project/Project.sln