code skeleton
Merge branch 'develop' of github.com:psychowico/client.io into develop