Merge branch 'develop'
New version of mostly all files
Merge branch 'master' into develop