Refactoring. Removed SyncDataActivity.java class (code was moved into SyncFragment.java).
Dealing with merge conflict