OAuth nearly complete
Merge branch 'develop' into newthings