dirty merge of changes from php storm stage1
Merge branch 'master' of github.com:OlgaRybacka/VH_strona into merge

Conflicts:
	app/index.php
	app/search.php