Initial tweaks

Conflicts:

	xbmc/Application.cpp