Merge remote-tracking branch 'origin/master'

Conflicts:

	app/code/local/MMModa/Lojista/sql/lojista_setup/mysql4-install-0.1.0.php