- Temp commit
Merge branch 'devel' into FTR-29-changepassword

Conflicts:
	muikku-core-plugins/src/main/java/fi/muikku/plugins/user/UserPluginDescriptor.java
Merge branch 'devel' into FTR-29-changepassword
 - Added validation and localization
 - merge devel
Merge branch 'FTR-29-changepassword' into devel

Conflicts:
	muikku-core-plugins/src/main/java/fi/muikku/plugins/user/UserChangePasswordBackingBean.java
	muikku-core-plugins/src/main/resources/META-INF/resources/user/user-changepassword.xhtml