Template fixes for search and listing resources
OR fix for searching resources
Fix resources.py merge conflict
Merge pull request #4 from JGWitkowski/api

Search Functionality (fixes OR searches for filtering)
Merge pull request #13 from kristallizer/api

Justin: Search Functionality (fixes OR searches for filtering)