#3 add js-files
Merge remote-tracking branch 'origin/master'