.
Merge branch 'master' of https://github.com/bgatev/Asclepius

Conflicts:
	cef.log
unfinished user login