Delete atf.scss from _includes
gulpfile.js watch task modified
Merge branch 'master' into gh-pages