Fix Bug #412
Migration to Android Studio 1.0 and code rearrange
Merge with deletingLocalItemsWhenNotFoundOnServer