Remove bootstrap since foundation is being used
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'