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
完善网站导航
Merge pull request #104 in YIN/basic from bugfix/YIN-236 to develop

# By houweibo
# Via houweibo
* commit 'eca9fa8ff288fb981c61d60ee399880f07d72d3f':
  完善网站导航
no message
Merge branch 'develop' into bugfix/YIN-239
change the place of layout.
Merge branch 'bugfix/YIN-240' into develop
Merge branch 'develop' into bugfix/YIN-239
qq login
no message
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into bugfix/YIN-2301-后台css和js顺序问题
Merge branch 'develop' into bugfix/YIN-265-qq-llogin

Conflicts:
	protected/config/main.php