Merge branch 'master' of https://github.com/gregornemec/webLabURI

Conflicts:
	css/labRStyle.css
	js-dest/webLabURI.js
	js-src/labInterface.js
	labR.html

Fixing mearge fix.