ignore
Merge remote-tracking branch 'origin/scottxsu'
Removed ignore of report controller
Allowed export of inactive and active members
Merge remote-tracking branch 'origin/master' into scottxsu