Squashed commit of the following:

commit 38852d7bdb9c667075a00e88ac5b3eca9ad89926
Author: Seb Brocher <seb@noctual.com>
Date:   Tue Jul 2 15:21:29 2013 -0500

    fixed shipment spec

commit 9fd3b244b652c9bfc3871948edefea53ffcd2acc
Author: Seb Brocher <seb@noctual.com>
Date:   Tue Jul 2 15:11:13 2013 -0500

    fixed packer specs

commit 3d8b0869cac04a4ea0d605e806ff04968b180b67
Author: Seb Brocher <seb@noctual.com>
Date:   Tue Jul 2 14:28:02 2013 -0500

    fixed a few more specs

commit e32f42fca6ec3f45ba6a5b1ab8af873ec7507bf6
Author: Seb Brocher <seb@noctual.com>
Date:   Tue Jul 2 14:13:37 2013 -0500

    fixed some more specs

commit d0621e6cda59b4cef8c61a7e0e4fb53294fce269
Author: Seb Brocher <seb@noctual.com>
Date:   Tue Jul 2 11:56:06 2013 -0500

    more code & spec fixes

commit bcbd587ef1f511933a74e47b245704729c64cdcc
Merge: 5b3e01a e906005
Author: Seb Brocher <seb@noctual.com>
Date:   Tue Jul 2 11:18:05 2013 -0500

    merged latest from upstream and resolved conflicts

commit e906005832258bb5c1d0d5a41c8290b9c496ad8f
Author: Washington Luiz <huoxito@gmail.com>
Date:   Wed Jun 26 16:54:27 2013 -0300

    Add feature spec for editing bundle via backend

commit 320f3e15376ea76ba90c236ef013fd5084822bea
Author: Washington Luiz <huoxito@gmail.com>
Date:   Wed Jun 26 16:24:24 2013 -0300

    Allow admin to delete a bundle product

    All inventory units associated with bundle are properly restock when
    bundle product is removed

commit 8ac14f8b80373e4c28fdf7605e5af55b3090b1c0
Author: Washington Luiz <huoxito@gmail.com>
Date:   Wed Jun 26 14:41:59 2013 -0300

    Append js file on the install generator

commit 3bd7f8b98c948a365500b5a3cd12f8910fa03973
Author: Washington Luiz <huoxito@gmail.com>
Date:   Wed Jun 26 03:02:15 2013 -0300

    Fix issue when updating item quantity in backend

    New inventory units for regular products, not bundle, were not being
    associated with a line item. That made the shipment manifest confusing
    because it didn't group the inventory units as it should. Instead it
    displayed inventory units for the same variant and shipment in different
    rows

commit 46731738b8b471b0cd084e96c79556c8459173f4
Author: Washington Luiz <huoxito@gmail.com>
Date:   Wed Jun 26 02:18:38 2013 -0300

    Add specs for OrderInventoryAssembly

    Now properly removes inventory units when item quantity is decreased

commit accc0b8a7149dabd6d43ce3b019c5aa58635e05f
Author: Washington Luiz <huoxito@gmail.com>
Date:   Tue Jun 25 17:14:22 2013 -0300

    Create OrderIventoryAssembly class

    Make it easier to read the code and realize what's going on, decreasing
    product bundle quantity still not working properly

commit a496d0a3690f854a0fa3ebffdce43f819c346d09
Author: Washington Luiz <huoxito@gmail.com>
Date:   Tue Jun 25 16:45:09 2013 -0300

    Update OrderInventory to verify bundle inventory units

    very ugly but looks like it work when increasing the bundle product
    quantity, doesn't work the other way around just yet

commit 16af3865086f4634d9643c46775769455abbd82e
Author: Washington Luiz <huoxito@gmail.com>
Date:   Tue Jun 25 14:45:28 2013 -0300

    Build UI to edit a bundle quantity via backend

commit d73dcfcc976b8c3f8b20a580733f4d7008c09620
Author: Washington Luiz <huoxito@gmail.com>
Date:   Mon Jun 24 19:42:05 2013 -0300

    Update README

commit 1b373283fcd29f273ae49e8fe23e59b85208515b
Author: Washington Luiz <huoxito@gmail.com>
Date:   Mon Jun 24 19:39:10 2013 -0300

    Add license

commit 7a0ecaf47c253616d0aae86fb424f71a329864e4
Merge: 5a82473 5ac7e22
Author: Washington L Braga Jr <washington@spreecommerce.com>
Date:   Mon Jun 24 15:30:55 2013 -0700

    Merge pull request #37 from spree/bundle-product

    Adjust the extension logic to comply with Spree 2.0 stock API

commit 5ac7e22897dc9195e0c8bdb85388d227faa8bf7d
Author: Washington Luiz <huoxito@gmail.com>
Date:   Tue Jun 18 16:16:38 2013 -0300

    Add task to help users link units to line items

    So that they have a chance to look at the backend UI and tell which
    items belongs to which product bundle

commit ebcf0e8501d704ccbbba20539ed5c05bcc39b724
Author: Washington Luiz <huoxito@gmail.com>
Date:   Tue Jun 18 15:04:38 2013 -0300

    Account for situation where we can't find a unit line item

    Users upgrading from older versions could see exceptions because the
    extension may not be able to find which line item originated a inventory
    unit

commit 7ec11941d741c372e83a65147a0eccbc231c0564
Author: Washington Luiz <huoxito@gmail.com>
Date:   Mon Jun 17 13:08:13 2013 -0300

    Fix compatibility with latest Spree stable release

commit 42069636c3406d6b3239e47d7adcc9e78672126b
Author: Washington Luiz <huoxito@gmail.com>
Date:   Mon Jun 17 02:30:22 2013 -0300

    Use OpenStruct to build package content

    Help to get rid of initialized constant warning when assign a Struct to
    new constant on the package decorator

commit f115ae1d3ee5ddff6bd51ccafc8d111d28baa73f
Author: Washington Luiz <huoxito@gmail.com>
Date:   Mon Jun 17 01:25:25 2013 -0300

    Prioritize packages properly among multiple location

    This creates a AssemblyPriorizer which checks for the right quantity
    needed for product parts and properly removes repeated packages

commit d22c0d9a42ca3b7a702b7010d529e79ccae646b8
Author: Washington Luiz <huoxito@gmail.com>
Date:   Sat Jun 15 23:53:21 2013 -0300

    Group shipment units per line item on frontend

commit 26a3602f556dddb4a6a0dacd84379c9eb583f2b3
Author: Washington Luiz <huoxito@gmail.com>
Date:   Sat Jun 15 23:05:35 2013 -0300

    Improve test coverage

    Remove repeated spec and ensure shipment manifest behave as expected on
    this extension

commit 67406061cbe62750336d5e600da30c60d9eddbe3
Author: Washington Luiz <huoxito@gmail.com>
Date:   Sat Jun 15 04:26:59 2013 -0300

    Account for situation units don't have a line item

commit cf05176b5e3d1859f660b90b62fadadd3fc61c9c
Author: Washington Luiz <huoxito@gmail.com>
Date:   Sat Jun 15 04:08:19 2013 -0300

    shipment.manifest returns all units with proper quantities

    Spree restock and unstock items based on the units returned by
    shipment.manifest so if it returns wrong the error follows to the stock
    item on hand quantity

commit cebd27427dad0478d6800f7438c3b538265e47d1
Author: Washington Luiz <huoxito@gmail.com>
Date:   Sat Jun 15 03:29:12 2013 -0300

    Fix case where Coordinator doesn't return proper packages

commit b567879bd543ef19a127d68828ce8471bf1898c7
Author: Washington Luiz <huoxito@gmail.com>
Date:   Fri Jun 14 17:07:08 2013 -0300

    Scope uniq line item assemblies only

commit 1f14ce4f24b37c617e1d419c2938088132033560
Author: Washington Luiz <huoxito@gmail.com>
Date:   Fri Jun 14 16:55:24 2013 -0300

    Resolve conflich between individual product and bundle part

    Spree should know whether the inventory unit is associated with a
    product sold individually or with a part of a bundle.

    We probably need to also add a part column on the InventoryUnit table so
    that this behaviour is persisted at the unit level doesn't depend on the
    bundle product state which might change in the future

commit 2c73fdf2c90aba50d02a1267d675805d21fac508
Author: Washington Luiz <huoxito@gmail.com>
Date:   Fri Jun 14 13:44:16 2013 -0300

    Group inventory units by line item on shipment manifest

    Update Package::ContentItem to also have a line item.

commit 1db3ea3d8058d149d44905f2acba0d4b254d80d4
Author: Washington Luiz <huoxito@gmail.com>
Date:   Fri Jun 14 13:11:30 2013 -0300

    Fix rails command

    Migrations should be generated in the extension dir, not in the dummy
    app

commit b426b735c58090164dc7443d79967ef7222db05c
Author: Washington Luiz <huoxito@gmail.com>
Date:   Thu Jun 13 16:28:59 2013 -0300

    Remove before_payment code from CheckoutController

    Otherwise it removes the product bundle items on the order because
    they're not included in the shipment (unshippable)

    There's a PR for this on spree/spree but I'm not sure it
    will be accepted, see https://github.com/spree/spree/pull/3193

commit deb178e0df650a39746784c97971eaa0af88b87e
Author: Washington Luiz <huoxito@gmail.com>
Date:   Thu Jun 13 14:55:11 2013 -0300

    Display product bundles on backend orders UI

commit 693aaf15964f4cb2f9c861db8047e342392fc907
Author: Washington Luiz <huoxito@gmail.com>
Date:   Wed Jun 12 10:54:25 2013 -0300

    Check for parts stock items instead if product is assembly