Fix the html, make the top link appear correctly and lower case PHP keyword
Make sure common functions library is included
Merge branch 'develop' into KwaMoja-Medical