fix js bugs
server validation
Merge remote-tracking branch 'origin/master'