Need to merge.
Merge branch 'master' of https://github.com/SFDevLabs/fireform

Conflicts:
	partials/list-view.html