-update form prettifying
# Conflicts: # controllers/OrderController.php
# Conflicts: # models/Order.php