a
Merge branch 'master' of https://github.com/andrezinho/romero

Conflicts:
	model/melamina.php