test
Merge branch 'master' of https://github.com/futureage/phoenix-hbase.git

Conflicts:
	.gitignore
for mutiversion