SOAP
Merge branch 'tubes4progin' of https://github.com/amelia2801/IF3038-2013 into tubes4progin

Conflicts:
	ServerService/src/java/vm/dao/TaskDAO.java
	ServerService/src/java/vm/model/Category.java