Merge pull request #59 from melonjs/master

Updated with last stable version of melonJS
Merge pull request #6 from city41/master

Merge pull request #59 from melonjs/master