Fixed double counting issue
Updated user permissions
Added national and inactive user csv feeds