Merge branch 'master' of https://github.com/wlpiaoyix/sunsharp

Conflicts:
	wxlearn/wxlearn/wxlearnAppDelegate.m