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.
Merge remote-tracking branch 'upstream/master' into appsembler_master

Conflicts:
	.travis.yml
	media/js/app/assetmgr/asset.js
	media/js/mediathread.min.js
	mediathread/settings_shared.py
	mediathread/settings_test.py