Merge "Adding new gingerbread notifications and ringtones to master"