Level and character tweaks
Merge branch 'master' of https://github.com/dvera2/ggj2014

Conflicts:
	Assets/Prefabs/Level.prefab