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
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

cleanup my messed up merge.   revert to 1.6 until I can get 1.7 installed on my mac.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 2 different commits each, respectively.
#
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	new file:   .gitignore
#	deleted:    .idea/compiler.xml
#	deleted:    .idea/copyright/profiles_settings.xml
#	deleted:    .idea/description.html
#	deleted:    .idea/encodings.xml
#	deleted:    .idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
#	deleted:    .idea/libraries/Maven__mysql_mysql_connector_java_5_1_30.xml
#	deleted:    .idea/libraries/Maven__org_mybatis_mybatis_3_2_7.xml
#	deleted:    .idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_2.xml
#	deleted:    .idea/libraries/Maven__org_springframework_spring_aop_4_0_3_RELEASE.xml
#	deleted:    .idea/libraries/Maven__org_springframework_spring_beans_4_0_3_RELEASE.xml
#	deleted:    .idea/libraries/Maven__org_springframework_spring_context_4_0_3_RELEASE.xml
#	deleted:    .idea/libraries/Maven__org_springframework_spring_core_4_0_3_RELEASE.xml
#	deleted:    .idea/libraries/Maven__org_springframework_spring_expression_4_0_3_RELEASE.xml
#	deleted:    .idea/libraries/Maven__org_springframework_spring_jdbc_4_0_3_RELEASE.xml
#	deleted:    .idea/libraries/Maven__org_springframework_spring_test_4_0_3_RELEASE.xml
#	deleted:    .idea/libraries/Maven__org_springframework_spring_tx_4_0_3_RELEASE.xml
#	deleted:    .idea/misc.xml
#	deleted:    .idea/modules.xml
#	deleted:    .idea/project-template.xml
#	deleted:    .idea/runConfigurations/AppTests.xml
#	deleted:    .idea/runConfigurations/HelloApp.xml
#	deleted:    .idea/scopes/scope_settings.xml
#	deleted:    .idea/vcs.xml
#	modified:   pom.xml
#	modified:   src/main/java/org/mysql2sforce/MySqlSchemaMetadataService.java
#	modified:   src/main/java/org/mysql2sforce/SchemaMetadataService.java
#	modified:   src/main/java/org/mysql2sforce/SchemaSyncMain.java
#	modified:   src/main/java/org/mysql2sforce/metamodel/MySqlColumn.java
#