Edited yml file to change link names to userfriendly names
Made some more changes to en.yml to convert links to meaningful userfriendly names
changed link names
changed link names as per en.yml
made changes to link names
changed link name
Added left out plural links
changed link name
changed link name
changed link name
Merge remote-tracking branch 'origin/master' into DS-993
Merge branch 'master' into DS-993

Conflicts:
	sli/databrowser/config/locales/en.yml
Added options to enums OldEthnicityType and GradeLevelType

Added “Middle School” and “Elementary School” to GradeLevelType
Added “Two Or More Races” to OldEthnicityType
Merge branch 'master' into ds-1099
Changes made to fix failing acceptance tests
Merge remote-tracking branch 'origin/master' into DS-993
Merge remote-tracking branch 'origin/master' into osi-dev-master
Merge branch 'DS-993' into osi-dev-master