fixed loads of bugs in js
Merge branch 'master' of git@github.com:SwitchSystems/sochimon.git

Conflicts:
	public/js/sochimon.js
Merge branch 'master' of git@github.com:SwitchSystems/sochimon.git