fix for #583
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into release-lizzie
fix for #583
little test for #583
hero box
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into release-lizzie
Merge branch 'master' into release-lizzie
Updated gems and js
capistrano moved back to old version ... see capistrano changelog 3.0
Merge branch 'hotfix-email-selected-transport' into release-lizzie
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into release-lizzie
Change deposit ticker on welcome page back
add transaction id to transaction#show - fixes #585
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into release-lizzie