Merge remote-tracking branch 'origin/python26_cleanup' into user_activity_logs
Merge remote-tracking branch 'origin/python26_cleanup' into user_activity_logs
making user logs python2.6 compatible
Merge remote-tracking branch 'upstream/develop' into user_activity_logs

Conflicts:
	kalite/settings.py
Merge branch 'user_activity_logs' into control_panel