few extra details
Merge branch 'master' of https://github.com/404-NameNotFound/Claudia

Conflicts:
	Claudia/Content/Maps/greybox.umap
	Claudia/Content/Maps/greybox3d.umap
	Claudia/Saved/Config/Windows/EditorLayout.ini
	Claudia/Saved/Config/Windows/EditorUserSettings.ini
	Claudia/Saved/Config/Windows/Engine.ini
	Claudia/Saved/Logs/Claudia.log
Final push form uni for 2014!