"npm install" ruft nun auch "bower install" auf
added rating attribute to the API json
Merge pull request #22 from SchweizerischeBundesbahnen/feature/STZE/setup

"npm install" ruft nun auch "bower install" auf
no todo
Merge pull request #25 from SchweizerischeBundesbahnen/feature/STZE/no_todo
introduced DialogService and a catch-all Exception Handler for all errors
Merge pull request #26 from SchweizerischeBundesbahnen/dialog-service-and-err-handling

DialogService and Error Handler
unit test for TrackController and ConferenceService, jshint mods
updated angular & bootstrap versions to latest
removed firefox and chrome as karma browsers since Travis doesn't support them
Merge pull request #28 from SchweizerischeBundesbahnen/feature/kgu/unit-tests-angular-travis-update

Feature/kgu/unit tests angular travis update
added installation instructions and modified markdown
I hate line breaks
added pictures because i hate all those 404 errors in the log. and i like
chuck norris, too. ROUNDHOUSE KICK!
show details of a talk in a modal dialog instead of toggling the details
on the main tracks view
clean up unneeded stuff
added a test for the talk view
Merge pull request #30 from SchweizerischeBundesbahnen/feature/mfr/talkdetailview

Feature/mfr/talkdetailview
Merge branch 'develop' into feature/mfr/rating

Conflicts:
	Gruntfile.js
	bower.json