Signed-off-by: Tyurin D <fobia3d@gmail.com>
Merge origin/develop into develop

Conflicts:
	composer.json
ignore tmp
edit conf