Did work on export
Merge branch 'master' of https://github.com/nexios/nexios

Conflicts:
	server/components/searchUpdater/searchUpdater.js
	server/routes/export/exportSearch.js
	server/server.js