Mergeado con entrega5

backend/.metadata/.lock

backend/.metadata/.log

backend/.metadata/.mylyn/repositories.xml.zip

....resources/.projects/.org.eclipse.egit.core.cmp/.location

...org.eclipse.core.resources/.root/.indexes/history.version

...rg.eclipse.core.resources/.root/.indexes/properties.index

....eclipse.core.resources/.root/.indexes/properties.version

...metadata/.plugins/org.eclipse.core.resources/.root/3.tree

...ipse.core.resources/.safetable/org.eclipse.core.resources

...e.core.runtime/.settings/org.eclipse.core.resources.prefs

...e.runtime/.settings/org.eclipse.e4.ui.css.swt.theme.prefs

....settings/org.eclipse.e4.ui.workbench.renderers.swt.prefs

...g.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs

...untime/.settings/org.eclipse.jst.j2ee.webservice.ui.prefs

...se.core.runtime/.settings/org.eclipse.m2e.discovery.prefs

...re.runtime/.settings/org.eclipse.mylyn.context.core.prefs

...core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs

...e.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs

...lipse.core.runtime/.settings/org.eclipse.ui.browser.prefs

...g.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs