Merge branch 'master' into ericdev
Added back FERL, vastly improved HTMRL