Merge branch 'master' of https://github.com/valeri879/iam.ge

Conflicts:
	components/index/view.php
last work - logo php