Merge branch 'dev'
remove project entry, since that has moved to /project structure [ci skip]