Fix version conflicts caused by PR#287#289

sucrose0413 wants to merge 1 commit intoAvantiPoint:masterAvantiPoint/AP.MobileToolkit:masterfrom

sucrose0413:mastersucrose0413/AP.MobileToolkit:masterCopy head branch name to clipboard