Added options rowActionButtons to module.config to allow addition of buttons to action column
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/module.config.php