Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into hotfix/smartcontent-performance
fixed collector
added ids to smat-content query builder
fixed testcases and added content query for internal links
finished internal links
adapted twig functions interfaces
added config
updated content navigation to take reset store argument
Merge pull request #173 from sulu-cmf/bugfix/reset-store

[BUGFIX] updated content navigation to take reset store argument
added type 'column options' to list toolbar
Merge pull request #174 from sulu-cmf/feature/listtoolbartype

[FEATURE] added type 'column options' to list toolbar
Initial
fixed navigation mapping
fixed code style
renamed content query
renamed content query
add image optimization
add comments
fixed test cases
fixed test cases