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

# Conflicts:
#	modules/bindata/bindata.go
#	public/css/gogs.min.css

conf/app.ini

@@ -198,6 +198,7 @@ SESSION_LIFE_TIME = 86400
 SERVICE = server
 AVATAR_UPLOAD_PATH = data/avatars
 ; Chinese users can choose "duoshuo"
+; or a custom avatar source, like: http://cn.gravatar.com/avatar/
 GRAVATAR_SOURCE = gravatar
 DISABLE_GRAVATAR = false
 
@@ -317,4 +318,4 @@ bg-BG = bg
 it-IT = it
 
 [other]
-SHOW_FOOTER_BRANDING = false
+SHOW_FOOTER_BRANDING = false

conf/locale/locale_en-US.ini

@@ -14,6 +14,9 @@ version = Version
 page = Page
 template = Template
 language = Language
+create_new = Create new...
+user_profile_and_more = User profile and more
+signed_in_as = Signed in as
 
 username = Username
 email = E-mail
@@ -32,6 +35,8 @@ manage_org = Manage Organizations
 admin_panel = Admin Panel
 account_settings = Account Settings
 settings = Settings
+your_profile = Your Profile
+your_settings = Your Settings
 
 news_feed = News Feed
 pull_requests = Pull Requests