Merge pull request #71 from Doha2012/master

Add class MockitoAnnotationTest
Updated Code

1. Eliminated VerificationToken from DTO
2. Decoupled email sending with event publishing
3. Eliminated email param from link sent to user
Merge pull request #72 from egmp777/master

Updated Code
add class JavaScannerTest
Merge remote-tracking branch 'upstream/master'