update 16/09
Merge branch 'master' of https://github.com/BowlMinions/Ripley_Corseteria

Conflicts:
	app/wp-content/themes/corseteria/less/bootstrap.less.cache