Maven work:
 - fix for "Could not find method org.apache.commons.codec.binary.Hex.encodeHexString" error by using "shaded" version of commons-codec which doesn't clash with Androids (see Dependencies/commons-codec-shaded/pom.xml)
 - we no longer include the 2 Xerces source files in the Library source, instead they are pulled in by maven from the appropriate (easily updateable) dependency (see Library/pom.xml)
 - made upgrade.bat also update the CollectorAndroid/AndroidManifest.xml

Instructions:
 - consult the "Instructions for installing maven" google doc (which we should move to a github wiki) and perform the new steps 11 & 12 to install additional eclipse plugins
 - There is no eclipse project for commons-codec-shaded (it's more or less impossible to get that working), so instead you must make sure commons-codec-shaded gets installed to your local maven repository. Do so by running "mvn clean install" in the Sapelli root folder, or in Dependencies/commons-codec-shaded
Merge branch 'master' of github.com:ExCiteS/Sapelli