Pixel image in missed yesterday email to mark activity as read

Squashed commit of the following:

commit bd4f9cdf8c2cecc22f68d268e02a9572d1a1b538
Author: Fernando Garcia Samblas <fernando.garcia@the-cocktail.com>
Date:   Sat Jul 26 21:53:10 2014 +0200

    Reading summary email images cucumber scenario

commit 59f97ce780983ba89b9f8c17e68b547d569b475c
Author: Fernando Garcia Samblas <fernando.garcia@the-cocktail.com>
Date:   Sat Jul 26 14:12:46 2014 +0200

    Remove commented lines (ups!)

commit 05b94a3dc6e1d185ffeea6feca3a8d0b92fb3c35
Author: Fernando Garcia Samblas <fernando.garcia@the-cocktail.com>
Date:   Sat Jul 26 13:48:35 2014 +0200

    Pixel image in missed yesterday email to mark activity as read

    Send invisible single pixel image in "missed yesterday" email to mark as read automatically for people who have images enabled.
Allow moving private discussions to public group

commit d62224abc2fd8cc0a0ade5c57f15a148eb2e61ed
Author: James Kiesel <james.kiesel@gmail.com>
Date:   Sun Aug 3 15:15:04 2014 -0400

    Allow moving discussion to group with other admin

commit 1f1e74886bac371c2c6a6f720ad0b9c738112d1e
Merge: 16384b9 90fdf7f
Author: James Kiesel <james.kiesel@gmail.com>
Date:   Sun Aug 3 13:59:27 2014 -0400

    Merge branch 'master' into moving-private-discussions

commit 16384b914594256e298434f4d4d9f85187b304e5
Author: James Kiesel <james.kiesel@gmail.com>
Date:   Fri Jul 25 23:33:21 2014 -0400

    Write controller spec for moving discussions

commit e1425711acac68ac7d93e1e0dbe295b705d4f5a8
Author: James Kiesel <james.kiesel@gmail.com>
Date:   Fri Jul 25 22:29:17 2014 -0400

    Only populate destinations when user can move discussion

commit 4107d3f4beeea190323abe13383ca77385e1b796
Author: James Kiesel <james.kiesel@gmail.com>
Date:   Thu Jul 24 22:12:24 2014 -0400

    Fix failing test

commit 852c8d5938e5ea4c87cbcb88274d6e5f904fd733
Author: James Kiesel <james.kiesel@gmail.com>
Date:   Wed Jul 23 01:22:51 2014 -0400

    Whoops! Swap out public for private ids

commit 237d369a1d93d372fe26b7e802981bac703fa043
Author: James Kiesel <james.kiesel@gmail.com>
Date:   Wed Jul 23 01:19:00 2014 -0400

    Support for moving private discussions
Sort discussions on group#show by activity, instead of comments
add dialect support
Squashed commit of the following:

commit 77e5dd8c51d2fba068ed6727eeed172aab6f50b2
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 17:05:51 2014 +1200

    escape funny uri

commit fb27708903b4db0dbccefaf35bbd3784c5c504ce
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:45:08 2014 +1200

    ok

commit 8fd92f3c76b2b58b457b1aa5780a5fa4b3d02e12
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:39:32 2014 +1200

    okokok

commit 9514e1ec97a3eebdc06e3ca15a4c0c50d48b1ab1
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:35:38 2014 +1200

    okokok

commit 66256612c9315025e8c2cdb0db12fbf71619fa77
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:31:46 2014 +1200

    ok usa

commit fed79499cf5f0410aa5ac5dd3f8cd732da5b1f02
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:22:26 2014 +1200

    usa usa usa

commit 479d7db68814b0a83512d5f99754b357f6a183b3
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:15:12 2014 +1200

    usa usa usa

commit 29301d85f333ca50b2de974a4c92046f26815a23
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:10:53 2014 +1200

    buh

commit 2d98564d10d27fbaa907f7dd8a462131595601a3
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 14:28:16 2014 +1200

    ok

commit 0058d82b747375ee02090feabefedc57dfc69468
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 14:23:20 2014 +1200

    uh

commit 0b770a2551ae641c605cd16bd26ae3b35e333e41
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 14:13:31 2014 +1200

    messy

commit 0eb21d9c750ce119039cd52fec3bd54977d11022
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 14:00:53 2014 +1200

    debug assets in prod

commit 9a470dbf2fa38fd8ac3d3abcc86009626859951e
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 13:54:37 2014 +1200

    debug assets in prod

commit ba1419ea77a7fccd66486a85a0d36ae3eb43ac66
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 12:52:39 2014 +1200

    fix secrets

commit 2c9afdddaea9b7f7df0f91a94f7ebd9612a4eeb7
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 12:43:20 2014 +1200

    ok

commit a7c7c3e117d269f21ffcfbde5d466d27d20de68e
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 12:22:08 2014 +1200

    Rails 4 upgrade - by James Kiesel and Rob Guthrie
first iteration of group metrics for admins
Merge pull request #1567 from loomio/rails-4

Upgrade to Rails 4.1
fix intercom
fix intercom
fix
skip authenticity check for themejs,css
fix
fix travis
Update show.xml.builder
Update show.xml.builder
Merge pull request #1601 from loomio/group-metrics

first iteration of group metrics for admins
Merge branch 'master' into dialects

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/unstructured/_main.css.scss
	app/mailers/discussion_mailer.rb
	app/mailers/user_mailer.rb
	app/models/concerns/is_translatable.rb
	app/views/admin/email_templates/_form.html.haml
	config/routes.rb
fix image asset path
Merge pull request #1571 from loomio/dialects

add dialect support
fix marketing css