初步完成药品库的框架
Merge remote-tracking branch 'yanshixing/master'
函数初步完成

ok
CSS Metro Style/alert function
CSS StrDemo2.0
Merge remote-tracking branch 'remotes/jinjiandong/master'

Conflicts:
	app/__init__.pyc
	app/static/page/sizheninfo-list-view.html
	app/views.pyc