Added initial form for adding favorite, added ionic modal
Fixed merge conflict