add ui packages
Login ui
Merge - conflict in App/.idea/misc.xml