Merge branch 'develop' into refactor_remote_operation_to_rename_folder

oc_framework/res/values/empty.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources/>

project.properties

@@ -9,5 +9,5 @@
 
 # Project target.
 target=android-19
-android.library.reference.1=actionbarsherlock\\library
+android.library.reference.1=actionbarsherlock/library
 android.library.reference.2=oc_framework