update .gitignore to handle eclipse specifics
prevent childs of AbstractRunnableComponent from overriding version and component name
handle merge