Version estable 21072014
Merge branch 'master' of https://github.com/roldanjm/PortalFinal

Conflicts:
	PortalSSWeb/web/registrar.jsp