fixed #1065 and #1069
fixes redirect bug
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop