d
d
Merge remote-tracking branch 'origin/master'

Conflicts:
	StaTapAlpha/res/layout/activity_home.xml