Merge Events into Master

All Basic Crud and Layout on Events is completed... time to pull it into master.