Version up to 1.5.2
Added seasonal icon for winter holidays
Updated hint in URL input field
Dumb update of Jelly Bean workaround app (just version up)
Merge pull request #324 from owncloud/last_minute_release-1.5.2

Last minute additions for release 1.5.2
Merge remote-tracking branch 'origin/release-1.5.2' into release-1.5.2
updated SETUP.md for Eclipse compile
made oc_framework a mvn project
updated compile instructions for mvn

oc_framework is a standalone mvn project which must be installed.
if anyone knows how to make oc_framework a submodule without changing the directory structure ... please do it!
[tx-robot] updated from transifex
Merge pull request #327 from LukeOwncloud/develop

fix/update mvn compile
File with just one chunk use the old non-chunked interface, so that they work in all the servers under 6.0
Removed legacy icons in JB workaround app
Merge branch 'master' into develop
Fixed version code in JB workaround app
Merge branch 'master' into develop
OC-2332: Isolate code to the upload a file to remove local dependences
[tx-robot] updated from transifex
OC-2388: Move ChunkedUploadFileOperation to the framework. UploadFileOperation select operation with or without chunks
Merge branch 'develop' into refactor_remote_operation_to_upload_file

Conflicts:
	src/com/owncloud/android/files/services/FileUploader.java