Changes in Expense views
Added attendace Report
Conflict Resolved