Updated all php code
Merge branch 'master' of https://github.com/cfil360/BootstrapWebsite