Videl Update
This is no longer a WIP, it should be ready to merge now. Everything should be fixed this time, no conflicts.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
This is no longer a WIP, it should be ready to merge now. Everything should be fixed this time, no conflicts.