Revert "updates the File_maker class into latest version"

This reverts commit 2676cb4dc592ea1410093cb4780349d345df47a0.
merges some js files
Merge remote-tracking branch 'origin/master'