Monday Morning Reconcile on boadev
Merge branch 'master' of https://github.com/hdemby/workspace
Should be ok now

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.history/14/90a6b3fd5c6b0014110db4740b8028e7
	.metadata/.plugins/org.eclipse.core.resources/.history/21/30c894937c72001412f9f8de86678413
	.metadata/.plugins/org.eclipse.core.resources/.history/26/5029737e6472001412f9f8de86678413
	.metadata/.plugins/org.eclipse.core.resources/.history/29/a0100a975c6b0014110db4740b8028e7
	.metadata/.plugins/org.eclipse.core.resources/.history/3/0062987bc77200141680938dac5bbcb8
	.metadata/.plugins/org.eclipse.core.resources/.history/4/20776d43d77200141680938dac5bbcb8
	.metadata/.plugins/org.eclipse.core.resources/.history/47/30031e76c27100141650b5e3feb772b8
	.metadata/.plugins/org.eclipse.core.resources/.history/4a/b0e6e5f65d6b0014110db4740b8028e7
	.metadata/.plugins/org.eclipse.core.resources/.history/4a/e0fb6bc5c27100141650b5e3feb772b8
	.metadata/.plugins/org.eclipse.core.resources/.history/67/804eed42c27100141650b5e3feb772b8
	.metadata/.plugins/org.eclipse.core.resources/.history/75/60b5d034187300141094bc40e40239ad
	.metadata/.plugins/org.eclipse.core.resources/.history/97/e09dcffe5c6b0014110db4740b8028e7
	.metadata/.plugins/org.eclipse.core.resources/.history/99/20f8cda2d77200141680938dac5bbcb8
	.metadata/.plugins/org.eclipse.core.resources/.history/a4/60d2110b5f6b0014110db4740b8028e7
	.metadata/.plugins/org.eclipse.core.resources/.history/bb/2056791ec27100141650b5e3feb772b8
	.metadata/.plugins/org.eclipse.core.resources/.history/bb/6074b46da46f00141afca57c48698bde
	.metadata/.plugins/org.eclipse.core.resources/.history/d7/e0af18995d6b0014110db4740b8028e7
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/e4/81/76/79/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.sse.core.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/11/47/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/11/47/refactorings.index
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	ClassApp2/AndroidManifest.xml
	ClassApp2/res/values/strings.xml
	CoinToss/AndroidManifest.xml
	FourDroidApps/bin/classes.dex
	FourDroidApps/bin/dexedLibs/android-support-v4-210be17ee8ac3c731c5e39a83f13854a.jar
	FourDroidApps/bin/dexedLibs/android-support-v7-appcompat-18d0f5ff657014e751d2b3f9bd190ad9.jar
	FourDroidApps/res/layout/activity_main.xml
	MeloBellies/AndroidManifest.xml
	MeloBellies/bin/AndroidManifest.xml
	MeloBellies/bin/MeloBellies.apk
	MeloBellies/bin/dexedLibs/appcompat_v7-ae42838384561bf99555bbbf3a64cbc5.jar
	MeloBellies/bin/resources.ap_
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
	appcompat_v7/bin/appcompat_v7.jar