added validation on server
Merge branch 'server_validation' into develop