Merge remote-tracking branch 'origin/master'

Conflicts:
	ExcelTransfer/nbproject/private/private.xml
	ExcelTransfer/nbproject/project.properties
	ExcelTransfer/src/com/gtja/qh/Transfer.java
	ExcelTransfer/src/com/gtja/qh/TransferCtrl/TransferCtrl.java
	ExcelTransfer/src/com/gtja/qh/View/Frame.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	ExcelTransfer/nbproject/project.properties
	ExcelTransfer/src/com/gtja/qh/Transfer.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	ExcelTransfer/nbproject/private/private.xml