Add dialog to create conference
jshint
Merge branch 'master' into create-conference

Conflicts:
	app/index.html
Fixed duplicate block ids in mockHttpBackend
Merge pull request #29 from CruGlobal/checkboxFix

Fixed duplicate block ids in mockHttpBackend
Add angular-bootstrap to karma
Merge pull request #25 from CruGlobal/create-conference

Add dialog to create conference
Merge branch 'master' into api-integration-structural-changes

Conflicts:
	app/scripts/app.js