rename name_short => display_name and name_full => full_name
Merge branch 'master' of github.com:CodeForAfrica/connectedAFRICA

Conflicts:
	connectedafrica/schema.yaml