Merge pull request #1047 from oliverds/master

Fixes: Bootstrap Tour + correct has_image count when image upload fails
publich new only admin
closes #1048
closes #1050
closes #1051
Merge branch 'master' of github.com:open-classifieds/openclassifieds2