Refactored
Fixed tests, refactored
fixed merge problems
Merge branch 'search' of https://github.com/genomizer/genomizer-web into search

Conflicts:
	test/js/tests/collections/SearchResults.js