Working Commit
Merge branch 'master' of https://github.com/TheHeat/yfennimap

Conflicts:
	wp-content/themes/yfennimap/inc/facebook2.php