merges master and fixes conflicts

2015-08-18 09:35:13 +02:00
parent cf4495e17c 1f5f6d2589
commit b28f63b016
80 changed files with 18565 additions and 128 deletions
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -23,5 +23,7 @@ en:
        nickname: Nickname
        password: Password
        phone_number: Phone number
+        official_position: Official position
+        official_level: Official level
      organization:
        name: Organization name