Added user-defined columns & filters
Merge branch 'custom-columns'

Conflicts:
	backbone-websql.js