added p calendar to attendance
fixed web xml merge
finished calendar integration and added duration
Merge branch 'master' of https://github.com/mcr77/DD-ACLabs