テンプレートを改修
templateとURLを改修
Merge branch 'feature/timeline' into develop
fix conflict Merge branch 'develop' of github.com:seijiro/Cluster into develop

Conflicts:
	Cluster/templates/partial/__init__.py
	Cluster/templates/users/base_user.html