Merge pull request #22 from oliverds/master

Bug Fixes
closes open-classifieds/openclassifieds2#881
closes open-classifieds/openclassifieds2#874
closes open-classifieds/openclassifieds2#878
closes open-classifieds/openclassifieds2#885
spacing on file