update 07-04
update server 29-10
update readme
Merge branch 'dev-102013' of https://github.com/BowlMinions/Pasion-por-la-moda