Project 1 million refactors and changes

[subhaklp]

• Contains major template changes to account for new concepts in report
• Has fixes to use aggregates etc..
• Has a new 404 page to handle old report links