# Conflicts:
#	Class/ClientViewController.m
#	Class/ClientdetailsViewController.m
#	Class/OrderdetailsViewController.m
#	Lighting/OppleMain.storyboard
#	Tools/BaseViewController.h