Merge branch 'revertoi' into 'master'

TUUKKA PERKELE!

Revertoidaan i18n tiedostojen poisto, siirretään ne oikeaan paikkaan ja fiksataan pom.xml

See merge request !128

code/moya-utils/src/test/java/fi/codecrew/moya/utilities/JsonUtilsTest.java

@@ -50,7 +50,6 @@ public class JsonUtilsTest {
 		JsonValue expected = jsonObject("{\"quuz\":\"plop\"}");
 		JsonValue actual = JsonUtils.getSubObject(meta, path);
 		Assert.assertEquals(expected.toString(), actual.toString());
-
 	}
 
 	@Test

code/moya-web/WebContent/META-INF/MANIFEST.MF

+Manifest-Version: 1.0
+Class-Path: lib/MoyaUtilities.jar
+

code/moya-web/WebContent/foodadmin/createTemplate.xhtml

@@ -27,7 +27,6 @@
 					<p:tab id="basicinfo" title="#{i18n['foodwavetemplate.basicinfo']}"> -->
 				<h:panelGrid columns="3">
 					<h:outputLabel for="name" value="#{i18n['foodwavetemplate.name']}" />
-
 					<h:inputText id="name" value="#{foodWaveView.template.name}"
 						required="true" requiredMessage="Name required" />
 					<h:message for="name" />

code/moya-web/pom.xml

@@ -5,6 +5,7 @@
 	<packaging>war</packaging>
 	<build>
 		<plugins>
+
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
 				<version>2.4</version>
@@ -15,16 +16,6 @@
 				</configuration>
 			</plugin>
 		</plugins>
-<resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-
 	</build>
 
 	<dependencies>