Fixed lots of angular issues
Merge remote-tracking branch 'upstream/master' into dev
Notes update.