merge
dialog login
Merge branch 'master' of https://github.com/ddarkemanu13/pj-project

Conflicts:
	codigo/pj-project/.project
	codigo/pj-project/.settings/org.eclipse.core.resources.prefs
	codigo/pj-project/.settings/org.eclipse.jdt.core.prefs
	codigo/pj-project/.settings/org.eclipse.m2e.core.prefs
	prototipo/.settings/org.eclipse.wst.common.project.facet.core.xml
Signed-off-by: Emmanuel Neri <ddarke.emanu@gmail.com>