Switch from angularStrap to AngularUi companions
Merge angularui branch to master