Merge branch 'dev'

* dev:
  admin interface
Merge branch 'dev'

* dev:
  style adjust/user website
Merge branch 'dev'

* dev:
  fixed translation issues
bug fix #23 #24 #25
Merge branch 'hotfix'

* hotfix:
  bug fix #23 #24 #25
security: deny login via empty password
Merge branch 'hotfix'

* hotfix:
  security: deny login via empty password
fix admin page user link bug
change weibo style, fix user view
Merge branch 'hotfix'

* hotfix:
  change weibo style, fix user view
Merge branch 'master' into dev

* master:
  change weibo style, fix user view
  fix admin page user link bug
  security: deny login via empty password
  bug fix #23 #24 #25

Conflicts:
	Tpl/User/view.html