Quick cleanup of some merging from master. The bcn_allowed_html filter should work correctly on the admin side again.
Fix first level issue causing bcn_display() functions to not work
Cleanup of network admin
Fixes "implicit $this error" for the array_merge_recursive function
Fixed assign that was annoying PHP
Making more statically called functions 'static'