First melonJS commit

Water logic implemented
Added PJ SpriteSheet

Collision box bug
Merge remote-tracking branch 'kotzi/master'

Conflicts:
	assets/metatiles.png
	assets/water.png
	data/testlevel.tmx
	js/character.js
	js/resources.js