JS validation
conflict resolve
Merge pull request #30 from romanvintonyak/develop

JS validation