Merge from Dev notif 20140805

Merge from Dev notif 20140805