new filter commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	cross_founding_platform/cross_founding/templatetags/display_errors.py
show_label filter
Merge remote-tracking branch 'origin/master'