view Sample Publication pages
Merge branch 'master' of https://github.com/CBIIT/cananolab

Conflicts:
	software/cananolab-webapp/web/index.html
	software/cananolab-webapp/web/scripts/app.js
publication page changes