20140617_Commit
Merge branch 'gui_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into gui_edit

Conflicts:
	Project/Assets/Scenes/Leveldesign_Lukas.meta
	Project/Assets/Scenes/Leveldesign_Lukas/NavMesh.asset
	Project/Assets/Scenes/Leveldesign_Lukas/NavMesh.asset.meta
	Project/Project-csharp.sln
	Project/Project.sln
Keine Ahnung, wofür dieser Commit wieder nötig ist! ;)
Merge branch 'gui_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into gui_edit

Conflicts:
	Project/Assembly-CSharp-firstpass-vs.csproj
	Project/Assembly-CSharp-firstpass.csproj
	Project/Assembly-CSharp-vs.csproj
	Project/Assembly-CSharp.csproj
	Project/Assets/Materials/tile_floor_tiled_A_dff.mat.meta
	Project/Assets/Scenes/Leveldesign_Benny.meta
	Project/Assets/Scenes/Leveldesign_Benny.unity.meta
	Project/Assets/Textures/New/Materials/city-background-18298-18762-hd-wallpapers.jpg 1.mat.meta
	Project/Assets/Textures/New/Materials/hilfsansicht_test.mat.meta
	Project/Project-csharp.sln
	Project/Project.sln
merge
Backup