None check
Merge remote-tracking branch 'origin/master'

Conflicts:
	myapp/view/timeline.py
merge fix
Merge branch 'master' of https://github.com/ayziao/testpy
BaseData unittest