Merge branch 'dev' of github.com:thomasjbradley/gamifier into dev
Merge branch 'dev'