tweaks.
No - no bootstrap yet.
removing vital3 icons.
Retiring images.
More image housecleaning.
* Tasty Pie resources for Vocabulary + Term
* Reworking admin console to use backbone/tastypie combination
* Courses can now have 3 vocabularies.
Wrapping up the admin console.
Tweaks
dealing with the mess that is layout in the asset workspace area.
More tweaks
Removing the magic numbers from the resizing logic.
Bug fix for vocabulary update.
* Refactoring asset specific view methods out of the main application
* Fixing selenium tests due to menu & filter changes
uncommenting compress for Nate.
* Continued progress on json refactoring. TagResource now available for rendering tags.
* Moved all asset json rendering functions (count 'em: 4!) into assetmgr/views.py for easier testing/perusal.
Merge remote-tracking branch 'upstream/develop' into appsembler_develop

Conflicts:
	mediathread/templates/taxonomy/taxonomy_workspace.html