First cut at Job / Collection search combination
Merge branch 'master' into ti_job_search
Next part in making the Job Search to work.
Create global macro
Updates for Job/Project Searching and viewing.
Add projects to Job Search
Update to enable JOb Items and Files to search and have filters.
Merge branch 'master' into ti_job_search

Conflicts:
	src/banjo/controllers/SearchController.java
	web/WEB-INF/views/search/collection/searchForm.ftl
	web/WEB-INF/views/search/macros.ftl
	web/WEB-INF/views/search/searchResults.ftl
Merging conflicts
Comnplete merge of display sensitive material
Ensure blank config file
Ensure blank config file
Ensure blank config file
Merge branch 'master' into ti_job_search

Conflicts:
	src/banjo/controllers/SearchController.java
	src/banjo/search/SearchFilter.java
Resolve conflicts with master merge
Add method to list project name as map
Code cleanup
Removing Job List from display.
Bug fixes and showing project names
Project name map test