customized merge accounts template
Merge branch 'ama' into geekhub-oauth
Merge pull request #105 from geekhub-php/geekhub-oauth

customized merge accounts template
Merge branch 'ama' into ama-queries