merge
Merge branch 'YeoMan' of github.com:mrtrom/ProjectTalkus into YeoMan