add redirect message builder, update logout
Merge branch 'dev'