Final changes
Merge branch 'master' of https://github.com/rahul2906/XeroTasks