Merge branch 'master' into ccweaver
Merge branch 'master' into ccweaver
pyc
Merge branch 'master' into ccweaver

Conflicts:
	roommeet-1/roommeet/views.pyc
bs, commas and word wrap
product page
Merge branch 'ccweaver'

Conflicts:
	roommeet-1/roommeet/templates/managehousetablefill.html
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.py
	roommeet-1/roommeet/views.pyc