- fix bug
- bugfix
Merge remote-tracking branch 'upstream/develop' into
bugfixMultipleSelect

Conflicts:
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
rebase
Merge pull request #686 from tobiasKaminsky/bugfixMultipleSelect

Bugfix multiple select