Merge origin/master

Conflicts:
	README.md
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	src/edu/PIDEV/dao/ClientInscritDAO.java