Temporary submit
Minor formatting fixes
Merge branch 'feature/Danny' into develop
Username prompting
Merge branch 'develop' into feature/Lars

Conflicts:
	Med10Project/Assets/Data/Danny.xml
	Med10Project/Assets/Scripts/ObjectHandler.cs
Merge branch 'feature/Lars' into develop
Merge branch 'develop' into feature/Danny

Conflicts:
	Med10Project/Assets/Data/Danny.xml