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

Conflicts:
	Shiny/Heatmap/global.r