Merge dev-nsnotificationcenter