Merge pull request #44 from kodgemisi/confdeck-3

Confdeck 3
Merge branch 'development' into confdeck-72