Hacking around with Sync Adapter
Merge remote-tracking branch 'origin/master'

Conflicts:
	wudu-android-core/build.gradle
Hacking around with Sync Adapter