Se agrega un nuevo parametro a las consultas de find by id and find by
key, ahora se le puede indicar que fetchfgroups vana ser cargados. este
parametro puede ser nulo
versión mejorada del dashboard y los detalles de campaña
Merge branch 'master' of
https://github.com/globant/googleappengine-training.git

Conflicts:
	AddsIncGAE/src/com/globant/gaetraining/addsincgae/controllers/DashboardController.java
	AddsIncGAE/src/com/globant/gaetraining/addsincgae/daos/CampaignDao.java
	AddsIncGAE/src/com/globant/gaetraining/addsincgae/daos/GenericDao.java
	AddsIncGAE/src/com/globant/gaetraining/addsincgae/services/CampaignService.java
	AddsIncGAE/war/WEB-INF/jsp/CampaignDetails.jsp
Merge branch 'master' of
https://github.com/globant/googleappengine-training.git

Conflicts:
	AddsIncGAE/src/com/globant/gaetraining/addsincgae/services/CampaignService.java