fix #329 and provide csv row test to demonstrate fix
Merge branch 'hotfix/issue329' into develop

Conflicts:
	portality/models.py

models.py is gone from develop, so changes ported over to
models/journal.py

Test moved and modified to run under new test infrastructure on develop too.