corrected wrong order of merge
Merge pull request #33 from sulu-cmf/bugfix/merge

corrected wrong order of merge