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