Merge pull request #63 from ARTFL-Project/master

Update downstream
finish layout for dictionary search form
Merge pull request #297 from clovis/master

Finish layout for dictionary search form