Same branch as the old issue151, and same commit as
I have deleted the branch and commits earlier this week, I thought the
merge was already done.
Also, this time I pushed the (much needed) updated ng6_database.sql
(Once again, when this update goes live, an update to the DB structure
will be needed. See the related issue.)