Refactoring JS & PHP
Merge pull request #2 from urakey/develop

Refactoring JS & PHP