gulpfile edited2
Merge branch 'paperjs/20140708_not_using_paperscript' of https://github.com/Mashliz/frontend into paperjs/20140708_not_using_paperscript