Changed version to 2.0.0-SNAPSHOT (we will only call it 2.0.0-betaX when actually building & releasing the beta)
Also fixed the updating of CollectorAndroid/AndroidManifest.xml in upgrade.bat

Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>