Merge "Moving autority definition to a separate file, so that it can be easily customized using android studio" into ub-launcher3-master