psr - spaces
psr - formatting
json - spaces
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.json
json - spaces