Various minor changes
Merge branch 'master' of https://github.com/vidarn/ludum_dare31

Conflicts:
	data/levels/test.lua
	data/levels/test.tmx