update to angular 1.2.1 (skipping over _private 1.2.0)
Merge branch 'develop' into angular-1.2.1