Done.
Merge pull request #99 in YIN/basic from bugfix/YIN-222llogin to develop

# By haoxiangchen
# Via haoxiangchen
* commit 'c87653b067df04eb9fa47ec9d44d976fe4ff122d':
  Done.
no message
Merge branch 'bugfix/YIN-220-blog' of http://192.168.10.23:7990/scm/yin/basic into develop

Conflicts:
	themes/leather/views/item/view.php
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop

Conflicts:
	themes/leather/views/item/view.php
test
test
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop
1
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop
1
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop
change the backend
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop
no message
Merge pull request #100 in YIN/basic from bugfix/YIN-240 to develop

# By houweibo
# Via houweibo
* commit 'c73ee77bc0a471e96989a1f55f9d7fa3bcc1fdc6':
  no message
no message
Merge pull request #103 in YIN/basic from bugfix/YIN-2301-后台css和js顺序问题 to develop

# By Jiadong.Han
# Via Jiadong.Han
* commit '2782e5b369f803cde47400a784a459ea2fd56134':
  no message