sync
sync

Conflicts:
	beautiful
demo/MainViewController/Left&center_viewcontroller/LeftViewController.m