Adding fake video data and exercise points.  Making script recallable and modular--can add more features in the future
connecting functionality to command-line options
log user activity
Merge remote-tracking branch 'origin/fake_video_data' into user_activity_logs
fixing unicode string
fixing bugs, making fake user data work
migrating to schema that can be used in the future
Merge branch 'urls' into user_activity_logs
fixed small bug when ending a previous log entry when requested to begin a new one
Merge remote-tracking branch 'upstream/develop' into user_activity_logs

Conflicts:
	kalite/coachreports/management/commands/generatefakedata.py
	kalite/main/models.py
	kalite/securesync/views.py
	kalite/utils/topic_tools.py
get summaries working, verify limited log total.
get summaries working, verify limited log total.
updating models with more correct field names, adding comments.  This version does not sync.
Implementing disabling logic for UserLog/UserLogSummary functionality
Bulk deletion of unwanted UserLogs.
Search for objects to discard not keep.
Merge pull request #14 from rtibbles/user_activity_logs

Bulk deletion of unwanted UserLogs.
continuing to clean control_panel code (with use)
Merge remote-tracking branch 'origin/user_activity_logs' into control_panel

Conflicts:
	kalite/settings.py