Merge branch '0.9.9' of https://github.com/melonjs/boilerplate into 0.9.9

Conflicts:
	lib/melonJS-0.9.9-min.js
	lib/melonJS-0.9.9.js
Re-updating libs
wtf...