add composer support
fixed test for composer
Merge branch 'master' into composer-rebase

Conflicts:
	.gitignore
	composer.json