Add Unit Testing
no message
Merge branch 'master' of https://github.com/cherrylabs/arx

Conflicts:
	composer.lock
	vendor/composer/include_paths.php