Fix $order variable collision
update changelog in docs
Merge pull request #134 from haraldpdl/worldpay

Fix $order variable collision
Removed extra ;

Removed extra ;
Introduce Bootstrap v3.2.0
Bootstrap Integration.

Change the osc_template class and header/footer to include the necessary Bootstrap files.
Bootstrap Breadcrumb
Bootstrap InfoBoxes

Left and Right Column InfoBoxes
Bootstrap H1 Headings
Bootstrap Buttons
Merge pull request #136 from gburton/initial_changes

Initial changes
Merge pull request #1 from osCommerce/master

Merge Initial BS Changes
Add Stylesheets

For future use...
Bugfix.  H1 Title

Pull Right.
Merge pull request #137 from gburton/initial_changes

Bugfix + Future Stylesheets
Merge pull request #135 from gadlol/patch-3

Removed extra ;
Merge pull request #2 from osCommerce/master

Merge
Bootstrap Buttons

Change position, style and icons of Buttons
Merge pull request #138 from gburton/Buttons

Buttons Update
Merge pull request #3 from osCommerce/master

Merge