added financial information
halfway-news showcase
changed a label
final touch of news
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
Merge branch 'dev'

* dev:
  final touch of news
  changed a label
  halfway-news showcase
  added financial information