Added template modulepage.html
Conflicts Resolved
FixedConflicts.Again