(hotfix) rails admin fixes and imrpovements
Merge branch 'master' of github.com:fairnopoly/fairnopoly
Merge branch 'master' into develop