Push Master to Example for testing, remove FFS stuff

Merged Diego Salazar requested to merge rehrar/ccs-proposals:master into example

Merge request reports