Change colspan for better responsiveness
Merge branch 'issue-485' of https://github.com/x-team/wp-stream into issue-485

Conflicts:
	classes/class-wp-stream-settings.php