Merge branch 'master' into develop
fix dependency with tomcat maven plugin
update prop location
add missing file:
fix issue with tiles
update dependency
test
email verifier service and byte plant verifier service
change product name to mailsy
web crawling deferredresult
Merge commit '0a83bd4c9a59d572a8f85d59d32216d7d6c4e005' into web-crawler

Conflicts:
	src/main/java/com/equivi/mailsy/web/controller/EmailCollectorController.java
fix spring config
fix spring config
Merge branch 'develop' into web-crawler
wip
import email list and config
Merge branch 'develop' of https://github.com/equivipte/demailer-web into develop
test pom.xml
change to mailsy
update data access