c
Merge branch 'master' of https://github.com/eugenekharkov/master

Conflicts:
	Ciklum.Client/App.config