Merge branch 'angular1.2'
upgraded to angular 1.2 and angular-ui in prep for cutover to bootstrap
switched build to use bower
Merge branch 'master' into angular1.2