Merge branch 'tubes3' of https://github.com/edwardsamuel/IF3038-2013 into tubes3
profile (-upload avatar) dan search (belum selesai)
profile ( - upload avatar ) dan search (belum selesai)
Merge branch 'tubes3' of https://github.com/edwardsamuel/IF3038-2013 into tubes3

Conflicts:
	TodolistJava/nbproject/genfiles.properties
	TodolistJava/nbproject/project.properties
	TodolistJava/src/java/id/ac/itb/todolist/dao/TugasDao.java
	TodolistJava/src/java/id/ac/itb/todolist/dao/UserDao.java
	TodolistJava/web/WEB-INF/includes/header.inc.jsp
	TodolistJava/web/WEB-INF/web.xml