fixed jump constants
Merge branch 'errol'
fixed timeout of invisibility and collision effects while invisible
tweaked game physics, implemented jump instead of jetpack shit
Merge branch 'ryan'

Conflicts:
	app/class_Jetpack.lua