fixed null pointer check and added a unit tests,
added a unit test to verify the newly added Id field of UserSpring
Merge remote-tracking branch 'origin/develop' into develop
fixed unit test due to changes of user spring and the newly created id field