add AutoFocus
Merge branch 'develop'

Conflicts:
	Demo2/d/resource/app/Screen/OutletParameter.xml
Merge branch 'develop'
Change default resolution to Tab 2
Merge branch 'master' into develop