small updates to topic update
merged app.js - there were no real conflicts
Merge pull request #19 from RKJuve/tim-dev

small updates to topic update