Merge origin/master

Conflicts:
	wp-content/plugins/StatIDA/pageviews.php
	wp-content/themes/eqp_2014/functions.php
	wp-content/themes/eqp_2014/single.php