Minimum vitale
Cleaning
Merge branch 'master' of github.com:Jmoati/Companion

Conflicts:
	composer.json
	composer.lock