Merge branch 'release' of github.com:fairnopoly/fairnopoly into release
asset paths updated
revert assets
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release
asset path fix
Merge branch 'release'
Merge branch 'master' into solr