Added FLORA, Updated CoFH
Merge pull request #602 from GrygrFlzr/master

Added FLORA, Updated CoFH