Merge pull request #90 in YIN/basic from bugfix/YIN-242 to master

# By Jiadong.Han (6) and others
# Via Jiadong.Han (5) and others
* commit 'fc6b0924728df328d1b448a81eb6738e6daababa':
  no message
  make the pictures align centrer
  no message
  contact us can't link
  no message
  no message
  no message
  modify some small problems
  Registration page message not center
  no message
  no message
  upload database
  beautify the pages
Done.
Merge pull request #99 in YIN/basic from bugfix/YIN-222llogin to develop

# By haoxiangchen
# Via haoxiangchen
* commit 'c87653b067df04eb9fa47ec9d44d976fe4ff122d':
  Done.
Merge branch 'develop'
logo
Merge branch 'develop'
Merge branch 'develop'
no message
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
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop