first commit
Merge branch 'master' of github.com:charlie/ui-bootstrap-modal-select-bug

Conflicts:
	package.json