made adaptions on column options
cleanup code
fixed merge conflicts
Merge pull request #44 from sulu-cmf/feature/column-options

made adaptions on column options