啥冲突了？
Merge branch 'master' of https://github.com/mayrock/keg-operator-data

Conflicts:
	platform_restful/.classpath