Remove unused hello.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	ui/app/views/main.html
Fixing stuff