stylings of content; cleanups
Merge branch 'feature/stylings' into develop
added get-id to current user data
Merge branch 'feature/get-current-user-id' into develop
Merge branch 'develop' of git://github.com/sulu-cmf/SuluAdminBundle into develop
changed confusing comment
fixed merge conflicts