locality + filteri
Merge branch 'master' of https://github.com/hjujah/4blok

Conflicts:
	public_html/js/views/list.js
	public_html/templates/listPart.hbs