Merge branch 'master' of veritivgit:Veritiv/manta

Conflicts:
	.gitignore
	src/main/java/com/espendwise/manta/service/EventServiceImpl.java

git-svn-id: svn+ssh://10.208.165.230/var/svn/manta/trunk@6 1b43ae0b-0eaa-4ddf-b442-92340ddbe092
Merge branch 'master' of veritivgit:Veritiv/manta