Merge branch 'master' into develop
Merge branch 'master' of github.com:fairnopoly/fairnopoly
hotfix: fixed #933
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'master' into develop
Updated README.rdoc
HOTFIX - add link to shared/public/assets
Merge branch 'master' of github.com:fairnopoly/fairnopoly
Merge pull request #934 from marcaltmann/installation

Updated README.rdoc
small fixes: js error and notice color
Merge branch 'master' into develop
Merge branch 'develop' into feature-cart