modify by liangliang
Merge branch 'develop' of https://github.com/FutureTV/db-service-provider into develop

Conflicts:
	db-service-app/db-service-app.iml
	db-service-core/db-service-core.iml
	db-service-core/pom.xml
	db-service-core/src/main/java/tv/icntv/db/core/repository/HbaseRepository.java