reverted the tabbing and fixed the sample details page
Merge branch 'current-sprint' into prov-wizard

Conflicts:
	website/app/application/core/projects/project/project-controller.js
	website/app/application/core/projects/projects-controller.js