Merge remote-tracking branch 'origin/dev' into feature_post

Conflicts:
	Maple/forms.py
	Maple/views.py
	templates/_base.html
	templates/registration/login.html
	templates/timeline.html
login html merge
Merge remote-tracking branch 'origin/dev' into feature_post

Conflicts:
	Maple/forms.py
	templates/_base.html
	templates/timeline.html