Removed ui_ files from the repository
Fixed merged conflicts. App builds