Merge branch 'master' of tkfftk@dev.intra.insomnia.fi:/data/bortal

code/LanBortalDatabase/.classpath

@@ -12,6 +12,5 @@
 			<attribute name="owner.project.facets" value="jst.java"/>
 			<attribute name="owner.project.facets" value="jst.java"/>
 		</attributes>
 		</attributes>
 	</classpathentry>
 	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/commons-codec-1.4"/>
 	<classpathentry kind="output" path="build/classes"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
 </classpath>

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/tools/PasswordFunctions.java → code/LanBortalUtilities/src/fi/insomnia/bortal/utilities/PasswordFunctions.java

-package fi.insomnia.bortal.tools;
+package fi.insomnia.bortal.utilities;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.security.MessageDigest;
 import java.security.MessageDigest;