Merge branch 'push_notifications_and_ref'
merge
Rewrite validation. Change tests and fixtures