Adding better ACF4 compatibility for field groups registered via code + upgrading from v4

Signed-off-by: Elliot Condon <e@elliotcondon.com>
Merge branch 'master' of https://github.com/AdvancedCustomFields/acf5-beta