Merge pull request #22 from 'xylinq-develop'
Merge pull request #23 from 'xylinq-develop'
55
66
Merge branch 'master' of gitcafe.local:xylinq/test into develop
confi