Merge branch 'master' into development
[UPDATE] gulp

- update gulp and gulp modules to newest versions
- adjust gulpfile
Merge branch 'development'