merged from master. up to date
Merge branch 'master' into development
added a cloud funtion to fix a db error
added a cloud function