Fixes to grunt watch
Angular loading and working on login page
Need socket connection at this point
Merge remote-tracking branch 'origin/master'