remove column behavior feature that didn't work; small improvements
Merge branch 'master' into niix

Conflicts:
	ExportAction.php
small improvements