working ios branch has too many redundant commits and has become unclean to use and merge into master