Add phpctags and upgrade versions
Merge branch 'master' of https://github.com/EHER/php-tools

Conflicts:
	composer.lock