Zwischenstand
Zwischenstand
Zwischenstand
Zwischenstand
Zwischenstand
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	app/scripts/_configs/config.js
	app/scripts/controllers/BookListCtrl.js
	app/scripts/services/bookDataService.js
	app/scripts/services/dataEnhancer.js
	test/unit/services/bookDataService.spec.js
Zwischenstand
Merge remote-tracking branch 'origin/master'
Zwischenstand
Merge branch 'master' of github.com:justphil/ajs-workshop-okt14