CLC-3881: Update angular to 1.2.18
https://jira.ets.berkeley.edu/jira/browse/CLC-3881
CLC-3895 - jscs - errors on removed rules
https://jira.ets.berkeley.edu/jira/browse/CLC-3895
Merge pull request #2652 from christianv/CLC-3881

CLC-3881: Update angular to 1.2.18 & CLC-3895 - jscs