Monica, Edward: Add Angular stuffs. Needs A LOT of cleaning.
Merge remote-tracking branch 'origin/master'