Merge branch 'master' into notes

Conflicts:
	Gemfile.lock

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index ec1d4e3573089b2f53504cfb75ae326a718190af,a53bc3d0d49edd889d7e9153f8c5bd8ad91d380c..7679a6ccba333de324c9563523071445aa779a90
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -51,7 -51,7 +51,7 @@@ GE
      erubis (2.7.0)
      execjs (1.4.0)
        multi_json (~> 1.0)
-     faraday (0.8.4)
 -    faraday (0.8.6)
++    faraday (0.8.7)
        multipart-post (~> 1.1)
      hike (1.2.1)
      htmlentities (4.3.1)
@@@ -63,19 -63,14 +63,19 @@@
        i18n
      iconv (0.1)
      journey (1.0.4)
-     jquery-rails (2.1.4)
+     jquery-rails (2.2.1)
        railties (>= 3.0, < 5.0)
        thor (>= 0.14, < 2.0)
-     json (1.7.6)
+     json (1.7.7)
 +    jsonify (0.3.1)
 +      multi_json (~> 1.0)
 +    jsonify-rails (0.3.2)
 +      actionpack
 +      jsonify (< 0.4.0)
-     jwt (0.1.5)
-       multi_json (>= 1.0)
+     jwt (0.1.8)
+       multi_json (>= 1.5)
      libv8 (3.3.10.4)
-     libxml-ruby (2.4.0)
+     libxml-ruby (2.6.0)
      mail (2.4.4)
        i18n (>= 0.4.0)
        mime-types (~> 1.16)
@@@ -105,10 -102,10 +107,10 @@@
        activesupport (>= 2.3.2)
        cocaine (>= 0.0.2)
        mime-types
--    pg (0.14.1)
++    pg (0.15.0)
      polyglot (0.3.3)
-     r2 (0.0.3)
-     rack (1.4.4)
+     r2 (0.1.0)
+     rack (1.4.5)
      rack-cache (1.2)
        rack (>= 0.4)
      rack-cors (0.2.7)
@@@ -137,8 -134,8 +139,8 @@@
        rake (>= 0.8.7)
        rdoc (~> 3.4)
        thor (>= 0.14.6, < 2.0)
--    rake (10.0.3)
-     rdoc (3.12)
++    rake (10.0.4)
+     rdoc (3.12.2)
        json (~> 1.4)
      redcarpet (2.2.2)
      rinku (1.7.2)
@@@ -157,9 -154,9 +159,9 @@@
        tilt (~> 1.1, != 1.3.0)
      therubyracer (0.10.2)
        libv8 (~> 3.3.10)
-     thor (0.16.0)
-     tilt (1.3.3)
-     timecop (0.5.9)
 -    thor (0.17.0)
++    thor (0.18.0)
+     tilt (1.3.6)
+     timecop (0.6.1)
      treetop (1.4.12)
        polyglot
        polyglot (>= 0.3.1)
@@@ -184,9 -181,8 +186,9 @@@ DEPENDENCIE
    http_accept_language (>= 1.0.2)
    httpclient
    i18n-js (>= 3.0.0.rc2)
-   iconv
+   iconv (= 0.1)
    jquery-rails
 +  jsonify-rails
    libxml-ruby (>= 2.0.5)
    memcached (>= 1.4.1)
    minitest

diff --cc app/models/user.rb
Simple merge

diff --cc config/locales/de.yml
Simple merge

diff --cc config/locales/en.yml
Simple merge