Cleaned up click source
Merge branch 'master' of https://github.com/zbarni/comsys-click-bundle