Move dev dependencies into the :dev profile
resources -> dev-resources. moved examples and webserver to dev-src
Fix merge conflict