Bugfix
Merge branch 'master' into charakter_edit

Conflicts:
	Project/Project-csharp.sln
	Project/Project.sln
Bugfix
InGameGUI is now available in Scenes and is working
ReleaseMerge

Conflicts:
	Project/Project-csharp.sln
	Project/Project.sln
Merge branch 'gui_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into gui_edit

Conflicts:
	Project/Project-csharp.sln