update 15-4
Merge branch 'dev-102013' of https://github.com/BowlMinions/Pasion-por-la-moda into dev-102013