Merge remote-tracking branch 'origin/billiebranch'
testing merge again
Merge remote-tracking branch 'origin/master' into billiebranch

Conflicts:
	NonProfitApp/src/com/austindroids/npa/AppConfig.java