Merge branch 'master' of https://github.com/TeamPalmTree/authority