fixing various fxns for MetaMapR round 2
--

Merge branch 'master' of https://github.com/dgrapov/devium

Conflicts:
	R/Devium network functions.r
	Shiny/MetaboMapR/global.r
	Shiny/MetaboMapR/ui.r