Yarik / artbox-basic

# Conflicts:
#	backend/views/site/index.php
#	common/config/settings.php
#	common/widgets/Alert.php
#	composer.lock
#	frontend/models/ContactForm.php
#	frontend/models/PasswordResetRequestForm.php
#	frontend/models/ResetPasswordForm.php
#	frontend/models/SignupForm.php
#	frontend/views/site/login.php
#	frontend/views/site/requestPasswordResetToken.php
#	frontend/views/site/resetPassword.php
#	frontend/views/site/signup.php

# Conflicts:
#	frontend/controllers/SiteController.php

# Conflicts:
#	frontend/views/layouts/main.php
#	frontend/web/css/custom.css