add functions
Merge branch 'Dev'
Merge branch 'Add_Feature'

Conflicts:
	GitTest/YGAppDelegate.m