fixes delete state on dashboard

Location to/from locator mapping facilities

Drupal side Register button updates

Fix/cdodge/bad links can cause exception on rewrite

Video Player: minor fixes

Feature/cdodge/add a mixed modulestore

and some minor comment changes.

with own db connection.

But don't use this parser for urls embedded in a browser url request. 

unit tests and fixes they implied

partial impl

per our agreement not to use the domain

Add a 'MixedModuleStore' which aggregates between XML and Mongo Modulestores

xblock fields persist w/o breaking by scope

Correctly seek in captions with non-1.0 speeds.

Fix for video and captions sync. Test for this fix.

fixed encoding declaration

Enable the django_nose app by default

Conflicts:
	common/lib/xmodule/xmodule/video_module.py

Zoldak/hotfix 2013 08 16

xgettext seems to only like `utf-8` not `utf8` so string extraction
was failing without this

fixed typo in faculty member settings text

This was confusing translators as didn't make sense in English