Ai_lame start
Merge remote-tracking branch 'origin/AI_Lame'

Conflicts:
	uqcard/res/layout/activity_main.xml