(continue major mergery) Resolved merge conficts for pass two.

Conflicts:
	app/org/tdl/vireo/model/jpa/JpaNamedSearchFilterImpl.java
	app/org/tdl/vireo/search/SearchOrder.java
	app/org/tdl/vireo/search/impl/LuceneAbstractJobImpl.java
	test/org/tdl/vireo/model/jpa/JpaNamedSearchFilterImplTest.java
	test/org/tdl/vireo/search/MockSearchFilter.java
	test/org/tdl/vireo/search/impl/LuceneSearcherImplTest.java
	test/org/tdl/vireo/search/impl/UriActiveSearchFilterImplTest.java