changes to comments directive
changes to comments directive
solved the conflict
new dashboard and calendar changes