typo etc
Merge branch 'master' into development
dewey rewritten
Merge branch 'post' into development
Merge pull request #519 from luixxiul/development

Development