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
fix #797 - change footer font sizes
for #796 - change category#index display
fix #794 - easier registration
fix #796 - improve css, implement masonry for categories#index
Merge branch 'master' into feature-paypal