package.json stuff
Merge branch 'dev'