Update pt-BR localization
Merge pull request #105 from reubenmorais/master

Update pt-BR localization
Style fix for a conditional in GSMux.m.
Upgrade project file settings.
Make project file diffs/merges happen properly. D'oh.
Upgrade ReactiveCocoa and deps.
Add Romanian localization from Alin Badila.
Add Norwegian localization from Espen Burud.
Add Japanese localization from RiSyomei.
Remove delivered notifications from Notification Center so that they don't stack up uselessly.
Updates to the French localization from Stephane Madrau.
Updated German translation
Merge pull request #114 from niklaskorz/feature-german-translation

Updated German translation