[server] fix typo
update webapp
Merge branch 'master' of github.com:inkdot/justap

Conflicts:
	tap_webapp/app/index.html
	tap_webapp/app/styles/main.scss
	tap_webapp/app/views/main.html