ignore php/composer.lock
upgrade Sinergia to composer

Conflicts:
	php/composer.json
	thumb.php
update cdnjs before install it
Merge branch 'master' into develop