updated with angular 1.2
Merge remote-tracking branch 'origin/development' into development