Update Report Box
git merge
Report Box setProperties
Merge remote-tracking branch 'origin/branchFIx'

Conflicts:
	FYP.xcodeproj/project.pbxproj
	FYP.xcodeproj/project.xcworkspace/xcuserdata/sebacancinos.xcuserdatad/UserInterfaceState.xcuserstate
	FYP/Base.lproj/Main.storyboard
	FYP/FYPReportBoxViewController.xib
	FYP/FYPReportViewController.h
	FYP/FYPReportViewController.m