Fix conflicts
put white space in translation to avoid translation missing
removed annoucement
we have already changed the login system, not necessary anymore
fix city/state display on project header #changelog [Fix #46000305]
updated catarse_moip gem #changelog
this new catarse_moip fixes a security issue and reduce code duplication
Merge branch 'master' of github.com:catarse/catarse
updated catarse_moip, fixed bug with moip_response. added moip query after clicking on payment slip link
subscribe project owner on mailchimp when project is successful or failed #changelog [Fix #44656167]

When project is successful or failed we subscribe the project owner in
differents lists, successful projects list and  failed projects list
Merge branch 'master' of github.com:catarse/catarse
MoIP payment_id now is updated soon after payment_slip and bank transfer link is clicked #changelog [Fix #38653327]
This is needed for the payment_id in MoIP is generated only after the link is clicked by the user, so we need to wait a few ms and query MoIP for the transaction status.
updated catarse_moip to give one more second to MoIP transaction to complete
fix redirect after password update error #changelog [Fix #46215753]
added the dalli gem back
for now we have historic data to compare and assess the gain we have by
  using it (and we hope it will eliminate the need to materialize the
  statistics view :D ).
Merge branch 'master' of github.com:catarse/catarse
Add reward click track 

Now we're monitoring reward clicking.
Fix typo
Add specs for trustees/channels relationship.
fixed redirect after credit card payment
use low level cache to store statistics #changelog
this should speed up quite a bit every catarse page
let's try without dalli for more benchmarks