Committing web folder changes to fix git issue
Merge branch 'master' of https://github.com/CBIIT/cananolab

Conflicts:
	software/cananolab-webapp/web/scripts/controllers/viewSample.js
	software/cananolab-webapp/web/styles/main.css
	software/cananolab-webapp/web/views/viewSample.html