added discussions, and some more changes to profiles and interface
Merge branch 'master' of https://github.com/jonlaing/branch