hoi

:)
Merge branch 'master' of https://github.com/mike0631/healthyDroid

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui
.prefs
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml