Merge branch 'master' of ssh://overbyte.ru:228/project/sosfond/git/site

Conflicts:
	lib/model/Project.php