no message
Merge branch 'master' of https://github.com/bazaalejandro7/ABARS

Conflicts:
	.metadata/.log
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.projects/ABARS/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ABARS/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/ABARS/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/ABARS/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1466787874.index
	.metadata/.plugins/org.eclipse.jdt.core/1687393277.index
	.metadata/.plugins/org.eclipse.jdt.core/3494023952.index
	.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/version.ini
	.recommenders/caches/identified-project-coordinates.json
	.recommenders/repository/http___download_eclipse_org_recommenders_models_luna_/org/eclipse/recommenders/index/0.0.0-SNAPSHOT/resolver-status.properties