--
Merge remote-tracking branch 'origin/peter' into alexTablePopulate

Conflicts:
	SimpleStocks/app/src/main/java/com/simplestocks/simplestocks/MyActivity.java