calculator and refactoring script.js
stop work calculator
Merge branch 'master' of https://github.com/Kaifat/mpos_tpl

Conflicts:
	include/pages/service/calculator.inc.php