Updated to Foundation 5.2.2
Merge branch 'master' of https://github.com/willemliu/portfolio

Conflicts:
	news/tmpl/header.php
	photos/tmpl/footer.php
	tmpl/footer.html
	tmpl/home.html
	videos/tmpl/header.php