fix property issue
added comment
Merge branch 'test' into test1
Merge branch 'test1'

Conflicts:
	Jenkins/AppDelegate.m