fixing errors
Merge branch 'demo2' of https://github.com/StrataLabs/service_desk into demo2