Merge branch 'master' of github.com:Automattic/_s into upstream
add theme hook alliance

add tha to functions;

add theme hook alliance action hooks to templates

add tha hooks to 404.php