Merge branch 'master' of github.com:Lexy92/Funeral

Conflicts:
	mvc/app/controller/order.php
	mvc/app/model/order.php
Merge branch 'master' of github.com:Lexy92/Funeral