Adding Ad capabilites while friends are waiting to connect.  Ads will ONLY be shown on the free version of the App, and ONLY when the user is waiting for their friend to connect and is not using the application in any other way. Ads are not shown until the user picks a contact and a method of contact.  Then, and only then, are the Ads shown.  Once their friend connects, the Ads are removed and normal use continues Ad free.
Merge remote-tracking branch 'origin/master' into stable