Merge branch 'Home-2'
Merge branch 'refs/heads/Home'
Merge branch 'refs/heads/Home'
Home commit
Merge branch 'refs/heads/Home'
Order
Merge branch 'master'

Conflicts:
	app/Model/Order.php
	app/Model/OrderType.php
	app/Model/Printer.php
	app/View/Elements/menus/main_menu.ctp
	app/View/Printers/admin_index.ctp
	app/View/Printers/index.ctp
	app/View/Printers/view.ctp