added composer.phar in bin
updated dependencies
Merge branch 'master' into develop

Conflicts:
	.gitignore
	bin/composer.phar