Merge branch 'dev'
Added doc directory to .gitignore