Adding tags to proposals
merged
Merge branch 'master' of https://github.com/sandb/getopinionated.git

Conflicts:
	document/forms.py
	document/views.py
	templates/accounts/password-reset-complete.html
	templates/accounts/password-reset-confirm.html
	templates/accounts/password-reset.html
Merge branch 'master' of https://github.com/sandb/getopinionated.git