Merge branch 'develop'
Merge branch 'develop'
fix #788 - dont display newsheader contentent when non-existent
fix #791 - add vacation option that prevents sales
small style fix for #791
add ngo user factory trait
bugfix image and file indent
Merge branch 'master' of github.com:fairnopoly/fairnopoly