Modified address and date
Merge branch 'master' of https://github.com/simoncomputing/Ghost

Conflicts:
	src/main/java/generator/IdentityGenerator.java