Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif

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

diff --cc app/views/home/initial_state.json.rabl
Simple merge

diff --cc app/views/settings/preferences/show.html.haml
Simple merge