javascript shutdown
Merge branch 'master' into Windows

Conflicts:
	Settings/views.py