комит
Merge branch 'origin/master2'

Conflicts:
	application/modules/id/views/info.php
	application/views/welcome_message2.php