makefile, merge with master
little collision changes
little collision update
simple tile menu
block edit
new 'map' (but few things in mob is needed for it to work :D)
Merge branch 'editor'

Conflicts:
	include/game.h
Merge branch 'mob'
makefile update