merge stuff
Merge branch 'release'
Merge branch 'master' of github.com:fairnopoly/fairnopoly
small changes in html for bank data an paypal
Fix rails admin category bug
Merge branch 'master' of github.com:fairnopoly/fairnopoly
Merge branch 'release' of github.com:fairnopoly/fairnopoly