local commit
Merge branch 'master' of https://github.com/vhooloo/REG_Patient.git
changes

changes for sticky notes and formatting
Merge branch 'master' of https://github.com/vhooloo/REG_Patient

Conflicts:
	.gitignore
	PrescriptionRefill.php
	controller.php
	tpls/ListViewREG_Patient.tpl
	tpls/RiskEvaluationREG_Patient.tpl
	views/view.academicdetail.php
	views/view.reports1.php
	views/view.toplist.php