test
Merge branch 'master' of https://github.com/aj120426394/Jumper

Conflicts:
	limejs/Jumper/Jumper.html
	limejs/Jumper/Jumper.js
	limejs/Jumper/compiled/Jumper.js
	limejs/Jumper/conpiled/Jumper.html
	limejs/Jumper/conpiled/Jumper.manifest
	limejs/Jumper/conpiled/assets/icon.png
	limejs/Jumper/conpiled/assets/startup.jpg
	limejs/Jumper/conpiled/assets/startup_ipad.jpg