to topi
Merge branch 'master' of https://github.com/Appear-Networks/RS_Teniente

Conflicts:
RS_Teniente/RissViewController1.h
fix