commit jfieldname
Merge branch 'master' of https://github.com/mayrock/keg-operator-data

Conflicts:
	platform_restful/src/edu/thu/keg/mdap/restful/DataSetFunctions.java