Arxmin CMS
Merge branch 'master' of https://github.com/cherrylabs/arx-arxmin

Conflicts:
	composer.json