Squashed commit of the following:

commit 206bd5920c6e7df1a24fc9fb2840690953a1fb6c
Merge: cb3bbb7 17841de
Author: john irving <whimful@gmail.com>
Date:   Thu Apr 24 11:10:26 2014 +1200

    Merge branch 'master' of github.com:loomio/loomio into translation_caching

commit cb3bbb70ffbe66827fe2e8fe8e05c80ea113e1c9
Author: john irving <whimful@gmail.com>
Date:   Tue Apr 22 12:32:21 2014 +1200

    remove html_safe, add requirment to stop translation of language_field nil

commit 5d3c424cbb4fc6b19463e48e436b0a247d76f5a0
Merge: cb77ec2 14517af
Author: john irving <whimful@gmail.com>
Date:   Tue Apr 22 12:03:49 2014 +1200

    Merge branch 'master' of github.com:loomio/loomio into translation_caching

commit cb77ec21b0824c8cfa4a7389f96c43d932af2bc2
Author: john irving <whimful@gmail.com>
Date:   Tue Apr 22 11:59:21 2014 +1200

    rename a js file js.erb

commit 4db19eac999e7d5926e1c44a8d099acddb81252f
Author: James Kiesel <james.kiesel@gmail.com>
Date:   Mon Apr 7 13:06:21 2014 +1200

    Add inline translations for discussion, motion, and vote