load ui-bootstrap
dialogs with ui-bootstrap
Merge remote-tracking branch 'origin/master' into dynamic-load

Conflicts:
	www/javascripts/app/dialogs.js
	www/javascripts/main.js