Added radio buttons to add/subtract common time ranges.
Fixed merge conflict with display_graphs.py
Merge branch 'staging' of github.com:visgence/portcullis into reorganizeFiles