Add contextmneu without any functionality.
Merge remote-tracking branch 'origin/feature-hierarchy' into feature-hierarchy

Conflicts:
	app/assets/javascripts/application.js