ok
Merge branch 'master' of https://github.com/alienlaboratories/sync

Conflicts:
	requirements.txt
ok