Changes made by Kurt Garcia (kgarcia@rhainc.com). Calendar Working
Changes made by Kurt Garcia (kgarcia@rhainc.com). Setings Controller