Pre- pull to boadev 12/3/2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.bak_0.log
	.metadata/.bak_1.log
	.metadata/.bak_2.log
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.history/1c/70e7637f9f7100141bf194732a444a80
	.metadata/.plugins/org.eclipse.core.resources/.history/22/c0d8b686347800141b55b6c15ca91881
	.metadata/.plugins/org.eclipse.core.resources/.history/24/00a832628a7a00141953f081d2a39b76
	.metadata/.plugins/org.eclipse.core.resources/.history/33/30c5092bf77500141268b28a971efc97
	.metadata/.plugins/org.eclipse.core.resources/.history/54/f065bfffed75001413f4b12eb0a71ccf
	.metadata/.plugins/org.eclipse.core.resources/.history/57/6088d0b2ec75001413f4b12eb0a71ccf
	.metadata/.plugins/org.eclipse.core.resources/.history/5e/406fcf1e6b70001411a1ccf3bd733dfe
	.metadata/.plugins/org.eclipse.core.resources/.history/6d/306cbfe68a7900141e32a3688bec72a6
	.metadata/.plugins/org.eclipse.core.resources/.history/85/505aeb7c877a00141953f081d2a39b76
	.metadata/.plugins/org.eclipse.core.resources/.history/92/70d3d1ab8d7a00141953f081d2a39b76
	.metadata/.plugins/org.eclipse.core.resources/.history/bd/6041d0a5877a00141953f081d2a39b76
	.metadata/.plugins/org.eclipse.core.resources/.history/d/7067e6e38e7a00141953f081d2a39b76
	.metadata/.plugins/org.eclipse.core.resources/.history/d8/60267c79257800141b55b6c15ca91881
	.metadata/.plugins/org.eclipse.core.resources/.history/e6/f0b25f8f6c70001411a1ccf3bd733dfe
	.metadata/.plugins/org.eclipse.core.resources/.history/ea/d01410f57d7a00141953f081d2a39b76
	.metadata/.plugins/org.eclipse.core.resources/.history/f7/90208dd2897a00141953f081d2a39b76
	.metadata/.plugins/org.eclipse.core.resources/.history/fb/80474687347800141b55b6c15ca91881
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/.indexes/a0/ae/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/.indexes/a0/de/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/ae/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/history.index
	.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/.root/43.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.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/1803605547.index
	.metadata/.plugins/org.eclipse.jdt.core/579602119.index
	.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/12/49/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/12/49/refactorings.index
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/appcompat_v7/2014/12/49/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/appcompat_v7/2014/12/49/refactorings.index
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	SpeedReader/AndroidManifest.xml
	SpeedReader/bin/AndroidManifest.xml
	WebApp1/AndroidManifest.xml
	WebApp1/bin/AndroidManifest.xml
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
	appcompat_v7/bin/appcompat_v7.jar