Expression test changed.
.gitignore conflict resolves
Merge branch 'master' of https://github.com/msyk/INTER-Mediator

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