fix logout script
update gen-js for new router models
Merge remote-tracking branch 'gargoyle/master'