Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
move vignette to new directory
Merge branch 'master' into develop