tagline is now model-sepcified
add the new 404 page
fix controller.js merge porblem