reworked registration email; fixes #62
merged stable to master