Merge branch 'master' of https://github.com/digilette/icg

Conflicts:
	composer.json
merge