add note about dev branch
Merge branch 'master' into dev
fix typo