Rename User Management Service Tests to not include v0.2 flag.
Merge branch 'master' of https://github.com/teamzone/TeamZone
Merge branch 'master' of https://github.com/teamzone/TeamZone
Testing build.
Fixed bug in EmailVerifyService fake. The call to update the array should have been a 'push'
Remove resetCount call; the test no longer needs it.
Storing changes for a merge
Resolved Conflicts
Merge branch 'master' of https://github.com/Bringer128/TeamZone

Conflicts:
	lib/EmailVerifyService.js