changed to devdependencies
adjusted versions
Merge branch 'develop'