Update preferences.xml
Update FileStorageUtils.java
Update FileStorageUtils.java

Forget import.
Update FileStorageUtils.java
Update strings.xml
Update preferences.xml
Update strings.xml
Update preferences.xml
Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable
Merge branch 'develop' into instant_upload_path_chooseable
Fixed. Upload path is not place correctly in setting view
Fixed. App crash when setting a path without slash
Fixed. When define as instant upload path a path that does not exist, a crash is gotten
Fixed. App crashes when changing the path and not going to the file list. Rename some methods.
Fixed. File is not downloaded in the end, when adding a slash at the end of the path
[tx-robot] updated from transifex
Build with new Android support in Travis
Merge pull request #658 from owncloud/instant_upload_path_chooseable

Instant upload path chooseable
Merge with develop