added a bunch of different stuff
Merge branch 'testing-angular-ui'