Fixed versioning
Merge branch 'master' of https://github.com/oxygen-cms/application

Conflicts:
	composer.json