Use master branch of WPCS again
Fix indentation
Reset notification post type class to what is in master
Merge develop into api-filter