Lining shit up.
Started making tweaks to Order views so that we can get things separated into Customer and Admin views.
Fixed minor merge conflict in Items Controller.