moved searchoptions to collection
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	frontend/js/views/collectionsView.js