Loading & font
Merge remote-tracking branch 'origin/greg2'

Conflicts:
	Project/src/com/stratos/beautifulinfinittextualexperiment/ListActivity.java