test commit
test 2
Merge branch 'master' of https://github.com/olegpts/cwm-ehsx-client.git

Conflicts:
	src/com/cwm/FieldAgentCWM.java
Merge branch 'master' of https://github.com/olegpts/cwm-ehsx-client.git

Conflicts:
	src/com/cwm/FieldAgentCWM.java