fix minor syntax errors
Merge branch 'master' into activeadmin