Sticky webpack-version until webpack/webpack#137 is fixed
Loosened webpack version because webpack/webpack#137 is fixed
Merge branch 'master' into refactor-model-junction

Conflicts:
	package.json