attempt for the time controlling
Merge remote-tracking branch 'origin/master'

Conflicts:
	myproject/myproject/templates/index.html
merged