no message
Merge branch 'master' of github.com:xujiangwei/smart-itsm-iphone

Conflicts:
	SmartITSM/SmartITSM/SOwnViewController.m