Тайные начало
Merge branch 'master' of github.com:shadx/4service

Conflicts:
	tmp/Thumbs.db