Merged from stream
Merge branch 'master' of https://github.com/endoearth/ggj2014

Conflicts:
	Assets/Scenes/TestLevel.unity