Merge branch 'master' of ligo-vcs.phys.uwm.edu:/usr/local/git/gracedb

gracedb/alert.py

gracedb/api.py

gracedb/cli_views.py

gracedb/migrations/0037_auto__chg_field_event_gpstime.py

gracedb/models.py

gracedb/query.py

gracedb/templatetags/timeutil.py

gracedb/translator.py

gracedb/view_logic.py

gracedb/view_utils.py

gracedb/views.py

middleware/profiling.py

settings/branson.py

settings/default.py

settings/roy.py

templates/gracedb/event_detail_script.js

utils/__init__.py