Added karma test for the comments area
Merge branch 'daltonbranch' into dev

Conflicts:
	public/modules/core/tests/buttons.home.client.controller.test.js
Installed supertest and added to dependencies
Updated angular. Oh I hope this doesn't break anything...
Merge branch 'dev' of https://github.com/c1moore/cen3031project into james_routeso