Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf.git into...

Conflicts:
	pom.xml

diff --cc pom.xml
index 4de438a,eccdddc..598ab0d
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -18,8 -18,7 +18,8 @@@
      <dependency>\r
        <groupId>org.glassfish</groupId>\r
        <artifactId>javax.faces</artifactId>\r
-       <version>2.1.16</version>\r
 +      <scope>provided</scope>\r
+       <version>2.1.21</version>\r
      </dependency>\r
      <dependency>\r
        <groupId>javax.servlet.jsp.jstl</groupId>\r
@@@ -31,20 -29,33 +31,34 @@@
      <dependency>\r
        <groupId>org.jboss.weld.servlet</groupId>\r
        <artifactId>weld-servlet</artifactId>\r
 -      <version>1.1.10.Final</version>      \r
 +      <version>1.1.10.Final</version>\r
 +      <scope>provided</scope>\r
+     </dependency>    \r
+     <dependency>\r
+       <groupId>org.apache.httpcomponents</groupId>\r
+       <artifactId>httpclient</artifactId>\r
+       <version>4.2.3</version>\r
+     </dependency>\r
+     <!-- File upload -->\r
+     <dependency>\r
+       <groupId>org.apache.myfaces.tomahawk</groupId>\r
+       <artifactId>tomahawk20</artifactId>\r
+       <version>1.1.10</version>\r
      </dependency>\r
-     \r
+     <dependency>\r
+       <groupId>commons-io</groupId>\r
+       <artifactId>commons-io</artifactId>\r
+       <version>2.1</version>\r
+     </dependency>    \r
      <dependency>\r
        <groupId>com.indexdata</groupId>\r
        <artifactId>masterkey-common</artifactId>\r
-       <version>0.1.10-SNAPSHOT</version>\r
+       <version>0.1.10</version>\r
      </dependency>\r
    </dependencies>\r
- \r
    <build>\r
 -    <directory>target</directory>\r
 -    <outputDirectory>target/classes</outputDirectory>\r
 +    <directory>target-as</directory>\r
 +    <outputDirectory>target-as/classes</outputDirectory>\r
      <sourceDirectory>src/main/java</sourceDirectory>\r
      <resources>\r
        <resource>\r