Revert "Improve connection failure robustness"
Revert the single thread update
This reverts commit ee971621f4a5c62b0d2301f2dd661c3c128abf1f.
and also :
08d45bf8c50436540dcda19dcb11b2da70d31694
4a3e0169a3197b476b448a83ec1ac67467c472f0
902beebfa64cd50a45d9b08290a13794d3dca9bb
Fix elapsed time for streams.
Fix URL encoding for Http local cover fetcher.
JMPDComm's Music:getParent doesn't throw NPEs anymore if the fullpath is unavailable.
French translation typo. Fixes #358
Beta 8
Add Nexus 5 resources
Fix Nexus 5 showing only one column
Merge commit '6333b2b0b294988d7931af6a3184b609cda91daa'

Conflicts:
	JMPDComm/src/org/a0z/mpd/MPD.java
	JMPDComm/src/org/a0z/mpd/MPDConnection.java
	MPDroid/src/com/namelessdev/mpdroid/MPDApplication.java
fix merge
Merge branch 'abarisain'