Merge commit 'b3b2eb96a20c0c332267cab8d43535f6be9171b4' into next
Merge branch 'next' of github.com:feincms/feincms into next
Extract tab construction to own function, so one can reuse it for other tabs.
Merge branch 'next' into tabbed_options2
Morph extensions options into a tab-bar.
Merge branch 'tabbed_options2' into next