MLHR-756 #comment updated tooltip #resolve
Merge branch 'master' into mem_levels.MLHR-756
Merge branch 'master' into mem_levels.MLHR-756

Conflicts:
	front/js/datatorrent/text.js
MLHR-768 #comment removed beefy from shrinkwrap because it is extraneous #resolve
Merge pull request #708 from andyperlitch/mem_levels.MLHR-756

Improved tooltip for memory usage in top-right corner
Merge pull request #709 from andyperlitch/rm_beefy.MLHR-768

Removed beefy from npm-shrinkwrap