updating in order to use yesod-1.2.4
aeson update
Merge branch 'feature/yesod' into develop
Merge branch 'release/yesod-1.2.4'