Fixed error with timeout.
Merge remote-tracking branch 'origin/master'
Added PreferencesActivity.
Translated to Spanish.