merged
Merge branch 'master' of https://github.com/eaguerom/PubliExpressWeb.git

Conflicts:
	PubliExpress/src/cr/publiexpress/common/Constants.java
	PubliExpress/src/cr/publiexpress/dto/wrapper/CampaignMessageWrapper.java
	PubliExpress/src/cr/publiexpress/dto/wrapper/RoutesMessageWrapper.java
	PubliExpress/src/cr/publiexpress/resources/messages_en.properties
	PubliExpress/src/cr/publiexpress/resources/messages_es.properties
	PubliExpress/src/cr/publiexpress/views/controllers/campaigns/CampaignListViewController.java
	PubliExpress/src/cr/publiexpress/views/controllers/campaigns/DeleteCampaignViewController.java
	PubliExpress/src/cr/publiexpress/views/controllers/campaigns/EditCampaignViewController.java
	PubliExpress/src/cr/publiexpress/views/forms/CampaignForm.java