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

Conflicts:
	app/index.html
Add angular-bootstrap to karma
Merge pull request #25 from CruGlobal/create-conference

Add dialog to create conference