clean up control panel queries
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into efficient_facility_usage

Conflicts:
	kalite/control_panel/views.py
small bugfixes to correct facility usage page.
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into share_basepoints
Merge pull request #627 from bcipolli/efficient_facility_usage

clean up control panel queries
fixing small bugs in control_panel urls, introduced by hotfix this morning
Merge branch 'share_basepoints' of github.com:bcipolli/ka-lite into share_basepoints
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into share_basepoints