Updates to the AMP server and client
Merge branch 'master' of https://github.com/j105rob/scram