环境
Merge branch 'master' of https://github.com/vscom/Transmit.git

Conflicts:
	.classpath
	.settings/org.eclipse.core.resources.prefs
	WebRoot/WEB-INF/classes/config.properties
	src/config.properties