Merge branch 'master' of https://github.com/eugeneration/Amigo-Server
Merge branch 'master' of https://github.com/eugeneration/Amigo-Server