Merging back hotfixes

Merge branch 'master' into develop
Merging hotfixes

Merge branch 'master' into develop
Starting to use Physijs
Moved static files to the MVML server. Makes more sense for now
Added physics to object configs and controls
New specs
Got jumping working
Changed init.d script to upstart
Don't need that .pid file right now