Merge origin/master

Conflicts:
	derby.log
	src/main/java/com/pepaproch/massmailmailer/controlers/CampainValidator.java
	src/main/java/com/pepaproch/massmailmailer/controlers/TemplateController.java
	src/main/webapp/WEB-INF/ui/js/campain.js
	src/main/webapp/WEB-INF/ui/js/entityService.js
	src/main/webapp/WEB-INF/ui/views/campain/edit.html