emailer code

emailer code
Merge branch 'master' into sh-fixtests

* master:
  emailer code

Conflicts:
	gripe-server/pom.xml
update to junit 4
fix eclipse error about Dynamic Web 3.0
(http://qussay.com/2013/09/13/solving-dynamic-web-module-3-0-requires-java-1-6-or-newer-in-maven-projects/)