updating main repo
updating generic
updating xforms
merging master