teste commit
Merge branch 'master' of https://github.com/kaplen/KaplenAdmin.git

Conflicts:
	Kaplen/src/main/webapp/app/ftpmanager/FTPManager.js