Merge pull request #26 from ijansch/master

Updated surf logo
Fixed aspect ratio of SURFnet logo
Merge pull request #27 from ijansch/master

Localized scan window
Merge pull request #28 from ijansch/master

localization fixes
Added scan_window string
Added Slovenian translation to XCode projects
Put correct Norwegian strings file in
Fixed line ends in several languages, replaced Portuguese translation
Fixed path to ZXing library in SURFnet project file for iOS
Updated invalid user response code
Added invalid_user json response code. handle duration blocks
Added invalid user response code, handle temporary blocks
Merge conflicts
Added possibility that attemptsLeft can be nil. in this case never block the user.
Merge pull request #29 from thijsdamen/master

Updated JSON protocol v1.0
This commit fixes a bug where the main view screen always claims that there are no identities on the device.
This is caused because the "load web view" helper function always pulls in the static contents of a particular HTML file.
Fixed that.
Added the necessary escaping to the correct strings to allow them to load as html.
Merge pull request #32 from SyntaxPolice/master

Fix to main view always saying no accounts
Fix cache policy iOS7
More cache type modifications
Local change revert