Kind of collision, movement almost finished, added parameteters..
premerge
Merge branch 'daniel' into robin

Conflicts:
	Assets/Scripts/scr_movementLogic.cs
separated collision into its ownsript
prefab updated
removed some unused stuff and fixed the playerprefab
rescaled to match the real life scales
Commit of savetheworld