Merge branch 'dev2' into dev
Merge branch 'dev'
Merge branch 'master' of https://github.com/jpas/characters-sheet