Merge branch 'daltonbranch' into dev with added home template and test files
added the side comment pane & soundcloud
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev
Merge branch 'daltonbranch' of https://github.com/c1moore/cen3031project into daltonbranch

Conflicts:
	public/modules/core/css/core.css
	public/modules/core/views/home.client.view.html
set ng-repeat for buttons with test data
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev
Merge branch 'daltonbranch' into dev

Conflicts:
	public/modules/core/css/core.css
	public/modules/core/views/home.client.view.html
Made User comments area a panel
Merge branch 'dev' into james_mocha_tests, prepare for merge to dev