update TODO after Skype with Ox
update manual copyright notice
Merge remote-tracking branch 'upstream/dev' into dev