Update AngularJS to 1.2.1
Merge pull request #2154 from eryx/master

Update AngularJS to 1.2.1