first deploy
migrate phpinfo to composer
Merge branch 'master' into develop

Conflicts:
	component.json
	php/composer.json
	php/composer.lock
	php/tpl/layout/_vendors-css.php
ignore php/composer.lock
re-add sinergia/gd
upgrade Sinergia to composer
Merge branch 'develop' of https://github.com/neves/paliari
Merge branch 'master' of github.com:neves/paliari