effort
Merge branch 'master' of https://github.com/timothypratley/vone

Conflicts:
	src/vone/models/queries.clj
	src/vone/views/crud.clj