Pre merge
Merge branch 'master' of https://github.com/nexios/nexios
Did work on NEXIOS-489, NEXIOS-490, NEXIOS-492 and  NEXIOS-493
Merge branch 'master' of https://github.com/nexios/nexios

Conflicts:
	client2/components/searching/searchManager/manager.js