Merge pull request #705 from SamStonehouse/master

Fixed curl error orders
update to the order info page and return info page to use bootstrap format
updated the pagination to use bootstraps rowspan
fix for email input-message is undefined.
voucher updated to use a button at the top to send mails out.
Merge pull request #1 from opencart/master

Updating local