diff --git a/database/setup.sql b/database/setup.sql
index a4b5beeceeaf..cf63b132b74d 100644
--- a/database/setup.sql
+++ b/database/setup.sql
@@ -344,7 +344,6 @@ CREATE TABLE `accounts` (
   `show_accept_quote_terms` tinyint(1) NOT NULL DEFAULT '0',
   `require_invoice_signature` tinyint(1) NOT NULL DEFAULT '0',
   `require_quote_signature` tinyint(1) NOT NULL DEFAULT '0',
-  `bcc_email` text COLLATE utf8_unicode_ci,
   `client_number_prefix` text COLLATE utf8_unicode_ci,
   `client_number_counter` int(11) DEFAULT '0',
   `client_number_pattern` text COLLATE utf8_unicode_ci,
@@ -1177,7 +1176,7 @@ CREATE TABLE `gateways` (
 
 LOCK TABLES `gateways` WRITE;
 /*!40000 ALTER TABLE `gateways` DISABLE KEYS */;
-INSERT INTO `gateways` VALUES (1,'2017-03-31 10:47:59','2017-03-31 10:47:59','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-03-31 10:47:59','2017-03-31 10:47:59','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-03-31 10:47:59','2017-03-31 10:47:59','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-03-31 10:47:59','2017-03-31 10:47:59','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-03-31 10:47:59','2017-03-31 10:47:59','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-03-31 10:47:59','2017-03-31 10:47:59','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-03-31 10:47:59','2017-03-31 10:47:59','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-03-31 10:47:59','2017-03-31 10:47:59','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-03-31 10:47:59','2017-03-31 10:47:59','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-03-31 10:47:59','2017-03-31 10:47:59','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-03-31 10:47:59','2017-03-31 10:47:59','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-03-31 10:47:59','2017-03-31 10:47:59','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-03-31 10:47:59','2017-03-31 10:47:59','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-03-31 10:47:59','2017-03-31 10:47:59','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-03-31 10:47:59','2017-03-31 10:47:59','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-03-31 10:47:59','2017-03-31 10:47:59','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-03-31 10:47:59','2017-03-31 10:47:59','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-03-31 10:47:59','2017-03-31 10:47:59','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-03-31 10:47:59','2017-03-31 10:47:59','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-03-31 10:47:59','2017-03-31 10:47:59','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-03-31 10:47:59','2017-03-31 10:47:59','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-03-31 10:47:59','2017-03-31 10:47:59','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-03-31 10:47:59','2017-03-31 10:47:59','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-03-31 10:47:59','2017-03-31 10:47:59','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-03-31 10:47:59','2017-03-31 10:47:59','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-03-31 10:47:59','2017-03-31 10:47:59','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-03-31 10:47:59','2017-03-31 10:47:59','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-03-31 10:47:59','2017-03-31 10:47:59','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-03-31 10:47:59','2017-03-31 10:47:59','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-03-31 10:47:59','2017-03-31 10:47:59','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-03-31 10:47:59','2017-03-31 10:47:59','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-03-31 10:47:59','2017-03-31 10:47:59','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-03-31 10:47:59','2017-03-31 10:47:59','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-03-31 10:47:59','2017-03-31 10:47:59','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-03-31 10:47:59','2017-03-31 10:47:59','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-03-31 10:47:59','2017-03-31 10:47:59','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-03-31 10:47:59','2017-03-31 10:47:59','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-03-31 10:47:59','2017-03-31 10:47:59','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-03-31 10:47:59','2017-03-31 10:47:59','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-03-31 10:47:59','2017-03-31 10:47:59','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-03-31 10:47:59','2017-03-31 10:47:59','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-03-31 10:47:59','2017-03-31 10:47:59','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-03-31 10:47:59','2017-03-31 10:47:59','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-03-31 10:47:59','2017-03-31 10:47:59','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-03-31 10:47:59','2017-03-31 10:47:59','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-03-31 10:47:59','2017-03-31 10:47:59','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-03-31 10:47:59','2017-03-31 10:47:59','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-03-31 10:47:59','2017-03-31 10:47:59','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-03-31 10:47:59','2017-03-31 10:47:59','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-03-31 10:47:59','2017-03-31 10:47:59','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-03-31 10:47:59','2017-03-31 10:47:59','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-03-31 10:47:59','2017-03-31 10:47:59','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-03-31 10:47:59','2017-03-31 10:47:59','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-03-31 10:47:59','2017-03-31 10:47:59','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-03-31 10:47:59','2017-03-31 10:47:59','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-03-31 10:47:59','2017-03-31 10:47:59','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-03-31 10:47:59','2017-03-31 10:47:59','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-03-31 10:47:59','2017-03-31 10:47:59','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-03-31 10:47:59','2017-03-31 10:47:59','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-03-31 10:47:59','2017-03-31 10:47:59','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-03-31 10:47:59','2017-03-31 10:47:59','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-03-31 10:47:59','2017-03-31 10:47:59','Custom','Custom',1,1,8,0,NULL,1,0);
+INSERT INTO `gateways` VALUES (1,'2017-04-02 16:31:14','2017-04-02 16:31:14','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-04-02 16:31:14','2017-04-02 16:31:14','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-04-02 16:31:14','2017-04-02 16:31:14','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-04-02 16:31:14','2017-04-02 16:31:14','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-04-02 16:31:14','2017-04-02 16:31:14','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-04-02 16:31:14','2017-04-02 16:31:14','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-04-02 16:31:14','2017-04-02 16:31:14','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-04-02 16:31:14','2017-04-02 16:31:14','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-04-02 16:31:14','2017-04-02 16:31:14','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-04-02 16:31:14','2017-04-02 16:31:14','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-04-02 16:31:14','2017-04-02 16:31:14','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-04-02 16:31:14','2017-04-02 16:31:14','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-04-02 16:31:14','2017-04-02 16:31:14','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-04-02 16:31:14','2017-04-02 16:31:14','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-04-02 16:31:14','2017-04-02 16:31:14','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-04-02 16:31:14','2017-04-02 16:31:14','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-04-02 16:31:14','2017-04-02 16:31:14','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-04-02 16:31:14','2017-04-02 16:31:14','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-04-02 16:31:14','2017-04-02 16:31:14','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-04-02 16:31:14','2017-04-02 16:31:14','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-04-02 16:31:14','2017-04-02 16:31:14','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-04-02 16:31:14','2017-04-02 16:31:14','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-04-02 16:31:14','2017-04-02 16:31:14','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-04-02 16:31:14','2017-04-02 16:31:14','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-04-02 16:31:14','2017-04-02 16:31:14','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-04-02 16:31:14','2017-04-02 16:31:14','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-04-02 16:31:14','2017-04-02 16:31:14','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-04-02 16:31:14','2017-04-02 16:31:14','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-04-02 16:31:14','2017-04-02 16:31:14','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-04-02 16:31:14','2017-04-02 16:31:14','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-04-02 16:31:14','2017-04-02 16:31:14','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-04-02 16:31:14','2017-04-02 16:31:14','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-04-02 16:31:14','2017-04-02 16:31:14','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-04-02 16:31:14','2017-04-02 16:31:14','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-04-02 16:31:14','2017-04-02 16:31:14','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-04-02 16:31:14','2017-04-02 16:31:14','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-04-02 16:31:14','2017-04-02 16:31:14','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-04-02 16:31:14','2017-04-02 16:31:14','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-04-02 16:31:14','2017-04-02 16:31:14','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-04-02 16:31:14','2017-04-02 16:31:14','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-04-02 16:31:14','2017-04-02 16:31:14','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-04-02 16:31:14','2017-04-02 16:31:14','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-04-02 16:31:14','2017-04-02 16:31:14','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-04-02 16:31:14','2017-04-02 16:31:14','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-04-02 16:31:14','2017-04-02 16:31:14','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-04-02 16:31:14','2017-04-02 16:31:14','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-04-02 16:31:14','2017-04-02 16:31:14','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-04-02 16:31:14','2017-04-02 16:31:14','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-04-02 16:31:14','2017-04-02 16:31:14','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-04-02 16:31:14','2017-04-02 16:31:14','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-04-02 16:31:14','2017-04-02 16:31:14','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-04-02 16:31:14','2017-04-02 16:31:14','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-04-02 16:31:14','2017-04-02 16:31:14','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-04-02 16:31:14','2017-04-02 16:31:14','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-04-02 16:31:14','2017-04-02 16:31:14','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-04-02 16:31:14','2017-04-02 16:31:14','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-04-02 16:31:14','2017-04-02 16:31:14','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-04-02 16:31:14','2017-04-02 16:31:14','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-04-02 16:31:14','2017-04-02 16:31:14','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-04-02 16:31:14','2017-04-02 16:31:14','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-04-02 16:31:14','2017-04-02 16:31:14','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-04-02 16:31:14','2017-04-02 16:31:14','Custom','Custom',1,1,8,0,NULL,1,0);
 /*!40000 ALTER TABLE `gateways` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1595,7 +1594,7 @@ CREATE TABLE `payment_libraries` (
 
 LOCK TABLES `payment_libraries` WRITE;
 /*!40000 ALTER TABLE `payment_libraries` DISABLE KEYS */;
-INSERT INTO `payment_libraries` VALUES (1,'2017-03-31 10:47:58','2017-03-31 10:47:58','Omnipay',1),(2,'2017-03-31 10:47:58','2017-03-31 10:47:58','PHP-Payments [Deprecated]',1);
+INSERT INTO `payment_libraries` VALUES (1,'2017-04-02 16:31:13','2017-04-02 16:31:13','Omnipay',1),(2,'2017-04-02 16:31:13','2017-04-02 16:31:13','PHP-Payments [Deprecated]',1);
 /*!40000 ALTER TABLE `payment_libraries` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1705,7 +1704,7 @@ CREATE TABLE `payment_terms` (
 
 LOCK TABLES `payment_terms` WRITE;
 /*!40000 ALTER TABLE `payment_terms` DISABLE KEYS */;
-INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-03-31 10:47:58','2017-03-31 10:47:58',NULL,0,0,1),(2,10,'Net 10','2017-03-31 10:47:58','2017-03-31 10:47:58',NULL,0,0,2),(3,14,'Net 14','2017-03-31 10:47:58','2017-03-31 10:47:58',NULL,0,0,3),(4,15,'Net 15','2017-03-31 10:47:58','2017-03-31 10:47:58',NULL,0,0,4),(5,30,'Net 30','2017-03-31 10:47:58','2017-03-31 10:47:58',NULL,0,0,5),(6,60,'Net 60','2017-03-31 10:47:58','2017-03-31 10:47:58',NULL,0,0,6),(7,90,'Net 90','2017-03-31 10:47:58','2017-03-31 10:47:58',NULL,0,0,7),(8,-1,'Net 0','2017-03-31 10:48:01','2017-03-31 10:48:01',NULL,0,0,0);
+INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-04-02 16:31:13','2017-04-02 16:31:13',NULL,0,0,1),(2,10,'Net 10','2017-04-02 16:31:13','2017-04-02 16:31:13',NULL,0,0,2),(3,14,'Net 14','2017-04-02 16:31:13','2017-04-02 16:31:13',NULL,0,0,3),(4,15,'Net 15','2017-04-02 16:31:13','2017-04-02 16:31:13',NULL,0,0,4),(5,30,'Net 30','2017-04-02 16:31:13','2017-04-02 16:31:13',NULL,0,0,5),(6,60,'Net 60','2017-04-02 16:31:13','2017-04-02 16:31:13',NULL,0,0,6),(7,90,'Net 90','2017-04-02 16:31:13','2017-04-02 16:31:13',NULL,0,0,7),(8,-1,'Net 0','2017-04-02 16:31:16','2017-04-02 16:31:16',NULL,0,0,0);
 /*!40000 ALTER TABLE `payment_terms` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2300,4 +2299,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-03-31 16:48:02
+-- Dump completed on 2017-04-02 22:31:16