Adding the rest of the location feature test pages
Merge branch 'refs/heads/master' into prof_egghead