Merge branch 'master' into development
Updated `jitsuignore file
Merge branch 'development'