no message
Merge pull request #96 in YIN/basic from bugfix/YIN-2015forNews to develop

# By Jiadong.Han
# Via Jiadong.Han
* commit '11c157a2b38ffd7611f34ffe508a0c56153390e5':
  no message
no message
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop

Conflicts:
	themes/leather/views/item/view.php