changes
Merge branch 'master' of https://github.com/KostiantynKopytov/Cement

Conflicts:
	cement.server/server.log