Bug fixes: changed script locations and the appropriate calls
Merge branch 'master' of https://github.com/PtrTeixeira/jsCalc into bugfix