fixed issues 68294 and 67715
fixed issue 67506
fixed issue 68311
Merge branch 'master' into ibmpages-issue-68311

Conflicts:
	app/i18n/translations_en.json
Merge pull request #4 from guy-mograbi-at-gigaspaces/ibmpages-issue-68311

Ibmpages issue 68311