Switched to single sulu repo
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into merge_repos

Conflicts:
	composer.lock
Merge pull request #366 from sulu-cmf/merge_repos

Switched to single sulu repo
Update README.md
Revert "Update README.md"

This reverts commit 9c89c70a8517cff51b07cd84a0c422e820131755.
updated overview template => smart-content pagination
Update UPGRADE.md
updated uprage md
fix #359 change session store folder
use relative path for session folder from cache folder
Merge branch 'enhancement/359' into develop
removed param from upgrade
Merge branch 'feature/smart-content-load-data+' into develop
Merge branch 'develop'

Conflicts:
	composer.json
	composer.lock
updated dependencies