fixed style issues
Merge origin/foundation-5 into foundation-5