Added group-by and having elements to XSD schema; Removed the facts element in favour of combineWith; removed simple and complex dw queries and replaced them by a single dw query class; updated XML files to reflect changes