Merge branch 'master' into ibm-issue-67506

Conflicts:
	app/i18n/translations_en.json
Merge branch 'master' into ibm-issue-67506

Conflicts:
	app/i18n/translations_en.json
Merge pull request #3 from guy-mograbi-at-gigaspaces/ibm-issue-67506

Ibm issue 67506