t puswqMerge branch 'refactor_remote_operation_to_create_folder' into...

t puswqMerge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_rename_folder

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