lfc
Merge branch 'develop' of https://github.com/JamTeam/WordPress into develop

Conflicts:
	wp-content/themes/dynamic-news-lite/category.php
	wp-content/themes/dynamic-news-lite/content-excerpt.php
	wp-content/themes/dynamic-news-lite/css/flexslider.css
	wp-content/themes/dynamic-news-lite/featured-content-slider.php
	wp-content/themes/dynamic-news-lite/footer.php
	wp-content/themes/dynamic-news-lite/functions.php
	wp-content/themes/dynamic-news-lite/header.php
	wp-content/themes/dynamic-news-lite/inc/template-tags.php
	wp-content/themes/dynamic-news-lite/js/jquery.flexslider-min.js
	wp-content/themes/dynamic-news-lite/style.css
lfc
Merge branch 'develop' of https://github.com/JamTeam/WordPress into develop