Property filtering on the list page
Merge branch 'master' of github.com:tyrel86/google_hackathon_front_end

Conflicts:
	app/js/controllers.js