Merge branch 'master' into develop
forgot logs folder
Merge branch 'develop'