dont snap cursor while in edit mode
Merge branch 'dev'