meng update list
Merge branch 'tubes5' of https://github.com/edwardsamuel/IF3038-2013 into tubes5

Conflicts:
	5-Offline/TodolistClient/src/id/ac/itb/todolist/client/Controller.java
	5-Offline/TodolistServer/src/id/ac/itb/todolist/server/ConnectionHandler.java