Merge.
Merge branch 'master' of github.com:JacksonGariety/HashTraffic-Alpha
A nicer report viewing page. Adds back the content network to the homepage. Adds thw two extra fields for creating a report. Bug fixes.