Merge branch 'master' of https://github.com/polyakov84/engine_vegatur
Merge branch 'master' of https://github.com/polyakov84/engine_vegatur

Conflicts:
	protected/runtime/application.log
Merge branch 'master' of https://github.com/polyakov84/engine_vegatur
Merge branch 'master' of https://github.com/polyakov84/engine_vegatur
small fix