custom project filters
fix
fix 2
fix 3
fix 4
65116
Merge branch 'master' into fgodinho

Conflicts:
	controllers/project.py
Merge branch 'fgodinho' of https://github.com/fabricerosa/InControl into fgodinho
Merge remote-tracking branch 'origin/fgodinho' into frosa