Merge remote-tracking branch 'origin/master'

Conflicts:
	ExcelTransfer/nbproject/project.properties
	ExcelTransfer/src/com/gtja/qh/Transfer.java