[Bug Fix] Fixed VF page to use object API names. Added invalid and invalid tests for the ERDGenerator
Merge branch 'master' into guan