* Fix conflict between different product flavors so that beta and prod apps could coexist * Fix category content provider