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