Manual merge of pull request 28

Adds integration with Slatwall3
Fix SQL error
Correct SQL where clause (merge error)
Fix var scoping and typos
Revert "Manual merge of pull request 28"

Changes moved into slat wall feature branch
Manual merge of pull request 22

Adding link, file and folder type support. Contributed by @jsieber