Merge branch 'master' into client-side_calcuration

Conflicts:
	INTER-Mediator-UnitTest/js-expression-eval-test.js
	lib/js_lib/js-expression-eval-parser.js