changes
Merge branch 'master' of https://github.com/sw-iknow/toknow2