Fixed JS concatenation bug
Updated travis file
Merge pull request #114 from cferdinandi/development

Fixed JS concatenation bug