Initial implementation of control panel, accessible from both the central and distributed servers.
Merge branch 'develop' of github.com:bcipolli/ka-lite into control_panel

Conflicts:
	kalite/central/forms.py
	kalite/central/views.py
	kalite/main/urls.py
	kalite/main/views.py
	kalite/registration/views.py
	kalite/securesync/api_views.py
	kalite/securesync/models.py
	kalite/securesync/views.py
	kalite/settings.py
	kalite/templates/central/base_central.html
	kalite/templates/central/homepage.html
	kalite/templates/central/landing_page.html
	kalite/utils/decorators.py
Merge branch 'python26_cleanup' into control_panel
Merge remote-tracking branch 'upstream/develop' into control_panel

Conflicts:
	kalite/utils/decorators.py
removing missing reference
remaining changes after merge to fix things.  Whoops/whew
continuing to clean control_panel code (with use)
Merge remote-tracking branch 'origin/user_activity_logs' into control_panel

Conflicts:
	kalite/settings.py
Merge branch 'python26_cleanup' into control_panel
combine general functions to one file. Test UserLog functionality on new datediff function.
Merge branch 'user_activity_logs' into control_panel
enable user usage information in facility reports
integrating coach reports to control panel, fixing bugs in coach reports, adding mastery reporting
Merge branch 'persist_syncsessions' into control_panel

Conflicts:
	kalite/securesync/models.py
fixing counter reporting. nowrap text. remove pdb.
exposing coach reports from central server. Fixing bugs in coach reports and javascript code to do so.  Must mark central vs distributed server for one template (student-view coach report) :(  Clean unused data upload/download code and urls from views/urls.py
now generate user usage logs.
now generate user usage logs.
adding comments for use of OrderedDict
add version not just to fields, but also to models.