Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/reorder-node
fixed code style
Merge branch 'feature/reorder-node' of git://github.com/sulu-cmf/sulu into feature/navigation-context