Master ios integration branch to Master!

So I believe that merge of this to master has been all ironed out, by merging master to it, first. I don't think there was anything on master that didn't belong, and anything newer in either should take precedence. I resolved any conflicts - tpl/menusheetTemplate.html and www/css/themes/ios.css. @devgeeks, It would be good to do whatever sanity checks that you can (including making sure ios.css is as you would expect), there are a lot of bits being jiggled here.