Yarik / artbox-basic

# Conflicts:
#	composer.json

# Conflicts:
#	backend/views/layouts/main.php

# Conflicts:
#	backend/views/site/index.php