Fix a lot of things
Merge branch 'master' of https://github.com/esiringame/LD2014

Conflicts:
	Assets/MainScene.unity