resolve merge conflicts in pegasus/mobile.yml
resolve merge conflicts in pegasus/mobile.yml

pickettd/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org