updating ureport and generic
updating ureport
merge
Merge commit '005c219'