12
Merge branch 'master' of https://github.com/VladiKiller/vlad.sait

Conflicts:
	application/classes/controller/welcome.php