Merge branch 'develop' of github.com:owncloud/android into setup_md
mention contributor-agreement in SETUP.md
"follow" instead of "obey"
A new patch for concurrency in SynchronizeFolderOperations
positive description about what app does
Merge pull request #287 from LukeOwncloud/setup_md

Setup.md updated.
Reset in policy of synchronization for full account: etag is ignored to decide if sync children folders
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
Merge pull request #269 from owncloud/refresh_folder_contents_when_browsed_into

Refresh folder contents when browsed into
Update package name
Removed urls.xml and moved last URLs to setup.xml
Update strings
Update Social Links
update jackrabbit webdav lib to version 2.6.3
update to 2.6.4 (latest stable version)
Update Images
bump to 2.6.4 for maven
Update colors
Fix error in AndroidManifest
Removed problematic target assignation in setup_env.bat, and improved setup of test project to avoid change of folders