flag filter
Merge branch 'master' of https://github.com/cimar/maplight_1.0

Conflicts:
	app/models/CaliforniaCommittees.java