merge with unkonown
Merge branch 'master' of https://github.com/mayrock/keg-operator-data

Conflicts:
	platform/src/edu/thu/keg/mdap_impl/provider/HiveProvider.java