Merge branch 'master' of github.com:MITx/mitx into merge

Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html

doc/development.md

@@ -34,12 +34,34 @@ This will import all courses in your data directory into mongodb
 This runs all the tests (long, uses collectstatic):
 
     rake test
-    
+
+If if you aren't changing static files, can run `rake test` once, then run
+
+    rake fasttest_{lms,cms}
+
 xmodule can be tested independently, with this:
 
     rake test_common/lib/xmodule
-    
+
 To see all available rake commands, do this:
 
     rake -T
-    
+
+To run a single django test class:
+
+    django-admin.py test --settings=lms.envs.test --pythonpath=. lms/djangoapps/courseware/tests/tests.py:TestViewAuth
+
+To run a single django test:
+
+    django-admin.py test --settings=lms.envs.test --pythonpath=. lms/djangoapps/courseware/tests/tests.py:TestViewAuth.test_dark_launch
+
+
+To run a single nose test file:
+
+    nosetests common/lib/xmodule/xmodule/tests/test_stringify.py
+
+To run a single nose test:
+
+    nosetests common/lib/xmodule/xmodule/tests/test_stringify.py:test_stringify
+
+