some files I missed
Merge branch 'master' of https://github.com/tahoe-gary/mysql-sforce-adapter

Conflicts:
	.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
	.idea/libraries/Maven__junit_junit_4_8_2.xml
	.idea/libraries/Maven__log4j_log4j_1_2_17.xml
	.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_2.xml
	.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_2.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/project-template.xml
	.idea/runConfigurations/AppTests.xml
	.idea/runConfigurations/HelloApp.xml
	mysql-sforce-adapter.iml
	pom.xml