added xls and csv download ability
fixed merged conflicts