Fixed javascript in browser and stuff
Merge branch 'master' of github.com:ZeusWPI/hydra