add kind
Merge remote-tracking branch 'origin/Lixu-11.1' into gaoce-11-1
remove pyc
Merge branch 'master' into gaoce-11-1

Conflicts:
	ourplatform/models.pyc
	ourplatform/views.pyc
slide
no message
Merge branch 'gaoce-11-1' of https://github.com/redduck3/CodeRush into gaoce-11-1
修改url
no message
no message
Merge remote-tracking branch 'origin/lixu-11-1.3' into gaoce-11-1
cheating
Merge branch 'gaoce-11-1'