wierd file resolution
Squashed commit of the following:

commit 0a12caadd88d3e36ef4e9095cd40e28e9a3bdfa5
Author: Jesse Eichar <jesse.eichar@camptocamp.com>
Date:   Wed Dec 4 15:11:42 2013 +0100

    Now compiles

commit 1213ec026583bf02b4b695726b28f37d6e20f82b
Author: María Arias de Reyna <maria.arias@geocat.net>
Date:   Thu Nov 7 16:57:58 2013 +0100

    cherry-pick a1e34ea04c5a2496ea39e1ff7afb253c0409ad81

commit a39c64d6b12a10a06d5c338d19f7441fea71f638
Author: María Arias de Reyna <maria.arias@geocat.net>
Date:   Thu Nov 7 16:40:37 2013 +0100

    cherry-pick 78a5ab5114666e742ebf8ddb5bf9bc4f440f6fe2

commit 043ec0be31c7adcaf9bbd7c93a519b0f01dd2173
Author: María Arias de Reyna <maria.arias@geocat.net>
Date:   Thu Nov 7 10:16:15 2013 +0100

    cherry-pick fbd5aeb442f345a0cb677cfa2fa4c2f579bc2936

commit e2b908ba7ba41d8bec1a6171f80b7b158c7f649b
Author: María Arias de Reyna <maria.arias@geocat.net>
Date:   Thu Nov 7 09:25:48 2013 +0100

    cherry-pick 767a76bbbdf72eae4343543fcd32ae774dc3b2ca

commit abf46120dcefd966f769b912c3b9f3e816f59c7c
Author: María Arias de Reyna <maria.arias@geocat.net>
Date:   Thu Nov 7 09:21:29 2013 +0100

    cherry-pick 04d9035e5ec500665e393b1f70b58d340fa66333

commit f0a7eaf40ba37a5e3124b7cc962c14f2dbf1f931
Author: María Arias de Reyna <maria.arias@geocat.net>
Date:   Tue Nov 5 16:47:31 2013 +0100

    cherry-pick 388463c2d5425454d9d745ee09cf2556d342b975

commit 74c2d6e11a99eb8eb0fb86f5c9b8f1d5297237f0
Author: María Arias de Reyna <maria.arias@geocat.net>
Date:   Tue Nov 5 13:48:49 2013 +0100

    cherry -pick 5507edcb8d0a5bee34318f95c88356d22109ed20

commit edb69fd986165f580dd987ed13205f939199584d
Author: María Arias de Reyna <maria.arias@geocat.net>
Date:   Tue Nov 5 13:24:36 2013 +0100

    cherry-pick b5ba234065ff97e892603dbff57287da87549ac3

commit 01ad0531b7f516233dbd15c7105cd6ef26ecba48
Author: María Arias de Reyna <maria.arias@geocat.net>
Date:   Thu Oct 31 13:13:50 2013 +0100

    cherry pick b9569ed7db9f7bdf9b6544707a9a61a73777246e

commit 7e39992babce1cbe6c3d0ff31dee7d79c8cc3d5d
Author: María Arias de Reyna <maria.arias@geocat.net>
Date:   Thu Oct 31 09:17:16 2013 +0100

    cherry pick c5838afe49672160fe1d08f57d2a2172c7dd1d34

commit ae046f1bc9bde6990ac5cbe4dab1b48e0cb76f97
Author: María Arias de Reyna <maria.arias@geocat.net>
Date:   Wed Oct 30 17:05:05 2013 +0100

    cherry pick 17021c1d08a46276368ec32329dc984d52a3c4bf