del

del
Merge branch 'master' of https://github.com/niltors/Android

Conflicts:
	.metadata/.plugins/org.eclipse.cdt.core/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt
.core.external.folders/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/niltor/.markers.
snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap

.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/2082669138.index
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml