Merge origin/master

Conflicts:
	wp-content/uploads/2014/10/banner2-125x125.jpg
	wp-content/uploads/2014/10/banner2-150x150.jpg
	wp-content/uploads/2014/10/banner2-250x231.jpg
	wp-content/uploads/2014/10/banner2-300x84.jpg
	wp-content/uploads/2014/10/banner2-450x231.jpg
	wp-content/uploads/2014/10/banner2-50x50.jpg
	wp-content/uploads/2014/10/banner2-700x196.jpg
	wp-content/uploads/2014/10/banner2-700x231.jpg