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
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into feature/node-properties

Conflicts:
	Resources/config/routing.yml
	Resources/public/dist/components/content/main.js
added dist file
fixed item change bug
fixed item change bug
cleaned code
Merge branch 'feature/internal_links' into develop
fixed webspace identifier