Merge branch 'JE_Branch' into FA_Branch
Merge branch 'JE_Branch' into FA_Branch
Merge branch 'FA_Branch' of https://github.com/COC155MobileAppDev/MobAppDev into FA_Branch