adding margin bottom option
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	dist/ng-context-menu.js