add simple_form
add comments
add missing locale file
merge branch develop