Changes in contacto
Merge branch 'killer-rabbit-labs-master'

Merging branch * killer-rabbit-labs-master: