Update composer files
Merge branch 'master' of git://github.com/khusamov/alternativa.online

Conflicts:
	composer.phar