Changed buildfile from phpdoc to phpdox
Updated deregister action to be not-cached (WWW-1570)
Merge branch 'master' into dev