Foundation / Jquery / Template files
Merge remote-tracking branch 'origin/master'