Minor typo fix Wi-FI -> Wi-Fi

Change-Id: I457a5cab6de706ab6fd05bf1b9c6c2531cdab4d1
Settings: NL translation

Make notification-shade-collapse-after-dismiss behaviour configurable.

ps2: rebase

Change-Id: I8e9542afa6097efe171c7e71e4c91387e85178c2
Settings: PT-BR translations

Change-Id: I67f3655927bac23bd40a6f7b508927ac850b0964
Merge "Minor typo fix Wi-FI -> Wi-Fi" into cm-10.1
Merge "Settings: NL translation" into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1