Added angular.js, the non-minified version, for better debug messages.
Merge remote-tracking branch 'origin/master'

Conflicts:
Some tiny improvement.