working on #151
working on #151
Merge branch 'master' of github.com:open-classifieds/openclassifieds2
working on #151
Merge remote-tracking branch 'upstream/master'

Conflicts:
	install/samples/install.sql.php