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

Conflicts:
	platform_restful/.externalToolBuilders/MyBuilder1.launch
	platform_restful/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch
	platform_restful/.project