Initial tweaks

Conflicts:

	xbmc/Application.cpp

Conflicts:

	xbmc/Application.cpp
Merge branch 'frodo-12.1-xaf-teg2-touch' of github.com:xbmcandroid/xbmc into frodo-12.1-xaf-teg2-touch