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

Conflicts:
	app/wp-content/themes/moda-less/mylife/css/botas.css
Merge branch 'dev-102013' of https://github.com/BowlMinions/Pasion-por-la-moda into dev-102013