Added Meeting and General Event to admin.py file
Merge branch 'master' of https://github.com/neuromat/intranet