more 'thoughts' content
Merge branch 'thoughts-update'
activate user voice
Merge branch 'master' into integration

Conflicts:
	urls.py