Merge branch 'hotfix/fix-resources'
Merge branch 'master' of github.com:nvbn/everpad
Fix conflict parent with new sqlalchemy
Fix serialisation of conflict parent
Merge branch 'master' into develop