Merged client js scripts
Merged conflict on client index.html
Merge branch 'master' of github.com:wildtron/focus