Merge branch 'master' into mikitas_branch
Merge branch 'master' into mikitas_branch
initial cloudapps data back end
bug fixed for Progress page when two devs report progress to one page in one day
model changed
Module progress page: team name fixed for pages with "PageModule_TeamandGroupSetup"  label
cloud apps progress updated
Merge remote-tracking branch 'origin/mikitas_branch' into Edgar_Branch