Yarik / artbox-basic

# Conflicts:
#	composer.json

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

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

# Conflicts:
#	behaviors/LanguageBehavior.php
#	components/LanguageRequest.php
#	components/LanguageUrlManager.php
#	controllers/SettingsController.php
#	language_instruction.txt
#	models/Feedback.php
#	models/FeedbackSearch.php
#	models/Language.php
#	models/Page.php
#	models/PageLang.php
#	models/PageSearch.php
#	models/User.php
#	widgets/LanguageForm.php
#	widgets/LanguagePicker.php
#	widgets/views/language_form_frame.php
#	widgets/views/view.php

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