Merge pull request #333 from stefk/master

Fixed build configuration
Fixed build configuration
Merge remote-tracking branch 'upstream/master'
Fixed .jshintignore
Removed composer.lock