Activation token fix
New logging system
Merge remote-tracking branch 'origin/master'