Merge pull request #5 from city41/master

Sync'ed with remote master
Updated with last stable version of melonJS
Merge pull request #59 from melonjs/master

Updated with last stable version of melonJS