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

Conflicts:
	PartyPeople/PartyPeople.v12.suo
	PartyPeople/cef.log
css fix