Merge branch 'transfer' of github.com:genomizer/genomizer-server into transfer

Conflicts:
	.idea/workspace.xml
Merge branch 'transfer' of github.com:genomizer/genomizer-server into transfer

Conflicts:
	src/transfer/HttpURLDummy.java