encryption
Merge pull request #168 from daverboy23/master

encryption
encryption exception fix
Merge pull request #169 from daverboy23/master

encryption exception fix
encryption stuff temporarily removed
Merge pull request #170 from daverboy23/master

Encryption stuff temporarily removed
fixing stupid mistake
Merge pull request #171 from daverboy23/master

fixing stuff again
lots of changes. uploading richard's changes for the calendar, and his dialogs, fixed the event manager for titles, etc.
Merge pull request #172 from jkuk/master

BLEB! Lots of changes for richards and peeps and me
Committee Update.