??
my part clear
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/cohesiva/apps/propertiescomparator/main/Main.java