added snippet bundle
updated dependencies
Update UPGRADE.md
corrected build targets
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into develop
Refactoring to allow snippets
Allow local unversioned config
Added fixtures
Merge remote-tracking branch 'origin/hotfix/upgrade' into develop

Conflicts:
	composer.lock
updated composer
Merge pull request #297 from sulu-cmf/feature/local_config

Allow local unversioned config
Merge branch 'feature/snippets' of github.com:sulu-cmf/sulu-standard into feature/snippets

Conflicts:
	composer.lock
Merge branch 'master' of github.com:sulu-cmf/sulu-standard into develop
updated dependencies
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into develop

Conflicts:
	composer.lock
Merged with develop
added snippet bundle
Merge branch 'hotfix/288' into develop

Conflicts:
	composer.json
	composer.lock
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into develop

Conflicts:
	composer.lock
fix #312 add instructions for 0.8.2 upgrade