added tests for feedback
Merge branch 'master' of https://github.com/bkimminich/juice-shop

Conflicts:
	test/client/controllersSpec.js
	test/client/servicesSpec.js