Update
Merge branch 'master' of git://github.com/alairock/jacen

Conflicts:
	composer.json