up
Merge branch 'master' of https://github.com/hnth2507/videoslide

Conflicts:
	VideoSlide/source/ViewController/preview/SCMusicEditViewController.m
	VideoSlide/source/ViewController/preview/SCMusicEditViewController.xib
	VideoSlide/source/ViewController/setting/SCSettingViewController.xib