Moved imports to startup.py.

Conflicts:
	cms/startup.py
	lms/startup.py
Merge branch 'release' into master