add *.swp
added updated_by_status_daterange
added updated_by_status_daterange, moved to bugs
Merge remote-tracking branch 'upstream/master'