Enabled composer
Enabled composer
Merge
Merge branch 'composer'
Merge branch 'master' of https://github.com/nikrolls/SS_FirePHP

Conflicts:
	composer.json