Merge branch 'master' into feature/stabilization
Update methods on SimpleMockOrganizationService
SOC-4067 | change MockMailService and change log info to debug.
pl injection on 20140526-142752
pl injection on 20140619-111507
COMMONS-326 | [Social notification] Logic of migration for users email notification settingin PLF-4.1 is not good
COMMONS-332 | Change SimpleMockOrganizationService to add more information of SimpleUser.
Merge feature/social-notifications to master
Merge branch 'feature/stabilization'
Merge master to feature/social-notifications