Added ERD Settings V3 to include fields selection and group selection persistency
Merge branch 'master' into guan