feedback
Merge branch 'DashBoard-ip5' of https://github.com/lych0317/DashBoard into DashBoard-ip5

Conflicts:
	DashBoard.xcodeproj/project.pbxproj