Development -  latest updates for master

Includes refactoring and Foundation Zurb updates.