status bar notification count

Conflicts:
	res/values-es/strings.xml
	res/xml/status_bar.xml