project cleanup
AM PM related changes
Merge branch 'master' into develop
reformat code
- removed birthday functionality
- added event types