Bug surrounding annotation delete. The icons were not being positioned properly. And, the "to-delete" div was not specified nicely.
float footer logo left to stop interference with selection creation. temporary solution
Travis CI is failing due to an improper import by Lettuce. Upgrading *should* fix the issue. We'll see.
And - removing lettuce configuration from the basic meth configuration. It is added back in settings_test. Travis should be able to run properly with just an in memory database.
Updating name for admin area. Apparently, there was a lot of confusion about this.
Merge branch 'qa' of git.ccnmtl.columbia.edu:mediathread

Conflicts:
	.travis.yml
	media/js/app/assetmgr/asset.js
	media/js/mediathread.min.js
	mediathread/settings_shared.py
	settings_test.py
Updating GITHUB readme
Adding a basic smoketest
accept the redirect headers.
tour2 step should not be in a mustache template.
Check for FacultyGroup is None
Updating sherdJS with Youtube Fixes
Updating sherdjs
* Updating collection.js to respect a static thumb's height & width if specified.
* Updating icons.
Stray comma
Updated information for Flowplayer installation
Update README.markdown
Update README.markdown
Update README.markdown
Updating readme