branching infinitescroll
Merge branch 'master' of git.ccnmtl.columbia.edu:mediathread into collection
Merge branch 'develop' of git.ccnmtl.columbia.edu:mediathread into collection
Merge branch 'master' of git.ccnmtl.columbia.edu:mediathread into collection
first pass -- Django1.5 upgrade, various library upgrades, collectstatic
admin collectstatic
complying with the new tastypie api.
updating code to account for TastyPie interface changes. all tests passing.
* switching over to wheel-vish implementation requirements
* bootstrap.py can take an argument to specify a local pypi repository, by default bootstrap reaches out to https://pypi.python.org/pypi
* json fixtures use natural keys.
* removing smartif, as that's built-in to Django now.
removing resources from the source.
fixing bugs in the filter/tastypie api. adding tests.
* alpha order for taxonomy
* adding data placeholder for the asset/annotation quick edit form
Only superusers can delete a course.
merge master.
nope. don't need these locally mow.
test
direct_to_template is deprecated.
upgrading lettuce.
Merge branch 'master' of git.ccnmtl.columbia.edu:mediathread into collection

Conflicts:
	mediathread/assetmgr/views.py
	mediathread/settings_staging.py
	requirements/apps.txt
	requirements/js.txt
	requirements/libs.txt
expansion in activity by course.
removing auto-display behavior for tour