updated for angular 1.2
Merge branch 'origin/master'