Merge branch 'master' into development
[BUGFIX] base

- fix bug in gulpfile when building package base
Merge branch 'development'