Addons
Merge branch 'master' of github.com:codepress/codepress-admin-columns

Conflicts:
	classes/settings.php