Merge branch 'calDavSync' into developing

Conflicts:
	src/de/azapps/mirakel/model/DatabaseHelper.java
Merge branch 'calDavSync' into developing

Conflicts:
	src/de/azapps/mirakel/model/DatabaseHelper.java
Merge branch 'developing' of github.com:azapps/mirakel-android into developing
Started implementing #167
Started implementing settings for #167
First working implementation of #167