Merge branch 'devel' into feature/maven

Conflicts:
	code/MoyaAuthModule/.classpath
	code/MoyaAuthModuleClient/.classpath
	code/MoyaTerminalWeb/.classpath

code/MoyaAuthModuleClient/.settings/org.eclipse.wst.common.component

-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="MoyaAuthModuleClient">
     <wb-module deploy-name="MoyaAuthModuleClient">
         <wb-resource deploy-path="/" source-path="/src"/>
         <wb-resource deploy-path="/" source-path="/src"/>
     </wb-module>
     </wb-module>

code/MoyaDatabase/.settings/org.eclipse.wst.common.component

@@ -2,6 +2,7 @@
 <wb-module deploy-name="MoyaDatabase">
 <wb-module deploy-name="MoyaDatabase">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src" tag="defaultRootSource"/>
         <wb-resource deploy-path="/" source-path="/src" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
         <property name="context-root" value="MoyaDatabase"/>
         <property name="context-root" value="MoyaDatabase"/>
         <property name="java-output-path" value="/MoyaDatabase/target/classes"/>
         <property name="java-output-path" value="/MoyaDatabase/target/classes"/>
 </wb-module>
 </wb-module>