Fixed tiles nonsense and changed jetty.xml localtion
Conflicts solving