collapse
Merge branch 'master' of github.com:khayk/mygithub

Conflicts:
	doc-processor/src/automation/Range.cpp
	doc-processor/src/automation/Range.h