Development update
Merge branch 'master' of https://github.com/ecrit/ecrit.git