JustRomanov
Merge remote-tracking branch 'origin/master' into ladoshki

Conflicts:
	application/controllers/home.php