Merge branch 'master' into FA_BranchV3
SingleViewImage ScaleGesture Completed
A
Still working on it
Merge branch 'FA_BranchV3' of https://github.com/COC155MobileAppDev/MobAppDev into FA_BranchV3
Mrg brnch 'FA v3' into Master_CPY_V3 - Resolved

Conflicts:
	LectuREC/.idea/misc.xml
	LectuREC/app/src/main/AndroidManifest.xml

LectuREC/app/src/main/java/com/example/team05/lecturec/ViewControllers/S
electedsessionActivity.java
	LectuREC/app/src/main/res/layout/activity_selectedsession.xml
	LectuREC/app/src/main/res/values/strings.xml