gulp
resolved conflicts
ready to deploy
Merge branch 'dev'