Removed custom OG widget handler
Merge branch 'development' into OG_upgrade
Merge branch 'OG_upgrade' into development