testando...
Merge origin/master

Conflicts:
	App/src/java/bean/LoginBean.java