Av merge 29/11/13
Merge branch 'master' of
https://github.com/JuSKT/LO54_Project_WebService.git

Conflicts:
	LO54_Project/src/com/lo54project/webservice/dao/ClientDao.java
Somme getter by id of DAO has been changed for criteria fetch mode