fraccion isPropia
Merge branch 'develop'