chore: update to angular 1.2.5
Merge remote-tracking branch 'origin/develop' into develop