android change
android
Merge branch 'master' of https://github.com/HeavenDoor/Stock

Conflicts:
	Android/.metadata/.log
	Android/.metadata/.plugins/org.eclipse.cdt.core/.log
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/StockSide/.indexes/a0/d6/history.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/StockSide/.indexes/a0/de/history.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/StockSide/.indexes/e4/81/6d/history.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/StockSide/.indexes/history.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/StockSide/.indexes/properties.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/StockSide/.markers
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/StockSide/.markers.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/StockSide/.syncinfo.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Android/.metadata/.plugins/org.eclipse.core.resources/.snap
	Android/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Android/.metadata/.plugins/org.eclipse.jdt.core/2632745050.index
	Android/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	Android/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	Android/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	Android/appcompat_v7/bin/appcompat_v7.jar
	stock.suo