Merge branch 'master' of github.com:gogits/gogs into develop

conf/locale/locale_en-US.ini

@@ -90,7 +90,7 @@ invalid_repo_path = Repository root path is invalid: %v
 run_user_not_match = Run user isn't the current user: %s -> %s
 save_config_failed = Fail to save configuration: %v
 invalid_admin_setting = Admin account setting is invalid: %v
-install_success = Welcome! We're glad that you choose Gogs, have fun and take care.
+install_success = Welcome! We're glad that you chose Gogs, have fun and take care.
 
 [home]
 uname_holder = Username or E-mail