- Temp commit
- recovery of email change
 - Added findUserEmailEntityById method
Merge branch 'devel' into FTR-29-changepassword

Conflicts:
	muikku-core-plugins/src/main/java/fi/muikku/plugins/user/UserPluginDescriptor.java