mostly ;
Merge branch 'master' of https://github.com/mkrbins/biofresh-data-portal.git
Merge branch 'master' of
https://github.com/mkrbins/biofresh-data-portal.git

Conflicts:
	web-app/js/resultspage.js
small changes