Inserito composer.phar
Boxfile without composer
Merge branch 'rudolf/develop' into rudolf/testing

Conflicts:
	Boxfile