changed collection name back to egypt
Merge branch 'master' into egypt
Merge branch 'master' into egypt
changed collection name back
Merge branch 'master' into egypt
fixed master
test
re-adding templates