Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-prescription

# Conflicts:
#	js/buz/followup/drugs.js
#	page/followup/drugs.html