progress toward using filters to pull from xola
Merge branch 'master' into forms

Conflicts:
	app/views/shared/_form.html.erb
ajax working
Merge pull request #13 from StevenHarlow/forms

Forms