working on synciing with Amato
Merge branch 'master' of github.com:marcwright/angular_ui_router