Conflicts: oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java