Merge branch 'master' of https://github.com/buggedcom/PHP-Custom-Tags

Conflicts:
	composer.json
Merge branch 'master' of https://github.com/buggedcom/PHP-Custom-Tags