MiniFix
blabla
Merge branch 'master' of https://github.com/systemKMP/AAU-CPH-2014-MED5

Conflicts:
	Assets/Standard Assets.meta
	Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll