replaced foundation with skeleton
Merge branch 'dev'