iOS webapp enhancements
merge conflict