adding more code

usen el template que esta en la carpeta  TEMPLATE. en webpages.
Merge branch 'master' of https://github.com/robbStarkTFG4/baratheon

Conflicts:
	webApp/build/web/WEB-INF/classes/com/client/named/DataGridSearch.class
	webApp/nbproject/private/private.xml
	webApp/src/java/com/client/named/DataGridSearch.java