Clean Arx Startup project
Merge branch 'master' of https://github.com/cherrylabs/arx-project

* 'master' of https://github.com/cherrylabs/arx-project:
  Update composer.json

Conflicts:
	composer.json