update functions of server
prueva 3
prueva 4
prueva 5
Merge remote-tracking branch 'origin/master'