Setting's interface
Setting's interface
Merge branch 'master' of github.com:PMC-EXHIBITION/PMC

Conflicts:
	PMCExhibitionTable.xcodeproj/project.pbxproj