Merge branch 'angular_upgrade' into issue_second_page
Merge branch 'ui-bootstrap-2' into issue_second_page

Conflicts:
	ownership/js/controllers/security_wizard.js
Merge branch 'ui-bootstrap-2' into issue_second_page
convert select2 to typeahead on issue second page
Merge branch 'issue_second_page' into testing

Conflicts:
	ownership/js/controllers/security_wizard.js
Merge branch 'testing' of github.com:sharewave/frontus into testing