Add description and language to Proposal
Fix nasty settings bug
Remove unused file
Updated cfp gem
Removed unused test files
Updated cfp gem
Merge branch 'master' into front-end