Upgrades angular to 1.2.10
Merge remote-tracking branch 'origin/master'