refactoring for gulp!
Merge remote-tracking branch 'origin/development-jeremy' into development-jeremy