more ios changes

Change-Id: I082ad4140d4824c56b107a0b54129acf2f2fe529
some good cleanup

Change-Id: I936c421faf0b15363f613941ddb4c6ca4a17849c
** working **  app and some cleanup

Change-Id: I53c793f9cb5c0dce0e4cf0c5c6c17db94befcbde
fix for iphone test

Change-Id: I5cb0309db618bdc329ec74778645a37a0ee2a7d1
Merge topic 'more_ios' into master

92b69077 fix for iphone test
4912a3c9 ** working **  app and some cleanup
df57c936 some good cleanup
3047038f more ios changes