common
Merge branch 'master' of https://github.com/ravidoki/ContractorPA.git

Conflicts:
	src/cpa/config.js