Merge remote-tracking branch 'onethirtyfive/fix_web_app_for_current_s… …
…inatras' Conflicts: lib/gitauth/web_app.rb