change the functions names
added the jaxb function
Merge branch 'master' of https://github.com/mayrock/keg-operator-data

Conflicts:
	Test_Connect/src/Test_con.java
	platform_restful/src/edu/thu/keg/mdap/restful/DsGetFunctions.java
	platform_restful/src/edu/thu/keg/mdap/restful/jaxbcr/MyJAXBContextResolver.java