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