Implemented changes from article review
Merge branch 'master' of https://github.com/ScavixSoftware/WebFramework

Conflicts:
	web/sample_shop/model/sampleshoporder.class.php