remove newline due to error
Merge remote-tracking branch 'upstream/dirty' into dirty

Conflicts:
	src/librehatti/catalog/models.py
doxygen comments
doxygen comments
bills-views modified
main urls.py modified
html file modified
urls.py changed
models
Merge remote-tracking branch 'ups/dirty' into dirty
Revert "models"

This reverts commit d5220c4022653c97b808101623e585e969e806fd.
models modified
Tranport bill modified
documentation of catalog
documentation of useraccounts
documentation of catalog modified
documentation of useraccounts modified
views modified but bill does not generate
Modified Views and Templates
Modified Template