Debuged js code
Resolve conflicts from master merge
fix some bugs
Merge pull request #1 from alexisjanvier/develop

Debuged js code