Genera project con user_id cantalo...cantalo...cantalo....GOL!
mas DAO, mas servlet... mas trabajo #ALTAPAJA
edit, view y search servlets para project
Merge remote-tracking branch 'origin/master'

Conflicts:
	out/artifacts/Aq_war_exploded/secured/saveproject.jsp
	src/main/java/servlets/IndexServlet.java
	src/main/java/servlets/user_action/LoginServlet.java
	src/main/java/testMain.java
	src/main/resources/hibernate.cfg.xml
	web/WEB-INF/web.xml
	web/addproject.jsp
	web/index.jsp
	web/register.jsp
	web/resources/scripts/jquery-1.10.2.min.js
	web/saveproject.jsp
	web/secured.jsp
	web/viewproject.jsp
project, search y user servlets agregados
front-end the projectlist definido, falta comprobar el jstl y estamos
se que funca
Merge branch 'master' of C:\Users\franco\projects\Aquarius with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/WEB-INF/tags/navigation/main_nav.tag
	web/secured/index.jsp
projectlist divina y dropdown de type con jstl
add project configuration plus search back-end
add project configuration plus search back-end
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/control/dao/TypeDAO.java
	src/main/java/model/Project.java
	src/main/java/servlets/project/ViewProjectServlet.java
	src/main/java/servlets/user/LogOutServlet.java
	web/WEB-INF/tags/imports/js_files.tag
	web/WEB-INF/tags/navigation/main_nav.tag
	web/WEB-INF/web.xml
add project configuration plus search back-end
Merge remote-tracking branch 'origin/master'
js de add project se ve espectacular !!!
funcionamiento correcto de addproject y projeclist
tag js solucionado para el addproject
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/control/dao/ProjectDAO.java
	src/main/java/control/dao/TypeDAO.java
	src/main/java/control/dao/UserDAO.java
	src/main/java/model/Project.java
	src/main/java/model/Tag.java
	src/main/java/servlets/LoginServlet.java
	src/main/java/servlets/user/RegisterServlet.java
	src/main/java/testMain.java
leves correcciones al projecto para dejar todo funcionando luego del cambio en la base de datos