(2/2) Notification count

Conflicts:
	res/values/ras_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/rascarlo/StatusBarSettings.java

Change-Id: I3245574f8215a8ace21c9e049ce130a8a4fd95e8