fixed nadd tempalte bug
fixed code style
cleaned code
Merge branch 'feature/additional-tabs' of git://github.com/sulu-cmf/SuluContentBundle into feature/additional-tabs
Merge branch 'feature/additional-tabs' into develop
Merge branch 'develop' into feature/internal_links