Added person id to console output
Merge branch 'dev' into branch2

Conflicts:
	java-git-test/src/org/home/test/PersonaMain.java (resolved)