Merge "Change admin project to separate project for each admin user"