ее
рррр
Merge branch 'origin/master2'

Conflicts:
	application/core/MY_Loader.php
	application/core/MY_Router.php
	application/models/db_module.php
	application/modules/id/controllers/id.php
	application/modules/id/controllers/upload.php
	application/modules/id/views/userpage.php
	application/readme.md
	application/third_party/MX/Base.php
	application/third_party/MX/Ci.php
	application/third_party/MX/Config.php
	application/third_party/MX/Lang.php
	application/third_party/MX/Loader.php
	application/views/reg.php
	application/views/welcome_message.php
	default.css
	jquery.simplemodal.1.4.4.min.js