Doubles/Triples Updates#318

VeteranPadgett wants to merge 2 commits intopo-devs:masterpo-devs/android-client:masterfrom

VeteranPadgett:doublesVeteranPadgett/android-client:doublesCopy head branch name to clipboard