Merge remote-tracking branch 'onethirtyfive/fix_web_app_for_current_s…

…inatras'

Conflicts:
	lib/gitauth/web_app.rb
latest commit b4e1967ea6
@leoc leoc authored