add ability to import course (into CMS / edge) without static content,
and without rewriting static links.  changes xml_importer.py and
import.py
add static_asset_path metadata to course, and honor its use in link rewriting
Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static

Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py
pep8 in inheritance.py
pylint
pylint
pylint
modify handling of info/handouts and module_render to honor static_asset_path
more static_asset_path handling in courses.py
fix tabs.py to properly handle static_asset_path
remove extra debugging line from courses.py
add tests of static_asset_path and importing with no static;
fix (again) static_replace to work with static_asset_path
Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static

Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
clean up test_import_nostatic.py
remove unncessary images from new test course
dummy commit - trigger jenkins rebuild
pep8 and pylint for tests of nostatic import
fix pep8 violations
fix some pylint violations
remove unused class