update to angular 1.2
Merge branch 'update-angular'