commit for merge
fix merge conflicts
Merge branch 'master' into cosimo
add user validation
merge conflict fixing
fixed merge. merged with cosimo