Merge registerSoft

Conflicts:
	javarsync/build/classes/jrsync/MJFrame.class
	javarsync/build/classes/jrsync/Register.class
Merge registerSoft

Conflicts:
	javarsync/build/classes/jrsync/MJFrame.class
	javarsync/build/classes/jrsync/Register.class
1
1
1
1
20141227 add backup log
Merge remote-tracking branch 'origin/master'

Conflicts:
	javarsync/build/built-jar.properties
	javarsync/build/classes/jrsync/MJFrame$1.class
	javarsync/build/classes/jrsync/MJFrame$10.class
	javarsync/build/classes/jrsync/MJFrame$11.class
	javarsync/build/classes/jrsync/MJFrame$12.class
	javarsync/build/classes/jrsync/MJFrame$13.class
	javarsync/build/classes/jrsync/MJFrame$14.class
	javarsync/build/classes/jrsync/MJFrame$2.class
	javarsync/build/classes/jrsync/MJFrame$3.class
	javarsync/build/classes/jrsync/MJFrame$4.class
	javarsync/build/classes/jrsync/MJFrame$5.class
	javarsync/build/classes/jrsync/MJFrame$6.class
	javarsync/build/classes/jrsync/MJFrame$7.class
	javarsync/build/classes/jrsync/MJFrame$8.class
	javarsync/build/classes/jrsync/MJFrame$9.class
	javarsync/build/classes/jrsync/MJFrame.class
	javarsync/dist/javarsync.jar
	javarsync/nbproject/private/private.xml