Ajustes
Merge branch 'master' of https://github.com/tiagolpadua/seam_basic.git

Conflicts:
	.settings/org.jboss.tools.seam.core.prefs