merge
Merge branch 'master' of https://github.com/CyJeliel/classeEncanto.git

Conflicts:
	classeEncanto/src/br/com/classeencanto/model/impl/Destaque.java