Dev Clean up
 more clean up dev
sdf
Fixed merges and updated the gulpfile
changes
Merge branch 'dev' into mags
final for thurs