stash
stash
Merge branch 'master' of github.com:ccnmtl/mediathread into search

Conflicts:
	media/js/app/assetmgr/collection.js
making progress
cool little search widget a la spotify
flake
collapse search/filter sections to provide more room for the items.
* Allow users to decide whether to migrate tags & notes
Filter the selections down to record_owner OR visible_authors. This behavior is more intuitive.
Remove fixture from djangosherd unit tests
Merge branch 'master' of github.com:ccnmtl/mediathread into migrate-all-tags
Merge branch 'master' of github.com:ccnmtl/mediathread into search
a bit more work on the contact flow.
fixing tests + bug
Merge pull request #50 from ccnmtl/migrate-all-tags

Allow users to decide whether to migrate tags & notes
fix stray quote
Merge pull request #54 from ccnmtl/quotefix

fix stray quote
Merge branch 'master' of github.com:ccnmtl/mediathread into search

Conflicts:
	mediathread/djangosherd/models.py
Merge pull request #53 from ccnmtl/search

Search for Item & Selection Text
Pull all the logic out of the 500.html template to ensure we see error messages. Courseaffils was gobbling up the errors.
Merge pull request #55 from ccnmtl/error-templates

Pull all the logic out of the 500.html template to ensure we see error m...