Worked on forms some more
Merge branch 'master' of https://github.com/inpaner/linguist-assistant