fixed formidable form
Merge branch 'code_cleaning' into develop