use templateUrl for confirmation modals
built
bower.json resolve conflict
Merge branch 'templateUrlModals' into ym

* templateUrlModals:
  bower.json resolve conflict
  built
  use templateUrl for confirmation modals

Conflicts:
	dist/forms-angular.js
	dist/forms-angular.min.js