msyk/INTER-Mediator — pull request #157 by msyk (2014-09-20 10:05:55+00:00)
Title: Merge branch 'master' into client-side_calcuration

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