Merge branch 'login_view_layout_improvements' into fixed_contradicted_messages_in_login_view
Server or connection errors in authorization require handled as in server check
Merge pull request #186 from owncloud/fixed_contradicted_messages_in_login_view

Fixed contradicted messages in login view