Add a new guideline
Merge branch dev