Testing for the user entity
test
Merge branch 'master' of https://github.com/anthonymonori/TieBreak

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties