Version++
Merge branch 'developing' into beta

Conflicts:
	AndroidManifest.xml
	res/raw/changelog.txt
Version++
Merge branch 'developing' into beta
Prepared for Mirakel v2.1.3
Fix DB-Export-Bug
Updated Changelog
Merge branch 'master' into beta
Ugly fix for APK_NAME is null
Merge branch 'beta' of github.com:azapps/mirakel-android into beta
Merge branch 'beta' into calDavSync
If due is null, null should be returned