From 620b09ccc868472f628e0c169b500b7f8f194a5d Mon Sep 17 00:00:00 2001
From: Samuel De Backer <sdebacker@gmail.com>
Date: Mon, 25 Aug 2014 21:56:43 +0200
Subject: [PATCH 01/33] Seeding ok with MySQL STRICT_TRANS_TABLE, fixes #157

---
 ...2014_03_25_102200_add_sort_and_recommended_to_gateways.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/database/migrations/2014_03_25_102200_add_sort_and_recommended_to_gateways.php b/app/database/migrations/2014_03_25_102200_add_sort_and_recommended_to_gateways.php
index 535636f90e6a..a49fe8f855ef 100644
--- a/app/database/migrations/2014_03_25_102200_add_sort_and_recommended_to_gateways.php
+++ b/app/database/migrations/2014_03_25_102200_add_sort_and_recommended_to_gateways.php
@@ -15,8 +15,8 @@ class AddSortAndRecommendedToGateways extends Migration {
 		Schema::table('gateways', function($table)
 		{
 			$table->unsignedInteger('sort_order')->default(10000);
-			$table->boolean('recommended');
-			$table->string('site_url', 200);
+			$table->boolean('recommended')->default(0);
+			$table->string('site_url', 200)->nullable();
 		});
 	}
 	

From 17ab45014adee807a9b4ba7e7b2e8e414f239fbb Mon Sep 17 00:00:00 2001
From: Samuel De Backer <sdebacker@gmail.com>
Date: Mon, 25 Aug 2014 22:31:45 +0200
Subject: [PATCH 02/33] Migrations for accounts and users tables

Now when clicking on INVOICE NOW, we can reach first step of a new
invoice creation even with MySQL 5.6 default STRICT_TRANS_TABLE.
---
 ...11_05_180133_confide_setup_users_table.php | 30 +++++++++----------
 ...2014_03_03_155556_add_phone_to_account.php |  4 +--
 .../2014_04_03_191105_add_pro_plan.php        |  2 +-
 .../2014_04_17_145108_add_custom_fields.php   | 12 ++++----
 ...014_04_29_174315_add_advanced_settings.php |  4 +--
 ...4_07_17_205900_support_hiding_quantity.php | 12 ++++----
 6 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php b/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
index 3ddc66d16b89..e0411ca525fa 100755
--- a/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
+++ b/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
@@ -132,19 +132,19 @@ class ConfideSetupUsersTable extends Migration {
             $t->timestamps();
             $t->softDeletes();
 
-            $t->string('name');
+            $t->string('name')->nullable();
             $t->string('ip');
             $t->string('account_key')->unique();
             $t->timestamp('last_login');
             
-            $t->string('address1');
-            $t->string('address2');
-            $t->string('city');
-            $t->string('state');
-            $t->string('postal_code');
+            $t->string('address1')->nullable();
+            $t->string('address2')->nullable();
+            $t->string('city')->nullable();
+            $t->string('state')->nullable();
+            $t->string('postal_code')->nullable();
             $t->unsignedInteger('country_id')->nullable();     
-            $t->text('invoice_terms');
-            $t->text('email_footer');
+            $t->text('invoice_terms')->nullable();
+            $t->text('email_footer')->nullable();
             $t->unsignedInteger('industry_id')->nullable();
             $t->unsignedInteger('size_id')->nullable();
 
@@ -177,16 +177,16 @@ class ConfideSetupUsersTable extends Migration {
             $t->timestamps();
             $t->softDeletes();
 
-            $t->string('first_name');
-            $t->string('last_name');
-            $t->string('phone');
+            $t->string('first_name')->nullable();
+            $t->string('last_name')->nullable();
+            $t->string('phone')->nullable();
             $t->string('username')->unique();
-            $t->string('email');
+            $t->string('email')->nullable();
             $t->string('password');
             $t->string('confirmation_code');
             $t->boolean('registered')->default(false);
             $t->boolean('confirmed')->default(false);
-            $t->integer('theme_id');
+            $t->integer('theme_id')->nullable();
 
             $t->boolean('notify_sent')->default(true);
             $t->boolean('notify_viewed')->default(false);
@@ -194,7 +194,7 @@ class ConfideSetupUsersTable extends Migration {
 
             $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
 
-            $t->unsignedInteger('public_id');
+            $t->unsignedInteger('public_id')->nullable();
             $t->unique( array('account_id','public_id') );
         });
 
@@ -202,7 +202,7 @@ class ConfideSetupUsersTable extends Migration {
         {
             $t->increments('id');
             $t->unsignedInteger('account_id');
-            $t->unsignedInteger('user_id');            
+            $t->unsignedInteger('user_id');
             $t->unsignedInteger('gateway_id');
             $t->timestamps();
             $t->softDeletes();
diff --git a/app/database/migrations/2014_03_03_155556_add_phone_to_account.php b/app/database/migrations/2014_03_03_155556_add_phone_to_account.php
index 1de12fb34e3b..79e03e9d183a 100644
--- a/app/database/migrations/2014_03_03_155556_add_phone_to_account.php
+++ b/app/database/migrations/2014_03_03_155556_add_phone_to_account.php
@@ -14,8 +14,8 @@ class AddPhoneToAccount extends Migration {
 	{
 		Schema::table('accounts', function($table)
 		{
-			$table->string('work_phone');
-			$table->string('work_email');
+			$table->string('work_phone')->nullable();
+			$table->string('work_email')->nullable();
 		});
 	}
 
diff --git a/app/database/migrations/2014_04_03_191105_add_pro_plan.php b/app/database/migrations/2014_04_03_191105_add_pro_plan.php
index 05f74ebdf40b..cbc714971f1d 100644
--- a/app/database/migrations/2014_04_03_191105_add_pro_plan.php
+++ b/app/database/migrations/2014_04_03_191105_add_pro_plan.php
@@ -14,7 +14,7 @@ class AddProPlan extends Migration {
 	{
 		Schema::table('accounts', function($table)
 		{
-			$table->date('pro_plan_paid');
+			$table->date('pro_plan_paid')->nullable();
 		});		
 	}
 
diff --git a/app/database/migrations/2014_04_17_145108_add_custom_fields.php b/app/database/migrations/2014_04_17_145108_add_custom_fields.php
index ac88c4012b70..c6c1360823ae 100644
--- a/app/database/migrations/2014_04_17_145108_add_custom_fields.php
+++ b/app/database/migrations/2014_04_17_145108_add_custom_fields.php
@@ -14,14 +14,14 @@ class AddCustomFields extends Migration {
 	{
 		Schema::table('accounts', function($table)
 		{
-			$table->string('custom_label1');
-			$table->string('custom_value1');
+			$table->string('custom_label1')->nullable();
+			$table->string('custom_value1')->nullable();
 
-			$table->string('custom_label2');
-			$table->string('custom_value2');
+			$table->string('custom_label2')->nullable();
+			$table->string('custom_value2')->nullable();
 
-			$table->string('custom_client_label1');			
-			$table->string('custom_client_label2');
+			$table->string('custom_client_label1')->nullable();			
+			$table->string('custom_client_label2')->nullable();
 		});	
 
 		Schema::table('clients', function($table)
diff --git a/app/database/migrations/2014_04_29_174315_add_advanced_settings.php b/app/database/migrations/2014_04_29_174315_add_advanced_settings.php
index 589bc6a7450b..ae91740d21f3 100644
--- a/app/database/migrations/2014_04_29_174315_add_advanced_settings.php
+++ b/app/database/migrations/2014_04_29_174315_add_advanced_settings.php
@@ -14,8 +14,8 @@ class AddAdvancedSettings extends Migration {
 	{
 		Schema::table('accounts', function($table)
 		{
-			$table->string('primary_color');
-			$table->string('secondary_color');
+			$table->string('primary_color')->nullable();
+			$table->string('secondary_color')->nullable();
 		});
 
 		Schema::table('payments', function($table)
diff --git a/app/database/migrations/2014_07_17_205900_support_hiding_quantity.php b/app/database/migrations/2014_07_17_205900_support_hiding_quantity.php
index d055e4e908cb..5a8ed681bc8b 100644
--- a/app/database/migrations/2014_07_17_205900_support_hiding_quantity.php
+++ b/app/database/migrations/2014_07_17_205900_support_hiding_quantity.php
@@ -14,14 +14,14 @@ class SupportHidingQuantity extends Migration {
 	{
 		Schema::table('accounts', function($table)
 		{
-			$table->boolean('hide_quantity');
-			$table->boolean('hide_paid_to_date');
+			$table->boolean('hide_quantity')->default(0);
+			$table->boolean('hide_paid_to_date')->default(0);
 
-			$table->string('custom_invoice_label1');
-			$table->string('custom_invoice_label2');			
+			$table->string('custom_invoice_label1')->nullable();
+			$table->string('custom_invoice_label2')->nullable();			
 
-			$table->boolean('custom_invoice_taxes1');
-			$table->boolean('custom_invoice_taxes2');
+			$table->boolean('custom_invoice_taxes1')->nullable();
+			$table->boolean('custom_invoice_taxes2')->nullable();
 		});
 
 		Schema::table('invoices', function($table)

From bb4b14e49c71c0880f9b6f3ce2f76d92d03f9531 Mon Sep 17 00:00:00 2001
From: Samuel De Backer <sdebacker@gmail.com>
Date: Mon, 25 Aug 2014 23:26:17 +0200
Subject: [PATCH 03/33] Client import, create invoice with STRICT_TRANS_TABLE

---
 ...11_05_180133_confide_setup_users_table.php | 66 +++++++++----------
 .../2014_04_17_145108_add_custom_fields.php   |  4 +-
 .../2014_05_17_175626_add_quotes.php          |  2 +-
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php b/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
index e0411ca525fa..a5d50635c8c4 100755
--- a/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
+++ b/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
@@ -235,23 +235,23 @@ class ConfideSetupUsersTable extends Migration {
             $t->timestamps();
             $t->softDeletes();
 
-            $t->string('name');
-            $t->string('address1');
-            $t->string('address2');
-            $t->string('city');
-            $t->string('state');
-            $t->string('postal_code');
+            $t->string('name')->nullable();
+            $t->string('address1')->nullable();
+            $t->string('address2')->nullable();
+            $t->string('city')->nullable();
+            $t->string('state')->nullable();
+            $t->string('postal_code')->nullable();
             $t->unsignedInteger('country_id')->nullable();
-            $t->string('work_phone');
-            $t->text('private_notes');
-            $t->decimal('balance', 13, 2);
-            $t->decimal('paid_to_date', 13, 2);
+            $t->string('work_phone')->nullable();
+            $t->text('private_notes')->nullable();
+            $t->decimal('balance', 13, 2)->nullable();
+            $t->decimal('paid_to_date', 13, 2)->nullable();
             $t->timestamp('last_login')->nullable();
-            $t->string('website');
+            $t->string('website')->nullable();
             $t->unsignedInteger('industry_id')->nullable();
             $t->unsignedInteger('size_id')->nullable();
-            $t->boolean('is_deleted');
-            $t->integer('payment_terms');
+            $t->boolean('is_deleted')->default(false);
+            $t->integer('payment_terms')->nullable();
 
             $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
@@ -273,18 +273,18 @@ class ConfideSetupUsersTable extends Migration {
             $t->timestamps();
             $t->softDeletes();
 
-            $t->boolean('is_primary');
-            $t->boolean('send_invoice');
-            $t->string('first_name');
-            $t->string('last_name');
-            $t->string('email');
-            $t->string('phone');
+            $t->boolean('is_primary')->default(0);
+            $t->boolean('send_invoice')->default(0);
+            $t->string('first_name')->nullable();
+            $t->string('last_name')->nullable();
+            $t->string('email')->nullable();
+            $t->string('phone')->nullable();
             $t->timestamp('last_login');            
 
             $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade'); 
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
 
-            $t->unsignedInteger('public_id');
+            $t->unsignedInteger('public_id')->nullable();
             $t->unique( array('account_id','public_id') );
         });     
 
@@ -317,7 +317,7 @@ class ConfideSetupUsersTable extends Migration {
             $t->date('due_date')->nullable();
             $t->text('terms');
             $t->text('public_notes');
-            $t->boolean('is_deleted');            
+            $t->boolean('is_deleted')->default(false);            
             $t->boolean('is_recurring');
             $t->unsignedInteger('frequency_id');
             $t->date('start_date')->nullable();
@@ -354,7 +354,7 @@ class ConfideSetupUsersTable extends Migration {
             $t->timestamps();
             $t->softDeletes();
 
-            $t->string('transaction_reference');
+            $t->string('transaction_reference')->nullable();
             $t->timestamp('sent_date');
             $t->timestamp('viewed_date');
 
@@ -445,7 +445,7 @@ class ConfideSetupUsersTable extends Migration {
             $t->timestamps();
             $t->softDeletes();
 
-            $t->boolean('is_deleted');
+            $t->boolean('is_deleted')->default(false);
             $t->decimal('amount', 13, 2);
             $t->date('payment_date');
             $t->string('transaction_reference');
@@ -472,7 +472,7 @@ class ConfideSetupUsersTable extends Migration {
             $t->timestamps();
             $t->softDeletes();
             
-            $t->boolean('is_deleted');
+            $t->boolean('is_deleted')->default(false);
             $t->decimal('amount', 13, 2);
             $t->decimal('balance', 13, 2);
             $t->date('credit_date')->nullable();
@@ -495,17 +495,17 @@ class ConfideSetupUsersTable extends Migration {
             $t->unsignedInteger('account_id');
             $t->unsignedInteger('client_id');
             $t->unsignedInteger('user_id');
-            $t->unsignedInteger('contact_id');
-            $t->unsignedInteger('payment_id');
-            $t->unsignedInteger('invoice_id');
-            $t->unsignedInteger('credit_id');
-            $t->unsignedInteger('invitation_id');
+            $t->unsignedInteger('contact_id')->nullable();
+            $t->unsignedInteger('payment_id')->nullable();
+            $t->unsignedInteger('invoice_id')->nullable();
+            $t->unsignedInteger('credit_id')->nullable();
+            $t->unsignedInteger('invitation_id')->nullable();
             
-            $t->text('message');
-            $t->text('json_backup');
+            $t->text('message')->nullable();
+            $t->text('json_backup')->nullable();
             $t->integer('activity_type_id');            
-            $t->decimal('adjustment', 13, 2);
-            $t->decimal('balance', 13, 2);
+            $t->decimal('adjustment', 13, 2)->nullable();
+            $t->decimal('balance', 13, 2)->nullable();
             
             $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
             $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
diff --git a/app/database/migrations/2014_04_17_145108_add_custom_fields.php b/app/database/migrations/2014_04_17_145108_add_custom_fields.php
index c6c1360823ae..f6ff7c8f45a1 100644
--- a/app/database/migrations/2014_04_17_145108_add_custom_fields.php
+++ b/app/database/migrations/2014_04_17_145108_add_custom_fields.php
@@ -26,8 +26,8 @@ class AddCustomFields extends Migration {
 
 		Schema::table('clients', function($table)
 		{
-			$table->string('custom_value1');
-			$table->string('custom_value2');
+			$table->string('custom_value1')->nullable();
+			$table->string('custom_value2')->nullable();
 		});
 	}
 
diff --git a/app/database/migrations/2014_05_17_175626_add_quotes.php b/app/database/migrations/2014_05_17_175626_add_quotes.php
index 5079117d7ba2..6299ad124dc0 100644
--- a/app/database/migrations/2014_05_17_175626_add_quotes.php
+++ b/app/database/migrations/2014_05_17_175626_add_quotes.php
@@ -14,7 +14,7 @@ class AddQuotes extends Migration {
 	{
 		Schema::table('invoices', function($table)
 		{
-			$table->boolean('is_quote');			
+			$table->boolean('is_quote')->default(0);			
 			$table->unsignedInteger('quote_id')->nullable();
 			$table->unsignedInteger('quote_invoice_id')->nullable();			
 		});

From 686be0852b7c735c207f3403827dceccd719b0dc Mon Sep 17 00:00:00 2001
From: Samuel De Backer <sdebacker@gmail.com>
Date: Tue, 26 Aug 2014 10:30:45 +0200
Subject: [PATCH 04/33] nullable added to some fields

---
 ...13_11_05_180133_confide_setup_users_table.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php b/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
index a5d50635c8c4..65326c575b82 100755
--- a/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
+++ b/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
@@ -395,7 +395,7 @@ class ConfideSetupUsersTable extends Migration {
             $t->string('product_key');
             $t->text('notes');
             $t->decimal('cost', 13, 2);
-            $t->decimal('qty', 13, 2);
+            $t->decimal('qty', 13, 2)->nullable();
             
             $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); 
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
@@ -418,10 +418,10 @@ class ConfideSetupUsersTable extends Migration {
             $t->string('product_key');
             $t->text('notes');
             $t->decimal('cost', 13, 2);
-            $t->decimal('qty', 13, 2);            
+            $t->decimal('qty', 13, 2)->nullable();            
 
-            $t->string('tax_name');
-            $t->decimal('tax_rate', 13, 2);
+            $t->string('tax_name')->nullable();
+            $t->decimal('tax_rate', 13, 2)->nullable();
 
             $t->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
             $t->foreign('product_id')->references('id')->on('products');
@@ -447,9 +447,9 @@ class ConfideSetupUsersTable extends Migration {
 
             $t->boolean('is_deleted')->default(false);
             $t->decimal('amount', 13, 2);
-            $t->date('payment_date');
-            $t->string('transaction_reference');
-            $t->string('payer_id');
+            $t->date('payment_date')->nullable();
+            $t->string('transaction_reference')->nullable();
+            $t->string('payer_id')->nullable();
 
             $t->foreign('invoice_id')->references('id')->on('invoices');
             $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
@@ -476,7 +476,7 @@ class ConfideSetupUsersTable extends Migration {
             $t->decimal('amount', 13, 2);
             $t->decimal('balance', 13, 2);
             $t->date('credit_date')->nullable();
-            $t->string('credit_number');
+            $t->string('credit_number')->nullable();
             $t->text('private_notes');
             
             $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');

From 8edb063b30e82dcb56650e24aa4b1cbb49ff3fc7 Mon Sep 17 00:00:00 2001
From: Samuel De Backer <sdebacker@gmail.com>
Date: Tue, 26 Aug 2014 10:32:14 +0200
Subject: [PATCH 05/33] default integer value for payment_terms

Because sending an empty string to a integer column is not allowed with
MySQL in STRICT_TRANS_TABLE mode.
---
 app/controllers/ClientController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/ClientController.php b/app/controllers/ClientController.php
index 6acbb50c80b4..10f427c1010a 100755
--- a/app/controllers/ClientController.php
+++ b/app/controllers/ClientController.php
@@ -212,7 +212,7 @@ class ClientController extends \BaseController {
 			$client->size_id = Input::get('size_id') ? Input::get('size_id') : null;
 			$client->industry_id = Input::get('industry_id') ? Input::get('industry_id') : null;
 			$client->currency_id = Input::get('currency_id') ? Input::get('currency_id') : 1;
-			$client->payment_terms = Input::get('payment_terms');
+			$client->payment_terms = Input::get('payment_terms') ? : 0;
 			$client->website = trim(Input::get('website'));
 
 			$client->save();

From 30c65f4a23ddbe9bd753d221068b8f300454cc5a Mon Sep 17 00:00:00 2001
From: Samuel De Backer <sdebacker@gmail.com>
Date: Tue, 26 Aug 2014 10:36:53 +0200
Subject: [PATCH 06/33] simpler short conditionnal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

“Since PHP 5.3, it is possible to leave out the middle part of the
ternary operator. Expression expr1 ?: expr3 returns expr1 if expr1
evaluates to TRUE, and expr3 otherwise.”
http://php.net/manual/en/language.operators.comparison.php
---
 app/controllers/ClientController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/ClientController.php b/app/controllers/ClientController.php
index 10f427c1010a..a01c93d40e6a 100755
--- a/app/controllers/ClientController.php
+++ b/app/controllers/ClientController.php
@@ -207,11 +207,11 @@ class ClientController extends \BaseController {
 			$client->city = trim(Input::get('city'));
 			$client->state = trim(Input::get('state'));
 			$client->postal_code = trim(Input::get('postal_code'));			
-			$client->country_id = Input::get('country_id') ? Input::get('country_id') : null;
+			$client->country_id = Input::get('country_id') ? : null;
 			$client->private_notes = trim(Input::get('private_notes'));
-			$client->size_id = Input::get('size_id') ? Input::get('size_id') : null;
-			$client->industry_id = Input::get('industry_id') ? Input::get('industry_id') : null;
-			$client->currency_id = Input::get('currency_id') ? Input::get('currency_id') : 1;
+			$client->size_id = Input::get('size_id') ? : null;
+			$client->industry_id = Input::get('industry_id') ? : null;
+			$client->currency_id = Input::get('currency_id') ? : 1;
 			$client->payment_terms = Input::get('payment_terms') ? : 0;
 			$client->website = trim(Input::get('website'));
 

From 3273eea39f09b47e5aad6d0dac0ddb86f8b1b345 Mon Sep 17 00:00:00 2001
From: Samuel De Backer <sdebacker@gmail.com>
Date: Tue, 26 Aug 2014 10:37:47 +0200
Subject: [PATCH 07/33] 3 constants taken from config

---
 app/routes.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/routes.php b/app/routes.php
index e5685f90fbb8..5fee13bc0776 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -136,9 +136,9 @@ Route::group(array('prefix' => 'api/v1', 'before' => 'auth.basic'), function()
   Route::post('api/hooks', 'IntegrationController@subscribe');
 });
 
-define('CONTACT_EMAIL', 'contact@invoiceninja.com');
-define('CONTACT_NAME', 'Invoice Ninja');
-define('SITE_URL', 'https://www.invoiceninja.com');
+define('CONTACT_EMAIL', Config::get('mail.from.address'));
+define('CONTACT_NAME', Config::get('mail.from.name'));
+define('SITE_URL', Config::get('app.url'));
 
 define('ENV_DEVELOPMENT', 'local');
 define('ENV_STAGING', 'staging');

From 47455dc058b2d9668ef7f606307f2f121d19359b Mon Sep 17 00:00:00 2001
From: Samuel De Backer <sdebacker@gmail.com>
Date: Tue, 26 Aug 2014 10:39:17 +0200
Subject: [PATCH 08/33] Hardcoded urls removed in mail templates

---
 app/views/emails/invoice_html.blade.php              | 4 ++--
 app/views/emails/invoice_text.blade.php              | 4 ++--
 app/views/emails/payment_confirmation_html.blade.php | 4 ++--
 app/views/emails/payment_confirmation_text.blade.php | 4 ++--
 app/views/master.blade.php                           | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/emails/invoice_html.blade.php b/app/views/emails/invoice_html.blade.php
index 8c32f6bfab12..bb36f663bd02 100755
--- a/app/views/emails/invoice_html.blade.php
+++ b/app/views/emails/invoice_html.blade.php
@@ -19,8 +19,8 @@
 
       @if ($showNinjaFooter)
       <p/>
-      {{ trans('texts.ninja_email_footer', ['site' => '<a href="https://www.invoiceninja.com/?utm_source=invoice_email_footer">Invoice Ninja</a>']) }}
+      {{ trans('texts.ninja_email_footer', ['site' => '<a href="' . SITE_URL . '/?utm_source=invoice_email_footer">Invoice Ninja</a>']) }}
       @endif    
 
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/emails/invoice_text.blade.php b/app/views/emails/invoice_text.blade.php
index 954cfcf925ef..24b797e48e2e 100755
--- a/app/views/emails/invoice_text.blade.php
+++ b/app/views/emails/invoice_text.blade.php
@@ -12,5 +12,5 @@
 
 @if ($showNinjaFooter)
 {{ trans('texts.ninja_email_footer', ['site' => 'Invoice Ninja']) }}
-https://www.invoiceninja.com
-@endif
\ No newline at end of file
+{{ SITE_URL }}
+@endif
diff --git a/app/views/emails/payment_confirmation_html.blade.php b/app/views/emails/payment_confirmation_html.blade.php
index 9f224df389d7..aabca1ac0d5d 100644
--- a/app/views/emails/payment_confirmation_html.blade.php
+++ b/app/views/emails/payment_confirmation_html.blade.php
@@ -18,8 +18,8 @@
 
       @if ($showNinjaFooter)
       <p/>
-      {{ trans('texts.ninja_email_footer', ['site' => '<a href="https://www.invoiceninja.com/?utm_source=payment_email_footer">Invoice Ninja</a>']) }}
+      {{ trans('texts.ninja_email_footer', ['site' => '<a href="' . SITE_URL . '/?utm_source=payment_email_footer">Invoice Ninja</a>']) }}
       @endif
       
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/emails/payment_confirmation_text.blade.php b/app/views/emails/payment_confirmation_text.blade.php
index 9b6b7384812b..92191ad8a0ba 100644
--- a/app/views/emails/payment_confirmation_text.blade.php
+++ b/app/views/emails/payment_confirmation_text.blade.php
@@ -11,5 +11,5 @@
 
 @if ($showNinjaFooter)
 {{ trans('texts.ninja_email_footer', ['site' => 'Invoice Ninja']) }}
-https://www.invoiceninja.com
-@endif
\ No newline at end of file
+{{ SITE_URL }}
+@endif
diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index 92c802cc6476..707b8f4e9f1f 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -9,9 +9,9 @@
 
     <meta charset="utf-8">
     <meta property="og:site_name" content="Invoice Ninja"></meta>
-    <meta property="og:url" content="https://www.invoiceninja.com"></meta>
+    <meta property="og:url" content="{{ SITE_URL }}"></meta>
     <meta property="og:title" content="Invoice Ninja"></meta>
-    <meta property="og:image" content="https://www.invoiceninja.com/images/social.jpg"></meta>
+    <meta property="og:image" content="{{ SITE_URL }}/images/social.jpg"></meta>
     <meta property="og:description" content="Simple, Intuitive Invoicing."></meta>
     
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -20,7 +20,7 @@
     <link href='//fonts.googleapis.com/css?family=Roboto:400,700,900,100' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Roboto+Slab:400,300,700' rel='stylesheet' type='text/css'>
     <link href="{{ asset('favicon.ico') }}" rel="icon" type="image/x-icon">    
-    <link href="https://www.invoiceninja.com" rel="canonical"></link>
+    <link href="{{ SITE_URL }}" rel="canonical"></link>
 
     <script src="{{ asset('built.js') }}" type="text/javascript"></script>
 

From 9ca974e49e91fd71a8328cea44039ab5dbf7c056 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 31 Aug 2014 21:18:42 +0300
Subject: [PATCH 09/33] Changed url constant for footers

---
 app/views/emails/invoice_html.blade.php              | 2 +-
 app/views/emails/invoice_text.blade.php              | 2 +-
 app/views/emails/payment_confirmation_html.blade.php | 2 +-
 app/views/emails/payment_confirmation_text.blade.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/emails/invoice_html.blade.php b/app/views/emails/invoice_html.blade.php
index bb36f663bd02..2db78c6e72cb 100755
--- a/app/views/emails/invoice_html.blade.php
+++ b/app/views/emails/invoice_html.blade.php
@@ -19,7 +19,7 @@
 
       @if ($showNinjaFooter)
       <p/>
-      {{ trans('texts.ninja_email_footer', ['site' => '<a href="' . SITE_URL . '/?utm_source=invoice_email_footer">Invoice Ninja</a>']) }}
+      {{ trans('texts.ninja_email_footer', ['site' => '<a href="' . NINJA_URL . '/?utm_source=invoice_email_footer">Invoice Ninja</a>']) }}
       @endif    
 
     </body>
diff --git a/app/views/emails/invoice_text.blade.php b/app/views/emails/invoice_text.blade.php
index 24b797e48e2e..4797df81badc 100755
--- a/app/views/emails/invoice_text.blade.php
+++ b/app/views/emails/invoice_text.blade.php
@@ -12,5 +12,5 @@
 
 @if ($showNinjaFooter)
 {{ trans('texts.ninja_email_footer', ['site' => 'Invoice Ninja']) }}
-{{ SITE_URL }}
+{{ NINJA_URL }}
 @endif
diff --git a/app/views/emails/payment_confirmation_html.blade.php b/app/views/emails/payment_confirmation_html.blade.php
index aabca1ac0d5d..c1dffbac19a0 100644
--- a/app/views/emails/payment_confirmation_html.blade.php
+++ b/app/views/emails/payment_confirmation_html.blade.php
@@ -18,7 +18,7 @@
 
       @if ($showNinjaFooter)
       <p/>
-      {{ trans('texts.ninja_email_footer', ['site' => '<a href="' . SITE_URL . '/?utm_source=payment_email_footer">Invoice Ninja</a>']) }}
+      {{ trans('texts.ninja_email_footer', ['site' => '<a href="' . NINJA_URL . '/?utm_source=payment_email_footer">Invoice Ninja</a>']) }}
       @endif
       
     </body>
diff --git a/app/views/emails/payment_confirmation_text.blade.php b/app/views/emails/payment_confirmation_text.blade.php
index 92191ad8a0ba..0d2b7a1c5438 100644
--- a/app/views/emails/payment_confirmation_text.blade.php
+++ b/app/views/emails/payment_confirmation_text.blade.php
@@ -11,5 +11,5 @@
 
 @if ($showNinjaFooter)
 {{ trans('texts.ninja_email_footer', ['site' => 'Invoice Ninja']) }}
-{{ SITE_URL }}
+{{ NINJA_URL }}
 @endif

From 77b055aff87ffd7730d71769193a14628305ec28 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 31 Aug 2014 22:01:20 +0300
Subject: [PATCH 10/33] Fixed recurring invoices client balance

---
 app/models/Activity.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/models/Activity.php b/app/models/Activity.php
index f177e9dada8e..f9e17fa05e4b 100755
--- a/app/models/Activity.php
+++ b/app/models/Activity.php
@@ -119,7 +119,7 @@ class Activity extends Eloquent
 
 		$adjustment = 0;
 		$client = $invoice->client;
-		if (!$invoice->is_quote)
+		if (!$invoice->is_quote && !$invoice->is_recurring)
 		{
 			$adjustment = $invoice->amount;
 			$client->balance = $client->balance + $adjustment;
@@ -170,11 +170,12 @@ class Activity extends Eloquent
 
 	public static function updateInvoice($invoice)
 	{
+		$client = $invoice->client;
+
 		if ($invoice->is_deleted && !$invoice->getOriginal('is_deleted'))
 		{
-			if (!$invoice->is_quote)
+			if (!$invoice->is_quote && !$invoice->is_recurring)
 			{
-				$client = $invoice->client;
 				$client->balance = $client->balance - $invoice->balance;
 				$client->paid_to_date = $client->paid_to_date - ($invoice->amount - $invoice->balance);
 				$client->save();
@@ -198,11 +199,13 @@ class Activity extends Eloquent
 				return;
 			}
 
-			$backupInvoice = Invoice::with('invoice_items', 'client.account', 'client.contacts')->find($invoice->id);			
+			$backupInvoice = Invoice::with('invoice_items', 'client.account', 'client.contacts')->find($invoice->id);
 
-			$client = $invoice->client;
-			$client->balance = $client->balance + $diff;
-			$client->save();
+			if (!$invoice->is_quote && !$invoice->is_recurring)
+			{
+				$client->balance = $client->balance + $diff;
+				$client->save();
+			}
 
 			$activity = Activity::getBlank($invoice);
 			$activity->client_id = $invoice->client_id;
@@ -210,7 +213,7 @@ class Activity extends Eloquent
 			$activity->activity_type_id = $invoice->is_quote ? ACTIVITY_TYPE_UPDATE_QUOTE : ACTIVITY_TYPE_UPDATE_INVOICE;
 			$activity->message = Utils::encodeActivity(Auth::user(), 'updated', $invoice);
 			$activity->balance = $client->balance;
-			$activity->adjustment = $invoice->is_quote ? 0 : $diff;
+			$activity->adjustment = $invoice->is_quote || $invoice->is_recurring ? 0 : $diff;
 			$activity->json_backup = $backupInvoice->hidePrivateFields()->toJSON();
 			$activity->save();
 		}

From 6716f8a3ab62fc0773691998eff3d400d246245c Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 31 Aug 2014 22:39:22 +0300
Subject: [PATCH 11/33] Version and text changes

---
 app/routes.php                     |  2 +-
 app/views/public/compare.blade.php | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/routes.php b/app/routes.php
index f939dc2c7d02..ea60a74de693 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -231,7 +231,7 @@ define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
 define('NINJA_GATEWAY_ID', GATEWAY_AUTHORIZE_NET);
 define('NINJA_GATEWAY_CONFIG', '{"apiLoginId":"626vWcD5","transactionKey":"4bn26TgL9r4Br4qJ","testMode":"","developerMode":""}');
 define('NINJA_URL', 'https://www.invoiceninja.com');
-define('NINJA_VERSION', '1.3.1');
+define('NINJA_VERSION', '1.3.2');
 
 define('PRO_PLAN_PRICE', 50);
 define('LICENSE_PRICE', 30.00);
diff --git a/app/views/public/compare.blade.php b/app/views/public/compare.blade.php
index 73c279601b0f..362d262996bc 100644
--- a/app/views/public/compare.blade.php
+++ b/app/views/public/compare.blade.php
@@ -26,6 +26,7 @@
               <th>Custom Logo</th>
               <th>Multiple Templates</th>
               <th>Recurring Payments</th>
+              <th>Open Source</th>
             </tr>            
           </thead>
           <tbody>
@@ -38,6 +39,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-ok"/></td>
             </tr>            
             <tr>
               <td><a href="http://www.freshbooks.com" target="_blank">FreshBooks</a></td>
@@ -48,6 +50,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://www.waveapps.com" target="_blank">Wave</a></td>
@@ -58,6 +61,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://www.nutcache.com" target="_blank">NutCache</a></td>
@@ -68,6 +72,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://curdbee.com/" target="_blank">CurdBee</a></td>
@@ -78,6 +83,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="https://www.zoho.com/invoice/" target="_blank">Zoho Invoice</a></td>
@@ -88,6 +94,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://www.roninapp.com/" target="_blank">Ronin</a></td>
@@ -98,6 +105,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://invoiceable.co/" target="_blank">Invoiceable</a></td>
@@ -108,6 +116,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://www.getharvest.com/" target="_blank">Harvest</a></td>
@@ -118,6 +127,7 @@
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://invoiceocean.com/" target="_blank">InvoiceOcean</a></td>
@@ -128,6 +138,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
           </tbody>
         </table>
@@ -147,6 +158,7 @@
               <th>Custom Logo</th>
               <th>Multiple Templates</th>
               <th>Recurring Payments</th>
+              <th>Open Source</th>
             </tr>            
           </thead>
           <tbody>
@@ -159,6 +171,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-ok"/></td>
             </tr>            
             <tr>
               <td><a href="http://www.freeagent.com" target="_blank">FreeAgent</a></td>
@@ -169,6 +182,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="https://www.xero.com/" target="_blank">Xero</a></td>
@@ -179,6 +193,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://www.invoice2go.com" target="_blank">Invoice2go</a></td>
@@ -189,6 +204,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://invoicemachine.com/" target="_blank">Invoice Machine</a></td>
@@ -199,6 +215,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://www.freshbooks.com" target="_blank">FreshBooks</a></td>
@@ -209,6 +226,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://curdbee.com" target="_blank">CurdBee</a></td>
@@ -219,6 +237,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="https://www.zoho.com/invoice/" target="_blank">Zoho Invoice</a></td>
@@ -229,6 +248,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://www.roninapp.com/" target="_blank">Ronin</a></td>
@@ -239,6 +259,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://www.getharvest.com/" target="_blank">Harvest</a></td>
@@ -249,6 +270,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://invoiceocean.com/" target="_blank">Invoice Ocean</a></td>
@@ -259,6 +281,7 @@
               <td><span class="glyphicon glyphicon-ok"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
             <tr>
               <td><a href="http://www.apptivo.com/" target="_blank">Apptivo</a></td>
@@ -269,6 +292,7 @@
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-remove"/></td>
               <td><span class="glyphicon glyphicon-ok"/></td>
+              <td><span class="glyphicon glyphicon-remove"/></td>              
             </tr>            
           </tbody>
         </table>        

From 5c7d0a159a5e9b7f78b50dbf9cf6d319d2840596 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 31 Aug 2014 23:22:47 +0300
Subject: [PATCH 12/33] Adding Norwegian to lang table

---
 .../migrations/2014_03_19_201454_add_language_support.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/database/migrations/2014_03_19_201454_add_language_support.php b/app/database/migrations/2014_03_19_201454_add_language_support.php
index 6acc56e2d478..cdb092a9a498 100644
--- a/app/database/migrations/2014_03_19_201454_add_language_support.php
+++ b/app/database/migrations/2014_03_19_201454_add_language_support.php
@@ -26,6 +26,7 @@ class AddLanguageSupport extends Migration {
     DB::table('languages')->insert(['name' => 'Brazilian Portuguese', 'locale' => 'pt_BR']);
     DB::table('languages')->insert(['name' => 'Dutch', 'locale' => 'nl']);
     DB::table('languages')->insert(['name' => 'Spanish', 'locale' => 'es']);
+    DB::table('languages')->insert(['name' => 'Norwegian', 'locale' => 'nb_NO']);
 
 		Schema::table('accounts', function($table)
 		{

From f5b16c82ad248a6a2f1562aa5ef14d84fc0abdfc Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sat, 6 Sep 2014 23:40:51 +0300
Subject: [PATCH 13/33] Text changes

---
 README.md                  | 43 ++++++++++++++++++++++----------------
 app/config/app.php         |  2 +-
 app/views/master.blade.php |  1 -
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 4e7501b1920f..0c7a954403b4 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 Most online invoicing sites are expensive. They shouldn't be. The aim of this project is to provide a free, open-source alternative. Additionally, the hope is the codebase will serve as a sample site for Laravel as well as other JavaScript technologies.
 
-[This guide](http://hillelcoren.com/invoice-ninja/self-hosting/) is the simplest way to setup the site. The high level instructions for setting up the site using Git are below but there's also a more detailed [setup guide](http://hillelcoren.com/invoice-ninja/laravel-ubuntu-virtualbox/). To deploy the app with [Docker](http://www.docker.com/) you can use [this project](https://github.com/rollbrettler/Dockerfiles/tree/master/invoice-ninja).
+To setup the site you can either use this [zip file](http://hillelcoren.com/invoice-ninja/self-hosting/) (easier to setup) or checkout the code from GitHub following the instructions below (easier to stay up to date). There's also a more detailed setup guide [available here](http://hillelcoren.com/invoice-ninja/laravel-ubuntu-virtualbox/). To deploy the app with [Docker](http://www.docker.com/) you can use [this project](https://github.com/rollbrettler/Dockerfiles/tree/master/invoice-ninja).
 
 To connect follow [@invoiceninja](https://twitter.com/invoiceninja) or join the [Facebook Group](https://www.facebook.com/invoiceninja). For discussion of the code please use the [Google Group](https://groups.google.com/d/forum/invoiceninja).
 
@@ -18,6 +18,7 @@ If you'd like to translate the site please use [caouecs/Laravel4-long](https://g
 Site design by [kantorp-wegl.in](http://kantorp-wegl.in/)
 
 ### Features
+
 * Core application built using Laravel 4.1
 * Invoice PDF generation directly in the browser
 * Integrates with many payment providers
@@ -62,6 +63,27 @@ Configure development/config/database.php and development/config/mail.php and in
 
 Add public/ to your web server root
 
+### Deleveloper Notes
+
+* If you make any changes to the JavaScript files you need to run grunt to create the built files. See Gruntfile.js for more details.
+* The lookup tables are cached in memory (ie, Currencies, Timezones, Languages, etc). If you a record to the database you need to clear the cache by uncommenting Cache::flush() in app/routes.php.
+* If you run into any composer errors try running composer dump-autoload. 
+
+### Ubuntu Notes
+
+    # Install php-mcrypt
+    apt-get install php5-mcrypt
+    sudo php5enmod mcrypt
+
+    # Install Composer
+    curl -sS https://getcomposer.org/installer | php
+    sudo mv composer.phar /usr/local/bin/composer
+
+    # Install Bower
+    sudo apt-get install npm nodejs-legacy
+    sudo npm install -g bower
+    sudo ln -s /usr/local/lib/node_modules/bower/bin/bower /usr/local/bin/bower
+
 ### Frameworks/Libraries
 * [laravel/laravel](https://github.com/laravel/laravel) - A PHP Framework For Web Artisans
 * [twbs/bootstrap](https://github.com/twbs/bootstrap) - Sleek, intuitive, and powerful front-end framework for faster and easier web development.
@@ -86,24 +108,9 @@ Add public/ to your web server root
 * [briannesbitt/Carbon](https://github.com/briannesbitt/Carbon) - A simple API extension for DateTime with PHP 5.3+
 * [thomaspark/bootswatch](https://github.com/thomaspark/bootswatch) - Themes for Bootstrap
 * [mozilla/pdf.js](https://github.com/mozilla/pdf.js) - PDF Reader in JavaScript
-* [nnnick/Chart.js](https://github.com/nnnick/Chart.js) - Simple HTML5 Charts using the <canvas> tag
+* [nnnick/Chart.js](https://github.com/nnnick/Chart.js) - Simple HTML5 Charts using the canvas tag
 * [josscrowcroft/accounting.js](https://github.com/josscrowcroft/accounting.js) - A lightweight JavaScript library for number, money and currency formatting
 * [jashkenas/underscore](https://github.com/jashkenas/underscore) - JavaScript's utility _ belt 
 * [caouecs/Laravel4-long](https://github.com/caouecs/Laravel4-lang) - List of languages ​​for Laravel4
 * [calvinfroedge/PHP-Payments](https://github.com/calvinfroedge/PHP-Payments) - A uniform payments interface for PHP
-* [bgrins/spectrum](https://github.com/bgrins/spectrum) - The No Hassle JavaScript Colorpicker
-
-### Ubuntu Notes
-
-    # Install php-mcrypt
-    apt-get install php5-mcrypt
-    sudo php5enmod mcrypt
-
-    # Install Composer
-    curl -sS https://getcomposer.org/installer | php
-    sudo mv composer.phar /usr/local/bin/composer
-
-    # Install Bower
-    sudo apt-get install npm nodejs-legacy
-    sudo npm install -g bower
-    sudo ln -s /usr/local/lib/node_modules/bower/bin/bower /usr/local/bin/bower
+* [bgrins/spectrum](https://github.com/bgrins/spectrum) - The No Hassle JavaScript Colorpicker
\ No newline at end of file
diff --git a/app/config/app.php b/app/config/app.php
index 3148501412d4..601f4ed202ad 100755
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -26,7 +26,7 @@ return array(
 	|
 	*/
 
-	'url' => 'http://www.invoiceninja.com',
+	'url' => 'https://www.invoiceninja.com',
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index 707b8f4e9f1f..668cdacded22 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -20,7 +20,6 @@
     <link href='//fonts.googleapis.com/css?family=Roboto:400,700,900,100' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Roboto+Slab:400,300,700' rel='stylesheet' type='text/css'>
     <link href="{{ asset('favicon.ico') }}" rel="icon" type="image/x-icon">    
-    <link href="{{ SITE_URL }}" rel="canonical"></link>
 
     <script src="{{ asset('built.js') }}" type="text/javascript"></script>
 

From c7309d13a719c345910c0e61762f07df55280699 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sat, 6 Sep 2014 23:42:31 +0300
Subject: [PATCH 14/33] Text changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0c7a954403b4..06520970e328 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Add public/ to your web server root
 ### Deleveloper Notes
 
 * If you make any changes to the JavaScript files you need to run grunt to create the built files. See Gruntfile.js for more details.
-* The lookup tables are cached in memory (ie, Currencies, Timezones, Languages, etc). If you a record to the database you need to clear the cache by uncommenting Cache::flush() in app/routes.php.
+* The lookup tables are cached in memory (ie, Currencies, Timezones, Languages, etc). If you add a record to the database you need to clear the cache by uncommenting Cache::flush() in app/routes.php.
 * If you run into any composer errors try running composer dump-autoload. 
 
 ### Ubuntu Notes

From 8bc065cd74d21b686d6f862f8a157a93a3ae5f4e Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sat, 6 Sep 2014 23:43:47 +0300
Subject: [PATCH 15/33] Text changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 06520970e328..862362004e69 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 ### [https://www.invoiceninja.com](https://www.invoiceninja.com)
 
-**If you'd like to use our code to sell your own invoicing app get in touch.**
+If you'd like to use our code to sell your own invoicing app get in touch.
 
 ### Introduction
 

From 84cf760785d7d56ef96199230f7eb6e3bbed92ed Mon Sep 17 00:00:00 2001
From: Hillel Coren <hcoren@shoretel.com>
Date: Fri, 12 Sep 2014 00:28:36 +0300
Subject: [PATCH 16/33] Added confirm when saving recurring invoice

---
 ..._03_20_200300_create_payment_libraries.php | 21 ++++++++-----------
 app/database/seeds/ConstantsSeeder.php        |  8 +++++--
 app/lang/de/texts.php                         |  3 +++
 app/lang/en/texts.php                         |  4 ++++
 app/lang/es/texts.php                         |  3 +++
 app/lang/fr/texts.php                         |  3 +++
 app/lang/it/texts.php                         |  3 +++
 app/lang/lt/texts.php                         |  3 +++
 app/lang/nb_NO/texts.php                      |  3 +++
 app/lang/nl/texts.php                         |  3 +++
 app/lang/pt_BR/texts.php                      |  3 +++
 app/models/PaymentLibrary.php                 |  1 +
 app/routes.php                                |  2 +-
 app/views/invoices/edit.blade.php             | 14 +++++++------
 app/views/master.blade.php                    |  2 +-
 app/views/public/header.blade.php             |  2 ++
 public/built.js                               |  7 +++----
 public/js/script.js                           |  7 +++----
 18 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/app/database/migrations/2014_03_20_200300_create_payment_libraries.php b/app/database/migrations/2014_03_20_200300_create_payment_libraries.php
index d4c7855a706e..dc8074c913bd 100644
--- a/app/database/migrations/2014_03_20_200300_create_payment_libraries.php
+++ b/app/database/migrations/2014_03_20_200300_create_payment_libraries.php
@@ -12,19 +12,16 @@ class CreatePaymentLibraries extends Migration {
 	 */
 	public function up()
 	{ 
-        Schema::dropIfExists('payment_libraries');  
+    Schema::dropIfExists('payment_libraries');  
 
-        Schema::create('payment_libraries', function($t)
-        {
-            $t->increments('id');
-            $t->timestamps();            
+    Schema::create('payment_libraries', function($t)
+    {
+        $t->increments('id');
+        $t->timestamps();
 
-            $t->string('name');
-            $t->boolean('visible')->default(true);
-        }); 
-
-		DB::table('payment_libraries')->insert(['name' => 'Omnipay']);
-		DB::table('payment_libraries')->insert(['name' => 'PHP-Payments']);
+        $t->string('name');
+        $t->boolean('visible')->default(true);
+    }); 
 
 		Schema::table('gateways', function($table)
 		{
@@ -35,7 +32,7 @@ class CreatePaymentLibraries extends Migration {
 
 		Schema::table('gateways', function($table)
 		{
-            $table->foreign('payment_library_id')->references('id')->on('payment_libraries')->onDelete('cascade');
+      $table->foreign('payment_library_id')->references('id')->on('payment_libraries')->onDelete('cascade');
 		});
 	}
 
diff --git a/app/database/seeds/ConstantsSeeder.php b/app/database/seeds/ConstantsSeeder.php
index 7ebe2a382de9..365312a79c3c 100755
--- a/app/database/seeds/ConstantsSeeder.php
+++ b/app/database/seeds/ConstantsSeeder.php
@@ -129,8 +129,9 @@ class ConstantsSeeder extends Seeder
 		Currency::create(array('name' => 'Danish Krone', 'code' => 'DKK', 'symbol' => 'kr ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
 		Currency::create(array('name' => 'Israeli Shekel', 'code' => 'ILS', 'symbol' => 'NIS ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
 		Currency::create(array('name' => 'Singapore Dollar', 'code' => 'SGD', 'symbol' => 'SGD ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
-		Currency::create(array('name' => 'Swedish Krona', 'code' => 'SEK', 'symbol' => 'kr', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
-		Currency::create(array('name' => 'Norske Kroner', 'code' => 'NOK', 'symbol' => 'kr', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
+		Currency::create(array('name' => 'Swedish Krona', 'code' => 'SEK', 'symbol' => 'kr ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
+		Currency::create(array('name' => 'Norske Kroner', 'code' => 'NOK', 'symbol' => 'kr ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
+		Currency::create(array('name' => 'Kenyan Shilling', 'code' => 'KES', 'symbol' => 'KSh ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
 
 		DatetimeFormat::create(array('format' => 'd/M/Y g:i a', 'label' => '10/Mar/2013'));
 		DatetimeFormat::create(array('format' => 'd-M-Yk g:i a', 'label' => '10-Mar-2013'));
@@ -148,6 +149,9 @@ class ConstantsSeeder extends Seeder
 		DateFormat::create(array('format' => 'F j, Y', 'picker_format' => 'MM d, yyyy', 'label' => 'March 10, 2013'));
 		DateFormat::create(array('format' => 'D M j, Y', 'picker_format' => 'D MM d, yyyy', 'label' => 'Mon March 10, 2013'));			
 		
+		PaymentLibrary::create(['name' => 'Omnipay']);
+		PaymentLibrary::create(['name' => 'PHP-Payments']);
+
 		/*	
 		d, dd: Numeric date, no leading zero and leading zero, respectively. Eg, 5, 05.
 		D, DD: Abbreviated and full weekday names, respectively. Eg, Mon, Monday.
diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php
index 19e3da3aae1a..77fc2f781a89 100644
--- a/app/lang/de/texts.php
+++ b/app/lang/de/texts.php
@@ -404,5 +404,8 @@ return array(
   'pending' => 'Pending',
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
+
+  'confirm_email_invoice' => 'Confirm emailing this invoice',
+  'confirm_email_quote' => 'Confirm emailing this quote',
   
 );
diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index a5b919fff342..a3ee84c2aa6d 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -420,4 +420,8 @@ return array(
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
 
+  'confirm_email_invoice' => 'Confirm emailing this invoice',
+  'confirm_email_quote' => 'Confirm emailing this quote',
+
+
 );
\ No newline at end of file
diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php
index af1ee8f9e90d..466d11ff783a 100644
--- a/app/lang/es/texts.php
+++ b/app/lang/es/texts.php
@@ -402,5 +402,8 @@ return array(
   'pending' => 'Pending',
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
+
+  'confirm_email_invoice' => 'Confirm emailing this invoice',
+  'confirm_email_quote' => 'Confirm emailing this quote',
     
 );
diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php
index 881ac3f5a746..ea725a138084 100644
--- a/app/lang/fr/texts.php
+++ b/app/lang/fr/texts.php
@@ -404,5 +404,8 @@ return array(
   'pending' => 'Pending',
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
+
+  'confirm_email_invoice' => 'Confirm emailing this invoice',
+  'confirm_email_quote' => 'Confirm emailing this quote',
     
 );
diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php
index 66a7aa5968d5..f1d958b94712 100644
--- a/app/lang/it/texts.php
+++ b/app/lang/it/texts.php
@@ -404,5 +404,8 @@ return array(
   'pending' => 'Pending',
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
+
+  'confirm_email_invoice' => 'Confirm emailing this invoice',
+  'confirm_email_quote' => 'Confirm emailing this quote',
   
 );
diff --git a/app/lang/lt/texts.php b/app/lang/lt/texts.php
index f349196f630f..109f66f804eb 100644
--- a/app/lang/lt/texts.php
+++ b/app/lang/lt/texts.php
@@ -420,6 +420,9 @@ return array(
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
 
+  'confirm_email_invoice' => 'Confirm emailing this invoice',
+  'confirm_email_quote' => 'Confirm emailing this quote',
+
 
 );
 
diff --git a/app/lang/nb_NO/texts.php b/app/lang/nb_NO/texts.php
index 4e9983b765e1..d62734c9fbf8 100644
--- a/app/lang/nb_NO/texts.php
+++ b/app/lang/nb_NO/texts.php
@@ -420,4 +420,7 @@ return array(
   'deleted_user' => 'Bruker slettet',
   'limit_users' => 'Dessverre, vil dette overstiger grensen p&#229; ' . MAX_NUM_USERS . ' brukere',
 
+  'confirm_email_invoice' => 'Confirm emailing this invoice',
+  'confirm_email_quote' => 'Confirm emailing this quote',
+
 );
\ No newline at end of file
diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php
index 28f4d8302492..8f9ea67de15a 100644
--- a/app/lang/nl/texts.php
+++ b/app/lang/nl/texts.php
@@ -405,5 +405,8 @@ return array(
   'pending' => 'Pending',
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
+
+  'confirm_email_invoice' => 'Confirm emailing this invoice',
+  'confirm_email_quote' => 'Confirm emailing this quote',
   
 );
diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php
index d941e9926b35..738a73b7d1ac 100644
--- a/app/lang/pt_BR/texts.php
+++ b/app/lang/pt_BR/texts.php
@@ -393,5 +393,8 @@ return array(
   'pending' => 'Pending',
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
+
+  'confirm_email_invoice' => 'Confirm emailing this invoice',
+  'confirm_email_quote' => 'Confirm emailing this quote',
   
 );
diff --git a/app/models/PaymentLibrary.php b/app/models/PaymentLibrary.php
index b8550c212aee..4e790713a096 100644
--- a/app/models/PaymentLibrary.php
+++ b/app/models/PaymentLibrary.php
@@ -3,6 +3,7 @@
 class PaymentLibrary extends Eloquent
 {
 	protected $table = 'payment_libraries';
+  public $timestamps = true;
 
 	public function gateways()
 	{
diff --git a/app/routes.php b/app/routes.php
index ea60a74de693..e7271bf1f429 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -33,7 +33,7 @@ Route::post('/contact_submit', 'HomeController@doContactUs');
 Route::get('/faq', 'HomeController@showFaq');
 Route::get('/features', 'HomeController@showFeatures');
 Route::get('/testimonials', 'HomeController@showTestimonials');
-Route::get('/compare-online-invoicing-sites', 'HomeController@showCompare');
+Route::get('/compare-online-invoicing', 'HomeController@showCompare');
 
 Route::get('log_error', 'HomeController@logError');
 Route::get('invoice_now', 'HomeController@invoiceNow');
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index 094bb7d728ed..2d634a7687f9 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -723,17 +723,19 @@
 	}
 
 	function onEmailClick() {
-		@if (Auth::user()->confirmed)
-		if (confirm('Are you sure you want to email this {{ $entityType }}?')) {
+		if (confirm('{{ trans("texts.confirm_email_$entityType") }}')) {		
 			submitAction('email');
 		}
-		@else
-			submitAction('email');
-		@endif
 	}
 
 	function onSaveClick() {
-		submitAction('');
+		if (model.invoice().is_recurring()) {
+			if (confirm('{{ trans("texts.confirm_email_$entityType") }}')) {		
+				submitAction('');
+			}			
+		} else {
+			submitAction('');
+		}
 	}
 
 	function submitAction(value) {
diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index 668cdacded22..371b1f7e84d0 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -32,7 +32,7 @@
         $.ajax({
           type: 'GET',
           url: '{{ URL::to('log_error') }}',
-          data: 'error='+encodeURIComponent(e)+'&url='+encodeURIComponent(window.location)
+          data: 'error='+encodeURIComponent(e.message + ' - ' + e.filename + ': ' + e.lineno)+'&url='+encodeURIComponent(window.location)
         });     
       } catch(err) {}
       return false;
diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php
index cdde1bffae56..7f6d1c171b20 100644
--- a/app/views/public/header.blade.php
+++ b/app/views/public/header.blade.php
@@ -135,6 +135,7 @@
         <li class="hide-desktop">{{ link_to('https://www.invoiceninja.com/contact', 'Contact Us' ) }}</li>  
         <li>{{ link_to('https://www.invoiceninja.com/features', 'Features' ) }}</li>
         <li>{{ link_to('https://www.invoiceninja.com/plans', 'Plans' ) }}</li>
+        <li>{{ link_to('https://www.invoiceninja.com/compare-online-invoicing', 'Compare' ) }}</li>
         <li>{{ link_to('https://www.invoiceninja.com/testimonials', 'Testimonials' ) }}</li>
         <li>{{ link_to('https://www.invoiceninja.com/faq', 'FAQ' ) }}</li>
         <li><span class="glyphicon glyphicon-user"></span>      
@@ -214,6 +215,7 @@
         <ul class="navbar-vertical">
           <li>{{ link_to('https://www.invoiceninja.com/features', 'Features' ) }}</li>
           <li>{{ link_to('https://www.invoiceninja.com/plans', 'Plans' ) }}</li>
+          <li>{{ link_to('https://www.invoiceninja.com/compare-online-invoicing', 'Compare' ) }}</li>
           <li>{{ link_to('https://www.invoiceninja.com/testimonials', 'Testimonials' ) }}</li>
           <li>{{ link_to('https://www.invoiceninja.com/faq', 'FAQ' ) }}</li>          
           <li>{{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}</li>
diff --git a/public/built.js b/public/built.js
index 1dcc8bcbd5ee..5fe9e49cd96d 100644
--- a/public/built.js
+++ b/public/built.js
@@ -46614,7 +46614,7 @@ function GetReportTemplate1(doc, invoice, layout, checkMath)
       var left = layout.headerRight - invoice.imageWidth;
       doc.addImage(invoice.image, 'JPEG', layout.marginLeft, 30);
     }
-
+  
     if (!invoice.is_pro && logoImages.imageLogo1)
     {
       pageHeight=820;
@@ -46622,7 +46622,6 @@ function GetReportTemplate1(doc, invoice, layout, checkMath)
       doc.addImage(logoImages.imageLogo1, 'JPEG', layout.marginLeft, y, logoImages.imageLogoWidth1, logoImages.imageLogoHeight1);
     }
 
-
     doc.setFontSize(9);
     SetPdfColor('LightBlue', doc, 'primary');
     displayAccount(doc, invoice, 220, layout.accountTop, layout);
@@ -47181,8 +47180,8 @@ function displayAccount(doc, invoice, x, y, layout) {
     account.country ? account.country.name : false
   ];
 
-  var nameWidth = doc.getStringUnitWidth(account.name) * doc.internal.getFontSize() * 1.1;
-  var emailWidth = doc.getStringUnitWidth(account.work_email) * doc.internal.getFontSize() * 1.1;
+  var nameWidth = account.name ? (doc.getStringUnitWidth(account.name) * doc.internal.getFontSize() * 1.1) : 0;
+  var emailWidth = account.work_email ? (doc.getStringUnitWidth(account.work_email) * doc.internal.getFontSize() * 1.1) : 0;
   width = Math.max(emailWidth, nameWidth, 120);
 
   x += width;
diff --git a/public/js/script.js b/public/js/script.js
index 410c68d3bc84..f252148c2956 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -689,7 +689,7 @@ function GetReportTemplate1(doc, invoice, layout, checkMath)
       var left = layout.headerRight - invoice.imageWidth;
       doc.addImage(invoice.image, 'JPEG', layout.marginLeft, 30);
     }
-
+  
     if (!invoice.is_pro && logoImages.imageLogo1)
     {
       pageHeight=820;
@@ -697,7 +697,6 @@ function GetReportTemplate1(doc, invoice, layout, checkMath)
       doc.addImage(logoImages.imageLogo1, 'JPEG', layout.marginLeft, y, logoImages.imageLogoWidth1, logoImages.imageLogoHeight1);
     }
 
-
     doc.setFontSize(9);
     SetPdfColor('LightBlue', doc, 'primary');
     displayAccount(doc, invoice, 220, layout.accountTop, layout);
@@ -1256,8 +1255,8 @@ function displayAccount(doc, invoice, x, y, layout) {
     account.country ? account.country.name : false
   ];
 
-  var nameWidth = doc.getStringUnitWidth(account.name) * doc.internal.getFontSize() * 1.1;
-  var emailWidth = doc.getStringUnitWidth(account.work_email) * doc.internal.getFontSize() * 1.1;
+  var nameWidth = account.name ? (doc.getStringUnitWidth(account.name) * doc.internal.getFontSize() * 1.1) : 0;
+  var emailWidth = account.work_email ? (doc.getStringUnitWidth(account.work_email) * doc.internal.getFontSize() * 1.1) : 0;
   width = Math.max(emailWidth, nameWidth, 120);
 
   x += width;

From b0942449bb623a31a01923a2352ddc51f9074f46 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hcoren@shoretel.com>
Date: Fri, 12 Sep 2014 15:11:59 +0300
Subject: [PATCH 17/33] Changed from address when sending from yahoo or aol
 accounts

---
 app/ninja/mailers/Mailer.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/ninja/mailers/Mailer.php b/app/ninja/mailers/Mailer.php
index 162bd8d9fcfa..43c2d60eaebc 100755
--- a/app/ninja/mailers/Mailer.php
+++ b/app/ninja/mailers/Mailer.php
@@ -1,6 +1,7 @@
 <?php namespace ninja\mailers;
 
 use Mail;
+use Utils;
 
 class Mailer {
 
@@ -12,9 +13,18 @@ class Mailer {
 		];
 		
 		Mail::send($views, $data, function($message) use ($toEmail, $fromEmail, $fromName, $subject)
-		{			
+		{
+			$replyEmail = $fromEmail;
+
+			// We're unable to set the true fromEmail for emails sent from Yahoo or AOL accounts 
+			// http://blog.mandrill.com/yahoos-recent-dmarc-changes-and-how-that-impacts-senders.html
+			if (strpos($fromEmail, '@yahoo.') !== false || strpos($fromEmail, '@aol.') !== FALSE)			
+			{
+				$fromEmail = CONTACT_EMAIL;
+			}
+
 			$message->to($toEmail)->from($fromEmail, $fromName)->sender($fromEmail, $fromName)
-				->replyTo($fromEmail, $fromName)->returnPath($fromEmail)->subject($subject);
+				->replyTo($replyEmail, $fromName)->subject($subject);
 		});		
 	}
 }
\ No newline at end of file

From 213579ff347560e1fa1732b38167f58e5f68be52 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hcoren@shoretel.com>
Date: Sun, 14 Sep 2014 00:13:09 +0300
Subject: [PATCH 18/33] Bug fixes

---
 app/controllers/PaymentController.php        | 6 ++----
 app/models/Activity.php                      | 6 +++---
 app/ninja/repositories/ClientRepository.php  | 2 +-
 app/ninja/repositories/CreditRepository.php  | 2 +-
 app/ninja/repositories/InvoiceRepository.php | 2 +-
 app/ninja/repositories/PaymentRepository.php | 2 +-
 app/views/header.blade.php                   | 3 ++-
 app/views/master.blade.php                   | 1 -
 app/views/public/header.blade.php            | 1 +
 9 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/controllers/PaymentController.php b/app/controllers/PaymentController.php
index 6bbb69f679d9..da6327963b07 100755
--- a/app/controllers/PaymentController.php
+++ b/app/controllers/PaymentController.php
@@ -122,12 +122,10 @@ class PaymentController extends \BaseController
             $gateway->$function($val);
         }
 
-        /*
-        if (!Utils::isProd())
+        if (Utils::isNinjaDev())
         {
             $gateway->setTestMode(true);   
-        }                
-        */
+        }        
 
         return $gateway;        
     }
diff --git a/app/models/Activity.php b/app/models/Activity.php
index f9e17fa05e4b..c3a02ee67f5d 100755
--- a/app/models/Activity.php
+++ b/app/models/Activity.php
@@ -268,13 +268,13 @@ class Activity extends Eloquent
 		{
 			$activity = Activity::getBlank($client);
 			$activity->contact_id = $payment->contact_id;
-			$activity->message = Utils::encodeActivity($payment->invitation->contact, 'entered ' . $payment->getName());			
+			$activity->message = Utils::encodeActivity($payment->invitation->contact, 'entered ' . $payment->getName() . ' for ', $payment->invoice);
 		}
 		else
 		{
 			$activity = Activity::getBlank();
-			$message = $payment->payment_type_id == PAYMENT_TYPE_CREDIT ? 'applied credit' : 'entered ' . $payment->getName();
-			$activity->message = Utils::encodeActivity(Auth::user(), $message);
+			$message = $payment->payment_type_id == PAYMENT_TYPE_CREDIT ? 'applied credit for ' : 'entered ' . $payment->getName() . ' for ';
+			$activity->message = Utils::encodeActivity(Auth::user(), $message, $payment->invoice);
 		}
 
 		$activity->payment_id = $payment->id;
diff --git a/app/ninja/repositories/ClientRepository.php b/app/ninja/repositories/ClientRepository.php
index b665b0e33553..4b56bc135f37 100755
--- a/app/ninja/repositories/ClientRepository.php
+++ b/app/ninja/repositories/ClientRepository.php
@@ -188,7 +188,7 @@ class ClientRepository
 
 	public function bulk($ids, $action)
 	{
-		$clients = Client::scope($ids)->get();
+		$clients = Client::withTrashed()->scope($ids)->get();
 
 		foreach ($clients as $client) 
 		{			
diff --git a/app/ninja/repositories/CreditRepository.php b/app/ninja/repositories/CreditRepository.php
index 704ebc54c1e2..1300bd5dc95b 100755
--- a/app/ninja/repositories/CreditRepository.php
+++ b/app/ninja/repositories/CreditRepository.php
@@ -66,7 +66,7 @@ class CreditRepository
             return 0;
         }
 
-       	$credits = Credit::scope($ids)->get();
+       	$credits = Credit::withTrashed()->scope($ids)->get();
 
         foreach ($credits as $credit) 
         {
diff --git a/app/ninja/repositories/InvoiceRepository.php b/app/ninja/repositories/InvoiceRepository.php
index 66923e4157ed..dad05fbd6fa4 100755
--- a/app/ninja/repositories/InvoiceRepository.php
+++ b/app/ninja/repositories/InvoiceRepository.php
@@ -435,7 +435,7 @@ class InvoiceRepository
 			return 0;
 		}
 
-		$invoices = Invoice::scope($ids)->get();
+		$invoices = Invoice::withTrashed()->scope($ids)->get();
 
 		foreach ($invoices as $invoice) 
 		{
diff --git a/app/ninja/repositories/PaymentRepository.php b/app/ninja/repositories/PaymentRepository.php
index 2cf96ceeae2e..f19b2ffb5830 100755
--- a/app/ninja/repositories/PaymentRepository.php
+++ b/app/ninja/repositories/PaymentRepository.php
@@ -112,7 +112,7 @@ class PaymentRepository
             return 0;
         }
 
-        $payments = Payment::scope($ids)->get();
+        $payments = Payment::withTrashed()->scope($ids)->get();
 
         foreach ($payments as $payment) 
         {            
diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index d84b14aa2060..991f6e5a7367 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -385,7 +385,8 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
 
 @endif
 
-@if (!Utils::isNinjaProd() && !Utils::isNinjaDev())    
+{{-- Per our license, please do not remove or modify this link. --}}
+@if (!Utils::isNinja())    
 <div class="container">{{ trans('texts.powered_by') }} <a href="https://www.invoiceninja.com/?utm_source=powered_by" target="_blank">InvoiceNinja.com</a></div>
 @endif
 
diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index 371b1f7e84d0..6ee2b16b7925 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -93,7 +93,6 @@
 
     @yield('body')
 
-
     <script type="text/javascript">
       NINJA.formIsChanged = false;
       $(function() {      
diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php
index 7f6d1c171b20..933a78007aa1 100644
--- a/app/views/public/header.blade.php
+++ b/app/views/public/header.blade.php
@@ -121,6 +121,7 @@
 <div class="navbar" style="margin-bottom:0px">
   <div class="container">
       <div class="navbar-header">
+          {{-- Per our license, please do not remove or modify this link. --}}                  
           <a class="navbar-brand" href="https://www.invoiceninja.com/"><img src="{{ asset('images/invoiceninja-logo.png') }}"></a>
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
             <span class="sr-only">Toggle navigation</span>

From 2995814927ac5c4a6a5e0f460bdcbe32f1632ce0 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hcoren@shoretel.com>
Date: Sun, 14 Sep 2014 09:05:16 +0300
Subject: [PATCH 19/33] Added archived data to the dashboard calculations

---
 app/controllers/DashboardController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/DashboardController.php b/app/controllers/DashboardController.php
index 4e95368da20b..a1d7a6f220fe 100644
--- a/app/controllers/DashboardController.php
+++ b/app/controllers/DashboardController.php
@@ -15,7 +15,7 @@ class DashboardController extends \BaseController {
             ->leftJoin('clients', 'accounts.id', '=', 'clients.account_id')
             ->leftJoin('invoices', 'clients.id', '=', 'invoices.client_id')
             ->where('accounts.id', '=', Auth::user()->account_id)
-            ->where('clients.deleted_at', '=', null)
+            ->where('clients.is_deleted', '=', false)
             ->groupBy('accounts.id')
             ->first();
     
@@ -25,7 +25,7 @@ class DashboardController extends \BaseController {
             ->select($select)
             ->leftJoin('clients', 'accounts.id', '=', 'clients.account_id')
             ->where('accounts.id', '=', Auth::user()->account_id)
-            ->where('clients.deleted_at', '=', null)
+            ->where('clients.is_deleted', '=', false)
             ->groupBy('accounts.id')
             ->first();
 
@@ -37,6 +37,7 @@ class DashboardController extends \BaseController {
                 ->where('balance', '>', 0)
                 ->where('is_recurring', '=', false)
                 ->where('is_quote', '=', false)
+                ->where('is_deleted', '=', false)
                 ->orderBy('due_date', 'asc')->take(6)->get();
 
     $upcoming = Invoice::scope()
@@ -44,6 +45,7 @@ class DashboardController extends \BaseController {
                   ->where('balance', '>', 0)
                   ->where('is_recurring', '=', false)
                   ->where('is_quote', '=', false)
+                  ->where('is_deleted', '=', false)
                   ->orderBy('due_date', 'asc')->take(6)->get();
 
     $data = [

From f8c2edc0dcb5548a13cf4044ea63c50d66d3e4f6 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hcoren@shoretel.com>
Date: Sun, 14 Sep 2014 10:33:34 +0300
Subject: [PATCH 20/33] Enabled updating accepted credit cards without
 re-entering payment credentials

---
 app/controllers/AccountController.php | 41 ++++++++++++++++-----------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 2b7cd08e26d8..ef0ec502b5d1 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -623,12 +623,13 @@ class AccountController extends \BaseController {
 		} 
 		else 
 		{
-			$account = Account::findOrFail(Auth::user()->account_id);						
+			$account = Account::with('account_gateways')->findOrFail(Auth::user()->account_id);						
 
 			if ($gatewayId) 
 			{
 				$accountGateway = AccountGateway::createNew();
 				$accountGateway->gateway_id = $gatewayId;
+				$isMasked = false;
 
 				$config = new stdClass;
 				foreach ($fields as $field => $details)
@@ -637,27 +638,35 @@ class AccountController extends \BaseController {
 
 					if ($value && $value === str_repeat('*', strlen($value)))
 					{
-						Session::flash('error', trans('validation.notmasked'));
-						return Redirect::to('company/payments');			
+						$isMasked = true;
 					}
 
 					$config->$field = $value;
 				}
                 
-		        $cardCount = 0;
-		        if ($creditcards) 
-		        {
-			        foreach($creditcards as $card => $value)
-			        {
-			            $cardCount += intval($value);
-			        }			
-		        }
-			
-				$accountGateway->config = json_encode($config);
-				$accountGateway->accepted_credit_cards = $cardCount;
+        $cardCount = 0;
+        if ($creditcards) 
+        {
+	        foreach($creditcards as $card => $value)
+	        {
+            $cardCount += intval($value);
+	        }			
+        }
+				
+				if ($isMasked && count($account->account_gateways)) 
+				{
+					$currentGateway = $account->account_gateways[0];
+					$currentGateway->accepted_credit_cards = $cardCount;
+					$currentGateway->save();
+				} 
+				else 
+				{
+					$accountGateway->config = json_encode($config);
+					$accountGateway->accepted_credit_cards = $cardCount;
 	
-				$account->account_gateways()->delete();
-				$account->account_gateways()->save($accountGateway);
+					$account->account_gateways()->delete();
+					$account->account_gateways()->save($accountGateway);
+				}
 
 				Session::flash('message', trans('texts.updated_settings'));
 			}

From 0c2b75a324a23e5ba931a34998980f8cf71d8c8a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hcoren@shoretel.com>
Date: Sun, 14 Sep 2014 14:39:15 +0300
Subject: [PATCH 21/33] Resolved issue updating company details as additional
 user

---
 app/controllers/AccountController.php | 25 +++++++++++++++++--------
 app/views/accounts/details.blade.php  | 24 ++++++++++++++----------
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index ef0ec502b5d1..44d215ffbfd8 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -92,6 +92,7 @@ class AccountController extends \BaseController {
 				'datetimeFormats' => DatetimeFormat::remember(DEFAULT_QUERY_CACHE)->get(),
 				'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(),
 				'languages' => Language::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(),
+				'showUser' => Auth::user()->id === Auth::user()->account->users()->first()->id,
 			];
 
 			return View::make('accounts.details', $data);
@@ -683,9 +684,15 @@ class AccountController extends \BaseController {
 	{
 		$rules = array(
 			'name' => 'required',
-			'email' => 'email|required|unique:users,email,' . Auth::user()->id . ',id'
 		);
 
+		$user = Auth::user()->account->users()->first();
+
+		if (Auth::user()->id === $user->id)		
+		{
+			$rules['email'] = 'email|required|unique:users,email,' . $user->id . ',id';
+		}
+
 		$validator = Validator::make(Input::all(), $rules);
 
 		if ($validator->fails()) 
@@ -715,13 +722,15 @@ class AccountController extends \BaseController {
 			$account->language_id = Input::get('language_id') ? Input::get('language_id') : 1; // English
 			$account->save();
 
-			$user = Auth::user();
-			$user->first_name = trim(Input::get('first_name'));
-			$user->last_name = trim(Input::get('last_name'));
-			$user->username = trim(Input::get('email'));
-			$user->email = trim(strtolower(Input::get('email')));
-			$user->phone = trim(Input::get('phone'));				
-			$user->save();
+			if (Auth::user()->id === $user->id)
+			{
+				$user->first_name = trim(Input::get('first_name'));
+				$user->last_name = trim(Input::get('last_name'));
+				$user->username = trim(Input::get('email'));
+				$user->email = trim(strtolower(Input::get('email')));
+				$user->phone = trim(Input::get('phone'));				
+				$user->save();
+			}
 
 			/* Logo image file */
 			if ($file = Input::file('logo'))
diff --git a/app/views/accounts/details.blade.php b/app/views/accounts/details.blade.php
index c1e96f3b7fb5..41571258ae12 100755
--- a/app/views/accounts/details.blade.php
+++ b/app/views/accounts/details.blade.php
@@ -17,11 +17,13 @@
 	)) }}
 
 	{{ Former::populate($account) }}
-	{{ Former::populateField('first_name', $account->users()->first()->first_name) }}
-	{{ Former::populateField('last_name', $account->users()->first()->last_name) }}
-	{{ Former::populateField('email', $account->users()->first()->email) }}	
-	{{ Former::populateField('phone', $account->users()->first()->phone) }}
-
+	@if ($showUser)
+		{{ Former::populateField('first_name', $account->users()->first()->first_name) }}
+		{{ Former::populateField('last_name', $account->users()->first()->last_name) }}
+		{{ Former::populateField('email', $account->users()->first()->email) }}	
+		{{ Former::populateField('phone', $account->users()->first()->phone) }}
+	@endif
+	
 	<div class="row">
 		<div class="col-md-5">
 
@@ -56,11 +58,13 @@
 	
 		<div class="col-md-5 col-md-offset-1">		
 
-			{{ Former::legend('users') }}
-			{{ Former::text('first_name') }}
-			{{ Former::text('last_name') }}
-			{{ Former::text('email') }}
-			{{ Former::text('phone') }}
+			@if ($showUser)
+				{{ Former::legend('users') }}
+				{{ Former::text('first_name') }}
+				{{ Former::text('last_name') }}
+				{{ Former::text('email') }}
+				{{ Former::text('phone') }}
+			@endif
 
 			{{ Former::legend('localization') }}
 			{{ Former::select('language_id')->addOption('','')

From 47edf3f565eb4c7b7f240fa2226cdd7517d31e5e Mon Sep 17 00:00:00 2001
From: Hillel Coren <hcoren@shoretel.com>
Date: Sun, 14 Sep 2014 14:46:59 +0300
Subject: [PATCH 22/33] Changed additional user emails to be sent from primary
 user name\email

---
 app/ninja/mailers/UserMailer.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/ninja/mailers/UserMailer.php b/app/ninja/mailers/UserMailer.php
index 066db805d653..f4042cd8f4fb 100755
--- a/app/ninja/mailers/UserMailer.php
+++ b/app/ninja/mailers/UserMailer.php
@@ -23,7 +23,18 @@ class UserMailer extends Mailer {
 			'invitationMessage' => $invitor ? trans('texts.invitation_message', ['invitor' => $invitor->getDisplayName()]) : ''
 		];
 		
-		$this->sendTo($user->email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data);		
+		if ($invitor)
+		{
+			$fromEmail = $invitor->email;
+			$fromName = $invitor->getDisplayName();
+		}
+		else
+		{
+			$fromEmail = CONTACT_EMAIL;
+			$fromName = CONTACT_NAME;
+		}
+
+		$this->sendTo($user->email, $fromEmail, $fromName, $subject, $view, $data);		
 	}
 
 	public function sendNotification(User $user, Invoice $invoice, $notificationType, Payment $payment = null)
@@ -46,7 +57,7 @@ class UserMailer extends Mailer {
 			'invoiceLink' => SITE_URL . "/{$entityType}s/{$invoice->public_id}"			
 		];
 
-		if ($payment)
+		if ($payment)				
 		{
 			$data['paymentAmount'] = Utils::formatMoney($payment->amount, $invoice->client->currency_id);
 		}

From 74b680ef872d76dbf92001d05bbe565b83c0047d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hcoren@shoretel.com>
Date: Sun, 14 Sep 2014 15:26:51 +0300
Subject: [PATCH 23/33] Added the ability to cancel an account

---
 app/controllers/AccountController.php      | 10 ++++
 app/lang/de/texts.php                      | 11 ++--
 app/lang/en/texts.php                      |  9 +++-
 app/lang/es/texts.php                      | 11 ++--
 app/lang/fr/texts.php                      | 11 ++--
 app/lang/it/texts.php                      |  9 +++-
 app/lang/lt/texts.php                      |  8 ++-
 app/lang/nb_NO/texts.php                   |  9 +++-
 app/lang/nl/texts.php                      |  9 +++-
 app/lang/pt_BR/texts.php                   |  9 +++-
 app/routes.php                             |  1 +
 app/views/accounts/import_export.blade.php | 63 ++++++++++++++++++----
 app/views/invoices/edit.blade.php          |  2 +-
 13 files changed, 130 insertions(+), 32 deletions(-)

diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 44d215ffbfd8..c342d6986dd4 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -815,4 +815,14 @@ class AccountController extends \BaseController {
 
 		return "{$user->first_name} {$user->last_name}";
 	}
+
+	public function cancelAccount()
+	{
+		$account = Auth::user()->account;
+		$account->forceDelete();
+
+		Confide::logout();
+
+		return Redirect::to('/')->with('clearGuestKey', true);
+	}
 }
\ No newline at end of file
diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php
index 77fc2f781a89..f2f89bea2d06 100644
--- a/app/lang/de/texts.php
+++ b/app/lang/de/texts.php
@@ -405,7 +405,12 @@ return array(
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
 
-  'confirm_email_invoice' => 'Confirm emailing this invoice',
-  'confirm_email_quote' => 'Confirm emailing this quote',
-  
+  'confirm_email_invoice' => 'Are you sure you want to email this invoice?',
+  'confirm_email_quote' => 'Are you sure you want to email this quote?',
+  'confirm_recurring_email_invoice' => 'Are you sure you want this invoice emailed?',
+
+  'cancel_account' => 'Cancel Account',
+  'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.',
+  'go_back' => 'Go Back',
+
 );
diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index a3ee84c2aa6d..25a3c16f7c97 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -420,8 +420,13 @@ return array(
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
 
-  'confirm_email_invoice' => 'Confirm emailing this invoice',
-  'confirm_email_quote' => 'Confirm emailing this quote',
+  'confirm_email_invoice' => 'Are you sure you want to email this invoice?',
+  'confirm_email_quote' => 'Are you sure you want to email this quote?',
+  'confirm_recurring_email_invoice' => 'Are you sure you want this invoice emailed?',
+
+  'cancel_account' => 'Cancel Account',
+  'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.',
+  'go_back' => 'Go Back',
 
 
 );
\ No newline at end of file
diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php
index 466d11ff783a..2335ce1c3afd 100644
--- a/app/lang/es/texts.php
+++ b/app/lang/es/texts.php
@@ -403,7 +403,12 @@ return array(
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
 
-  'confirm_email_invoice' => 'Confirm emailing this invoice',
-  'confirm_email_quote' => 'Confirm emailing this quote',
-    
+  'confirm_email_invoice' => 'Are you sure you want to email this invoice?',
+  'confirm_email_quote' => 'Are you sure you want to email this quote?',
+  'confirm_recurring_email_invoice' => 'Are you sure you want this invoice emailed?',
+
+  'cancel_account' => 'Cancel Account',
+  'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.',
+  'go_back' => 'Go Back',
+
 );
diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php
index ea725a138084..462785a93869 100644
--- a/app/lang/fr/texts.php
+++ b/app/lang/fr/texts.php
@@ -405,7 +405,12 @@ return array(
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
 
-  'confirm_email_invoice' => 'Confirm emailing this invoice',
-  'confirm_email_quote' => 'Confirm emailing this quote',
-    
+  'confirm_email_invoice' => 'Are you sure you want to email this invoice?',
+  'confirm_email_quote' => 'Are you sure you want to email this quote?',
+  'confirm_recurring_email_invoice' => 'Are you sure you want this invoice emailed?',
+
+  'cancel_account' => 'Cancel Account',
+  'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.',
+  'go_back' => 'Go Back',
+
 );
diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php
index f1d958b94712..c81c33eab1cd 100644
--- a/app/lang/it/texts.php
+++ b/app/lang/it/texts.php
@@ -405,7 +405,12 @@ return array(
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
 
-  'confirm_email_invoice' => 'Confirm emailing this invoice',
-  'confirm_email_quote' => 'Confirm emailing this quote',
+  'confirm_email_invoice' => 'Are you sure you want to email this invoice?',
+  'confirm_email_quote' => 'Are you sure you want to email this quote?',
+  'confirm_recurring_email_invoice' => 'Are you sure you want this invoice emailed?',
+
+  'cancel_account' => 'Cancel Account',
+  'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.',
+  'go_back' => 'Go Back',
   
 );
diff --git a/app/lang/lt/texts.php b/app/lang/lt/texts.php
index 109f66f804eb..d6e5a05821ba 100644
--- a/app/lang/lt/texts.php
+++ b/app/lang/lt/texts.php
@@ -420,9 +420,13 @@ return array(
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
 
-  'confirm_email_invoice' => 'Confirm emailing this invoice',
-  'confirm_email_quote' => 'Confirm emailing this quote',
+  'confirm_email_invoice' => 'Are you sure you want to email this invoice?',
+  'confirm_email_quote' => 'Are you sure you want to email this quote?',
+  'confirm_recurring_email_invoice' => 'Are you sure you want this invoice emailed?',
 
+  'cancel_account' => 'Cancel Account',
+  'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.',
+  'go_back' => 'Go Back',
 
 );
 
diff --git a/app/lang/nb_NO/texts.php b/app/lang/nb_NO/texts.php
index d62734c9fbf8..abed26d260a7 100644
--- a/app/lang/nb_NO/texts.php
+++ b/app/lang/nb_NO/texts.php
@@ -420,7 +420,12 @@ return array(
   'deleted_user' => 'Bruker slettet',
   'limit_users' => 'Dessverre, vil dette overstiger grensen p&#229; ' . MAX_NUM_USERS . ' brukere',
 
-  'confirm_email_invoice' => 'Confirm emailing this invoice',
-  'confirm_email_quote' => 'Confirm emailing this quote',
+  'confirm_email_invoice' => 'Are you sure you want to email this invoice?',
+  'confirm_email_quote' => 'Are you sure you want to email this quote?',
+  'confirm_recurring_email_invoice' => 'Are you sure you want this invoice emailed?',
+
+  'cancel_account' => 'Cancel Account',
+  'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.',
+  'go_back' => 'Go Back',
 
 );
\ No newline at end of file
diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php
index 8f9ea67de15a..5ad10e249578 100644
--- a/app/lang/nl/texts.php
+++ b/app/lang/nl/texts.php
@@ -406,7 +406,12 @@ return array(
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
 
-  'confirm_email_invoice' => 'Confirm emailing this invoice',
-  'confirm_email_quote' => 'Confirm emailing this quote',
+  'confirm_email_invoice' => 'Are you sure you want to email this invoice?',
+  'confirm_email_quote' => 'Are you sure you want to email this quote?',
+  'confirm_recurring_email_invoice' => 'Are you sure you want this invoice emailed?',
   
+  'cancel_account' => 'Cancel Account',
+  'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.',
+  'go_back' => 'Go Back',
+
 );
diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php
index 738a73b7d1ac..5aab09b6b887 100644
--- a/app/lang/pt_BR/texts.php
+++ b/app/lang/pt_BR/texts.php
@@ -394,7 +394,12 @@ return array(
   'deleted_user' => 'Successfully deleted user',
   'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
 
-  'confirm_email_invoice' => 'Confirm emailing this invoice',
-  'confirm_email_quote' => 'Confirm emailing this quote',
+  'confirm_email_invoice' => 'Are you sure you want to email this invoice?',
+  'confirm_email_quote' => 'Are you sure you want to email this quote?',
+  'confirm_recurring_email_invoice' => 'Are you sure you want this invoice emailed?',
   
+  'cancel_account' => 'Cancel Account',
+  'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.',
+  'go_back' => 'Go Back',
+
 );
diff --git a/app/routes.php b/app/routes.php
index e7271bf1f429..489ad1c57191 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -81,6 +81,7 @@ Route::group(array('before' => 'auth'), function()
   Route::get('company/advanced_settings/chart_builder', 'ReportController@report');
   Route::post('company/advanced_settings/chart_builder', 'ReportController@report');
 
+  Route::post('company/cancel_account', 'AccountController@cancelAccount');
 	Route::get('account/getSearchData', array('as' => 'getSearchData', 'uses' => 'AccountController@getSearchData'));
   Route::get('company/{section?}/{sub_section?}', 'AccountController@showSection');	
 	Route::post('company/{section?}/{sub_section?}', 'AccountController@doSection');
diff --git a/app/views/accounts/import_export.blade.php b/app/views/accounts/import_export.blade.php
index e9a72ee1b2cd..fd802d177632 100755
--- a/app/views/accounts/import_export.blade.php
+++ b/app/views/accounts/import_export.blade.php
@@ -1,17 +1,60 @@
 @extends('accounts.nav')
 
 @section('content')
-	@parent
+@parent
 
-	{{ Former::open_for_files('company/import_map')->addClass('col-md-9 col-md-offset-1') }}
-	{{ Former::legend('import_clients') }}
-	{{ Former::file('file')->label(trans('texts.csv_file')) }}
-	{{ Former::actions( Button::lg_info_submit(trans('texts.upload'))->append_with_icon('open') ) }}
-	{{ Former::close() }}
+{{ Former::open_for_files('company/import_map')->addClass('col-md-9 col-md-offset-1') }}
+{{ Former::legend('import_clients') }}
+{{ Former::file('file')->label(trans('texts.csv_file')) }}
+{{ Former::actions( Button::lg_info_submit(trans('texts.upload'))->append_with_icon('open') ) }}
+{{ Former::close() }}
 
-  {{ Former::open('company/export')->addClass('col-md-9 col-md-offset-1') }}
-  {{ Former::legend('export_clients') }}
-  {{ Former::actions( Button::lg_primary_submit(trans('texts.download'))->append_with_icon('download-alt') ) }}
-  {{ Former::close() }}
+{{ Former::open('company/export')->addClass('col-md-9 col-md-offset-1') }}
+{{ Former::legend('export_clients') }}
+{{ Former::actions( Button::lg_primary_submit(trans('texts.download'))->append_with_icon('download-alt') ) }}
+{{ Former::close() }}
+
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+
+{{ Former::open('company/cancel_account')->addClass('col-md-9 col-md-offset-1 cancel-account') }}
+{{ Former::legend('cancel_account') }}
+{{ Former::actions( Button::lg_danger_button(trans('texts.cancel_account'), ['onclick' => 'showConfirm()'])->append_with_icon('trash') ) }}
+
+<div class="modal fade" id="confirmCancelModal" tabindex="-1" role="dialog" aria-labelledby="confirmCancelModalLabel" aria-hidden="true">
+  <div class="modal-dialog" style="min-width:150px">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title" id="confirmCancelModalLabel">{{ trans('texts.cancel_account') }}</h4>
+      </div>
+
+      <div style="background-color: #fff; padding-left: 16px; padding-right: 16px">
+        &nbsp;<p>{{ trans('texts.cancel_account_message') }}</p>&nbsp;
+      </div>
+
+      <div class="modal-footer" style="margin-top: 0px">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.go_back') }}</button>
+        <button type="button" class="btn btn-primary" onclick="confirmCancel()">{{ trans('texts.cancel_account') }}</button>         
+      </div>
+
+    </div>
+  </div>
+</div>
+
+{{ Former::close() }}  
+
+
+<script type="text/javascript">
+
+  function showConfirm() {
+    $('#confirmCancelModal').modal('show'); 
+  }
+
+  function confirmCancel() {
+    $('form.cancel-account').submit();
+  }
+
+</script>
 
 @stop
\ No newline at end of file
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index 2d634a7687f9..f0d72ebe9729 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -730,7 +730,7 @@
 
 	function onSaveClick() {
 		if (model.invoice().is_recurring()) {
-			if (confirm('{{ trans("texts.confirm_email_$entityType") }}')) {		
+			if (confirm('{{ trans("texts.confirm_recurring_email_$entityType") }}')) {		
 				submitAction('');
 			}			
 		} else {

From f6ac344c3f45be1d5432fcc0d94db5a7b9609dad Mon Sep 17 00:00:00 2001
From: Hillel Coren <hcoren@shoretel.com>
Date: Mon, 15 Sep 2014 12:27:21 +0300
Subject: [PATCH 24/33] Added Candian Dollar

---
 app/database/seeds/ConstantsSeeder.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/database/seeds/ConstantsSeeder.php b/app/database/seeds/ConstantsSeeder.php
index 365312a79c3c..fd69b39bb503 100755
--- a/app/database/seeds/ConstantsSeeder.php
+++ b/app/database/seeds/ConstantsSeeder.php
@@ -132,6 +132,7 @@ class ConstantsSeeder extends Seeder
 		Currency::create(array('name' => 'Swedish Krona', 'code' => 'SEK', 'symbol' => 'kr ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
 		Currency::create(array('name' => 'Norske Kroner', 'code' => 'NOK', 'symbol' => 'kr ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
 		Currency::create(array('name' => 'Kenyan Shilling', 'code' => 'KES', 'symbol' => 'KSh ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
+		Currency::create(array('name' => 'Canadian Dollar', 'code' => 'CAD', 'symbol' => 'C$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
 
 		DatetimeFormat::create(array('format' => 'd/M/Y g:i a', 'label' => '10/Mar/2013'));
 		DatetimeFormat::create(array('format' => 'd-M-Yk g:i a', 'label' => '10-Mar-2013'));

From 539d86770e8d60248111fdf119715636048cc522 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 17 Sep 2014 09:26:01 +0300
Subject: [PATCH 25/33] Prevented text in inputs from wrapping

---
 app/lang/en/texts.php | 1 -
 public/built.css      | 4 ++++
 public/css/style.css  | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index 25a3c16f7c97..b8648c28f0be 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -428,5 +428,4 @@ return array(
   'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.',
   'go_back' => 'Go Back',
 
-
 );
\ No newline at end of file
diff --git a/public/built.css b/public/built.css
index 7be4d1223df2..e081951a12c7 100644
--- a/public/built.css
+++ b/public/built.css
@@ -2026,6 +2026,10 @@ div {
     word-break: break-word;
 }
 
+div.input-group {
+    word-break: normal;
+}
+
 div.required > label {
     font-weight: bold !important;
 }
diff --git a/public/css/style.css b/public/css/style.css
index e40458f92b9d..0244c4c219b9 100755
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -251,6 +251,10 @@ div {
     word-break: break-word;
 }
 
+div.input-group {
+    word-break: normal;
+}
+
 div.required > label {
     font-weight: bold !important;
 }

From 767dfe5ec77853a749202180d51efd195dcf89d1 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 17 Sep 2014 09:27:25 +0300
Subject: [PATCH 26/33] Updated version

---
 app/routes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes.php b/app/routes.php
index 489ad1c57191..d4569f43c8d2 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -232,7 +232,7 @@ define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
 define('NINJA_GATEWAY_ID', GATEWAY_AUTHORIZE_NET);
 define('NINJA_GATEWAY_CONFIG', '{"apiLoginId":"626vWcD5","transactionKey":"4bn26TgL9r4Br4qJ","testMode":"","developerMode":""}');
 define('NINJA_URL', 'https://www.invoiceninja.com');
-define('NINJA_VERSION', '1.3.2');
+define('NINJA_VERSION', '1.3.3');
 
 define('PRO_PLAN_PRICE', 50);
 define('LICENSE_PRICE', 30.00);

From ae0d2e226ffd241686d7b8e3b83fa32581a21d89 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 22 Sep 2014 22:59:17 +0300
Subject: [PATCH 27/33] Commented out ninja dev flag

---
 .env.development.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.development.php b/.env.development.php
index ecc9ff2b5a4a..fde3ed2083c6 100644
--- a/.env.development.php
+++ b/.env.development.php
@@ -4,6 +4,6 @@ return array(
 
   //'TAG_MANAGER_KEY' => '',
   //'ANALYTICS_KEY' => '',
-  'NINJA_DEV' => true,
+  //'NINJA_DEV' => false,
   
 );

From 0abb6c4c848831a9b03846c172abf08155457b45 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 28 Sep 2014 12:21:21 +0300
Subject: [PATCH 28/33] Resolved issue downloading Omnipay code

---
 composer.lock | 911 ++++++++++++++++++++++----------------------------
 1 file changed, 396 insertions(+), 515 deletions(-)

diff --git a/composer.lock b/composer.lock
index 143f851a09fb..78052299ac01 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,9 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
     ],
-    "hash": "941a62dd9c259f138de7d7fa18a27ff5",
+    "hash": "6a7a4cfeef40b34eaad05a6256620335",
     "packages": [
         {
             "name": "anahkiasen/former",
@@ -103,16 +104,16 @@
         },
         {
             "name": "anahkiasen/underscore-php",
-            "version": "1.2.3",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Anahkiasen/underscore-php.git",
-                "reference": "c5d2900e7eea6b22ba266e3bcd19d290f9075f5f"
+                "reference": "b5cb869b1b0e0a27deb4156884411d7e14b9bc24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Anahkiasen/underscore-php/zipball/c5d2900e7eea6b22ba266e3bcd19d290f9075f5f",
-                "reference": "c5d2900e7eea6b22ba266e3bcd19d290f9075f5f",
+                "url": "https://api.github.com/repos/Anahkiasen/underscore-php/zipball/b5cb869b1b0e0a27deb4156884411d7e14b9bc24",
+                "reference": "b5cb869b1b0e0a27deb4156884411d7e14b9bc24",
                 "shasum": ""
             },
             "require": {
@@ -127,10 +128,7 @@
                         "src",
                         "tests"
                     ]
-                },
-                "files": [
-                    "helpers.php"
-                ]
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -148,7 +146,7 @@
                 "laravel",
                 "toolkit"
             ],
-            "time": "2014-03-13 10:45:40"
+            "time": "2014-09-25 10:00:05"
         },
         {
             "name": "barryvdh/laravel-debugbar",
@@ -388,17 +386,17 @@
         },
         {
             "name": "guzzle/common",
-            "version": "v3.9.1",
+            "version": "v3.9.2",
             "target-dir": "Guzzle/Common",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/common.git",
-                "reference": "707428cd8a99486418a66c859777b56194d67d6c"
+                "reference": "2e36af7cf2ce3ea1f2d7c2831843b883a8e7b7dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/common/zipball/707428cd8a99486418a66c859777b56194d67d6c",
-                "reference": "707428cd8a99486418a66c859777b56194d67d6c",
+                "url": "https://api.github.com/repos/guzzle/common/zipball/2e36af7cf2ce3ea1f2d7c2831843b883a8e7b7dc",
+                "reference": "2e36af7cf2ce3ea1f2d7c2831843b883a8e7b7dc",
                 "shasum": ""
             },
             "require": {
@@ -428,21 +426,21 @@
                 "event",
                 "exception"
             ],
-            "time": "2014-05-07 17:04:22"
+            "time": "2014-08-11 04:32:36"
         },
         {
             "name": "guzzle/http",
-            "version": "v3.9.1",
+            "version": "v3.9.2",
             "target-dir": "Guzzle/Http",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/http.git",
-                "reference": "222c4e7bccb945c612283d1dd81762f2a20a4efc"
+                "reference": "1e8dd1e2ba9dc42332396f39fbfab950b2301dc5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/http/zipball/222c4e7bccb945c612283d1dd81762f2a20a4efc",
-                "reference": "222c4e7bccb945c612283d1dd81762f2a20a4efc",
+                "url": "https://api.github.com/repos/guzzle/http/zipball/1e8dd1e2ba9dc42332396f39fbfab950b2301dc5",
+                "reference": "1e8dd1e2ba9dc42332396f39fbfab950b2301dc5",
                 "shasum": ""
             },
             "require": {
@@ -485,11 +483,11 @@
                 "http",
                 "http client"
             ],
-            "time": "2014-05-01 21:56:28"
+            "time": "2014-08-11 04:32:36"
         },
         {
             "name": "guzzle/parser",
-            "version": "v3.9.1",
+            "version": "v3.9.2",
             "target-dir": "Guzzle/Parser",
             "source": {
                 "type": "git",
@@ -533,7 +531,7 @@
         },
         {
             "name": "guzzle/stream",
-            "version": "v3.9.1",
+            "version": "v3.9.2",
             "target-dir": "Guzzle/Stream",
             "source": {
                 "type": "git",
@@ -876,11 +874,11 @@
                     "name": "Max Ehsan",
                     "email": "contact@laravelbook.com",
                     "homepage": "http://laravelbook.com/",
-                    "role": "Developer"
+                    "role": "Maintainer"
                 },
                 {
                     "name": "Igor Santos",
-                    "email": "igorsantos07@gmail.com",
+                    "email": "igorsantos07+dev@gmail.com",
                     "homepage": "http://www.igorsantos.com.br",
                     "role": "Developer"
                 }
@@ -900,118 +898,6 @@
             ],
             "time": "2014-02-25 20:39:04"
         },
-        {
-            "name": "league/oauth2-server",
-            "version": "2.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/oauth2-server.git",
-                "reference": "a9b52ab56a5bac383f7d300aec2e234285d7f861"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/a9b52ab56a5bac383f7d300aec2e234285d7f861",
-                "reference": "a9b52ab56a5bac383f7d300aec2e234285d7f861",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "replace": {
-                "league/oauth2server": "*",
-                "lncd/oauth2": "*"
-            },
-            "require-dev": {
-                "mockery/mockery": ">=0.7.2"
-            },
-            "suggest": {
-                "zetacomponents/database": "Allows use of the build in PDO storage classes"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "League\\OAuth2\\Server": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Alex Bilbie",
-                    "email": "hello@alexbilbie.com",
-                    "homepage": "http://www.alexbilbie.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A lightweight and powerful OAuth 2.0 authorization and resource server library with support for all the core specification grants. This library will allow you to secure your API with OAuth and allow your applications users to approve apps that want to access their data from your API.",
-            "homepage": "https://github.com/php-loep/oauth2-server",
-            "keywords": [
-                "Authentication",
-                "api",
-                "authorization",
-                "oauth",
-                "oauth2",
-                "resource",
-                "server"
-            ],
-            "time": "2014-05-23 15:29:49"
-        },
-        {
-            "name": "lucadegasperi/oauth2-server-laravel",
-            "version": "1.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/lucadegasperi/oauth2-server-laravel.git",
-                "reference": "abd252c22a84329532c0cd1e558842a82f710592"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/lucadegasperi/oauth2-server-laravel/zipball/abd252c22a84329532c0cd1e558842a82f710592",
-                "reference": "abd252c22a84329532c0cd1e558842a82f710592",
-                "shasum": ""
-            },
-            "require": {
-                "league/oauth2-server": "2.1.x",
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "mockery/mockery": ">=0.7.2",
-                "orchestra/testbench": "2.0.*",
-                "phpunit/phpunit": "3.7.22",
-                "squizlabs/php_codesniffer": "1.*"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/migrations",
-                    "tests/TestCase.php"
-                ],
-                "psr-0": {
-                    "LucaDegasperi\\OAuth2Server": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Luca Degasperi",
-                    "email": "packages@lucadegasperi.com"
-                }
-            ],
-            "description": "A Laravel 4 wrapper for the popular OAuth 2.0 Server package league/oauth2-server",
-            "keywords": [
-                "api",
-                "laravel",
-                "oauth",
-                "oauth2",
-                "server"
-            ],
-            "time": "2014-05-30 16:48:54"
-        },
         {
             "name": "maximebf/debugbar",
             "version": "dev-master",
@@ -1073,12 +959,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "61145103b6521d04c0386d1ea6899437df9d45e2"
+                "reference": "b3f039339d7a8173c7b441dbaa572ccacb712b54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/61145103b6521d04c0386d1ea6899437df9d45e2",
-                "reference": "61145103b6521d04c0386d1ea6899437df9d45e2",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/b3f039339d7a8173c7b441dbaa572ccacb712b54",
+                "reference": "b3f039339d7a8173c7b441dbaa572ccacb712b54",
                 "shasum": ""
             },
             "require": {
@@ -1094,7 +980,8 @@
                 "graylog2/gelf-php": "~1.0",
                 "phpunit/phpunit": "~3.7.0",
                 "raven/raven": "~0.5",
-                "ruflin/elastica": "0.90.*"
+                "ruflin/elastica": "0.90.*",
+                "videlalvaro/php-amqplib": "~2.4"
             },
             "suggest": {
                 "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
@@ -1104,12 +991,13 @@
                 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
                 "raven/raven": "Allow sending log messages to a Sentry server",
                 "rollbar/rollbar": "Allow sending log messages to Rollbar",
-                "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+                "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.10.x-dev"
+                    "dev-master": "1.11.x-dev"
                 }
             },
             "autoload": {
@@ -1135,20 +1023,20 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2014-07-19 19:11:34"
+            "time": "2014-09-10 15:41:01"
         },
         {
             "name": "nesbot/carbon",
-            "version": "1.10.0",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "9b42a1aec56011c2ac4d75c0ddad0794762344fc"
+                "reference": "5cb6e71055f7b0b57956b73d324cc4de31278f42"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/9b42a1aec56011c2ac4d75c0ddad0794762344fc",
-                "reference": "9b42a1aec56011c2ac4d75c0ddad0794762344fc",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/5cb6e71055f7b0b57956b73d324cc4de31278f42",
+                "reference": "5cb6e71055f7b0b57956b73d324cc4de31278f42",
                 "shasum": ""
             },
             "require": {
@@ -1181,7 +1069,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2014-07-18 03:44:47"
+            "time": "2014-09-26 02:52:02"
         },
         {
             "name": "nikic/php-parser",
@@ -1230,16 +1118,16 @@
         },
         {
             "name": "omnipay/2checkout",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/2checkout.git",
-                "reference": "8524a471e5f88baeea09903ec6d6bd89bc21fdd0"
+                "url": "https://github.com/thephpleague/omnipay-2checkout.git",
+                "reference": "31394ce58d5999b6f49b321cb3547747837c1297"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/2checkout/zipball/8524a471e5f88baeea09903ec6d6bd89bc21fdd0",
-                "reference": "8524a471e5f88baeea09903ec6d6bd89bc21fdd0",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-2checkout/zipball/31394ce58d5999b6f49b321cb3547747837c1297",
+                "reference": "31394ce58d5999b6f49b321cb3547747837c1297",
                 "shasum": ""
             },
             "require": {
@@ -1270,11 +1158,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/2checkout/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-2checkout/contributors"
                 }
             ],
             "description": "2Checkout driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/2checkout",
+            "homepage": "https://github.com/thephpleague/omnipay-2checkout",
             "keywords": [
                 "2checkout",
                 "2co",
@@ -1285,20 +1173,20 @@
                 "payment",
                 "twocheckout"
             ],
-            "time": "2014-04-14 11:16:11"
+            "time": "2014-09-17 00:35:37"
         },
         {
             "name": "omnipay/authorizenet",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/authorizenet.git",
-                "reference": "6d93223205d42d824622b2874339db9ff4aa3ebf"
+                "url": "https://github.com/thephpleague/omnipay-authorizenet.git",
+                "reference": "344dc83cccfe772c6c6d02183bc1d62323bd605c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/authorizenet/zipball/6d93223205d42d824622b2874339db9ff4aa3ebf",
-                "reference": "6d93223205d42d824622b2874339db9ff4aa3ebf",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-authorizenet/zipball/344dc83cccfe772c6c6d02183bc1d62323bd605c",
+                "reference": "344dc83cccfe772c6c6d02183bc1d62323bd605c",
                 "shasum": ""
             },
             "require": {
@@ -1329,11 +1217,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/authorizenet/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-authorizenet/contributors"
                 }
             ],
             "description": "Authorize.Net gateway for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/authorizenet",
+            "homepage": "https://github.com/thephpleague/omnipay-authorizenet",
             "keywords": [
                 "authorize",
                 "authorize net",
@@ -1344,7 +1232,7 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-04-14 16:05:59"
+            "time": "2014-09-17 00:38:19"
         },
         {
             "name": "omnipay/buckaroo",
@@ -1405,16 +1293,16 @@
         },
         {
             "name": "omnipay/cardsave",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/cardsave.git",
-                "reference": "191060a2b7a804e4267330c06ea6e855593eaa61"
+                "url": "https://github.com/thephpleague/omnipay-cardsave.git",
+                "reference": "74f4656bb1b4424de011f2560cbb0d7c9a830f18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/cardsave/zipball/191060a2b7a804e4267330c06ea6e855593eaa61",
-                "reference": "191060a2b7a804e4267330c06ea6e855593eaa61",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-cardsave/zipball/74f4656bb1b4424de011f2560cbb0d7c9a830f18",
+                "reference": "74f4656bb1b4424de011f2560cbb0d7c9a830f18",
                 "shasum": ""
             },
             "require": {
@@ -1445,11 +1333,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/cardsave/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-cardsave/contributors"
                 }
             ],
             "description": "CardSave driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/cardsave",
+            "homepage": "https://github.com/thephpleague/omnipay-cardsave",
             "keywords": [
                 "card save",
                 "cardsave",
@@ -1459,7 +1347,7 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-04-14 16:16:25"
+            "time": "2014-09-17 00:37:27"
         },
         {
             "name": "omnipay/coinbase",
@@ -1520,16 +1408,16 @@
         },
         {
             "name": "omnipay/common",
-            "version": "v2.3.0",
+            "version": "v2.3.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/common.git",
-                "reference": "f7d50ce82f3528e7402500d8722391ebb69070b8"
+                "url": "https://github.com/thephpleague/omnipay-common.git",
+                "reference": "2c83349327ed3534237043a7a882cbaff55a7866"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/common/zipball/f7d50ce82f3528e7402500d8722391ebb69070b8",
-                "reference": "f7d50ce82f3528e7402500d8722391ebb69070b8",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/2c83349327ed3534237043a7a882cbaff55a7866",
+                "reference": "2c83349327ed3534237043a7a882cbaff55a7866",
                 "shasum": ""
             },
             "require": {
@@ -1601,11 +1489,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/common/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-common/contributors"
                 }
             ],
             "description": "Common components for Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/common",
+            "homepage": "https://github.com/thephpleague/omnipay-common",
             "keywords": [
                 "gateway",
                 "merchant",
@@ -1614,20 +1502,20 @@
                 "payment",
                 "purchase"
             ],
-            "time": "2014-05-12 00:54:17"
+            "time": "2014-09-17 00:38:32"
         },
         {
             "name": "omnipay/dummy",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/dummy.git",
-                "reference": "56044c0c1a601ecb575ff4876328af0a49ce938b"
+                "url": "https://github.com/thephpleague/omnipay-dummy.git",
+                "reference": "2e4d4b37114917b7b843bed3cd19bafdf22ad420"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/dummy/zipball/56044c0c1a601ecb575ff4876328af0a49ce938b",
-                "reference": "56044c0c1a601ecb575ff4876328af0a49ce938b",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-dummy/zipball/2e4d4b37114917b7b843bed3cd19bafdf22ad420",
+                "reference": "2e4d4b37114917b7b843bed3cd19bafdf22ad420",
                 "shasum": ""
             },
             "require": {
@@ -1658,11 +1546,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/dummy/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-dummy/contributors"
                 }
             ],
             "description": "Dummy driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/dummy",
+            "homepage": "https://github.com/thephpleague/omnipay-dummy",
             "keywords": [
                 "Dummy",
                 "gateway",
@@ -1671,20 +1559,20 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-04-14 11:25:19"
+            "time": "2014-09-17 00:39:36"
         },
         {
             "name": "omnipay/eway",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/eway.git",
-                "reference": "734349355c2c2726e715be979fac5ae63748d879"
+                "url": "https://github.com/thephpleague/omnipay-eway.git",
+                "reference": "031236cf5653b5a021a5eb5565aceb923f64d964"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/eway/zipball/734349355c2c2726e715be979fac5ae63748d879",
-                "reference": "734349355c2c2726e715be979fac5ae63748d879",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-eway/zipball/031236cf5653b5a021a5eb5565aceb923f64d964",
+                "reference": "031236cf5653b5a021a5eb5565aceb923f64d964",
                 "shasum": ""
             },
             "require": {
@@ -1715,11 +1603,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/eway/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-eway/contributors"
                 }
             ],
             "description": "eWay driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/eway",
+            "homepage": "https://github.com/thephpleague/omnipay-eway",
             "keywords": [
                 "eway",
                 "gateway",
@@ -1728,20 +1616,20 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-04-14 11:25:43"
+            "time": "2014-09-17 00:39:29"
         },
         {
             "name": "omnipay/firstdata",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/firstdata.git",
-                "reference": "19da8c84cc810ae2fe8399c70d908b157fd60459"
+                "url": "https://github.com/thephpleague/omnipay-firstdata.git",
+                "reference": "3c198a29ab36c0d2fa17495444e5ab6e1d79e212"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/firstdata/zipball/19da8c84cc810ae2fe8399c70d908b157fd60459",
-                "reference": "19da8c84cc810ae2fe8399c70d908b157fd60459",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-firstdata/zipball/3c198a29ab36c0d2fa17495444e5ab6e1d79e212",
+                "reference": "3c198a29ab36c0d2fa17495444e5ab6e1d79e212",
                 "shasum": ""
             },
             "require": {
@@ -1772,11 +1660,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/firstdata/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-firstdata/contributors"
                 }
             ],
             "description": "First Data driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/firstdata",
+            "homepage": "https://github.com/thephpleague/omnipay-firstdata",
             "keywords": [
                 "first data",
                 "firstdata",
@@ -1786,20 +1674,20 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-04-14 11:25:45"
+            "time": "2014-09-17 00:39:22"
         },
         {
             "name": "omnipay/gocardless",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/gocardless.git",
-                "reference": "b84f9386fe4ec2a712c7572716876d4b8798f0ef"
+                "url": "https://github.com/thephpleague/omnipay-gocardless.git",
+                "reference": "106c2cc2f992813319c86f45863347c238771548"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/gocardless/zipball/b84f9386fe4ec2a712c7572716876d4b8798f0ef",
-                "reference": "b84f9386fe4ec2a712c7572716876d4b8798f0ef",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-gocardless/zipball/106c2cc2f992813319c86f45863347c238771548",
+                "reference": "106c2cc2f992813319c86f45863347c238771548",
                 "shasum": ""
             },
             "require": {
@@ -1830,11 +1718,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/gocardless/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-gocardless/contributors"
                 }
             ],
             "description": "GoCardless driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/gocardless",
+            "homepage": "https://github.com/thephpleague/omnipay-gocardless",
             "keywords": [
                 "gateway",
                 "go cardless",
@@ -1844,20 +1732,20 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-04-14 11:27:59"
+            "time": "2014-09-17 00:39:16"
         },
         {
             "name": "omnipay/manual",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/manual.git",
-                "reference": "9b978a4c0a7e0a1328bccc9ceae9242622d3632c"
+                "url": "https://github.com/thephpleague/omnipay-manual.git",
+                "reference": "ddbe7e8cfdb03b102219185aeb7dd91823275c71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/manual/zipball/9b978a4c0a7e0a1328bccc9ceae9242622d3632c",
-                "reference": "9b978a4c0a7e0a1328bccc9ceae9242622d3632c",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-manual/zipball/ddbe7e8cfdb03b102219185aeb7dd91823275c71",
+                "reference": "ddbe7e8cfdb03b102219185aeb7dd91823275c71",
                 "shasum": ""
             },
             "require": {
@@ -1888,11 +1776,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/manual/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-manual/contributors"
                 }
             ],
             "description": "Manual driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/manual",
+            "homepage": "https://github.com/thephpleague/omnipay-manual",
             "keywords": [
                 "gateway",
                 "manual",
@@ -1901,20 +1789,20 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-06-15 19:00:07"
+            "time": "2014-09-17 00:37:01"
         },
         {
             "name": "omnipay/migs",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/migs.git",
-                "reference": "9f8869590f248be1623fc067651d132a2b4bf81f"
+                "url": "https://github.com/thephpleague/omnipay-migs.git",
+                "reference": "b49e9f2816a5cdd3c1ba2bcb46a0c73dc43c0b3b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/migs/zipball/9f8869590f248be1623fc067651d132a2b4bf81f",
-                "reference": "9f8869590f248be1623fc067651d132a2b4bf81f",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-migs/zipball/b49e9f2816a5cdd3c1ba2bcb46a0c73dc43c0b3b",
+                "reference": "b49e9f2816a5cdd3c1ba2bcb46a0c73dc43c0b3b",
                 "shasum": ""
             },
             "require": {
@@ -1945,11 +1833,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/migs/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-migs/contributors"
                 }
             ],
             "description": "MIGS driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/migs",
+            "homepage": "https://github.com/thephpleague/omnipay-migs",
             "keywords": [
                 "gateway",
                 "mastercard internet gateway service",
@@ -1959,7 +1847,7 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-04-14 12:22:20"
+            "time": "2014-09-17 00:38:25"
         },
         {
             "name": "omnipay/mollie",
@@ -2020,16 +1908,16 @@
         },
         {
             "name": "omnipay/multisafepay",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/multisafepay.git",
-                "reference": "1eadd507153a7393edcd92455ec032b30174e027"
+                "url": "https://github.com/thephpleague/omnipay-multisafepay.git",
+                "reference": "29f1b794af3abc7705365009255932fbcddca305"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/multisafepay/zipball/1eadd507153a7393edcd92455ec032b30174e027",
-                "reference": "1eadd507153a7393edcd92455ec032b30174e027",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-multisafepay/zipball/29f1b794af3abc7705365009255932fbcddca305",
+                "reference": "29f1b794af3abc7705365009255932fbcddca305",
                 "shasum": ""
             },
             "require": {
@@ -2060,11 +1948,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/multisafepay/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-multisafepay/contributors"
                 }
             ],
             "description": "MultiSafepay driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/multisafepay",
+            "homepage": "https://github.com/thephpleague/omnipay-multisafepay",
             "keywords": [
                 "gateway",
                 "merchant",
@@ -2074,20 +1962,20 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-04-14 16:15:59"
+            "time": "2014-09-17 00:38:11"
         },
         {
             "name": "omnipay/netaxept",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/netaxept.git",
-                "reference": "f731e9d98057f23e357edf2568ea14fffc4767ac"
+                "url": "https://github.com/thephpleague/omnipay-netaxept.git",
+                "reference": "1b99babf51d240b23db95464c5daa3e169a3c502"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/netaxept/zipball/f731e9d98057f23e357edf2568ea14fffc4767ac",
-                "reference": "f731e9d98057f23e357edf2568ea14fffc4767ac",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-netaxept/zipball/1b99babf51d240b23db95464c5daa3e169a3c502",
+                "reference": "1b99babf51d240b23db95464c5daa3e169a3c502",
                 "shasum": ""
             },
             "require": {
@@ -2118,11 +2006,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/netaxept/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-netaxept/contributors"
                 }
             ],
             "description": "Netaxept driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/netaxept",
+            "homepage": "https://github.com/thephpleague/omnipay-netaxept",
             "keywords": [
                 "gateway",
                 "merchant",
@@ -2131,20 +2019,20 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-04-14 11:26:06"
+            "time": "2014-09-17 00:39:10"
         },
         {
             "name": "omnipay/netbanx",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/netbanx.git",
-                "reference": "096c89afa088a22c3dc1aa1cb12a553f4d954cdd"
+                "url": "https://github.com/thephpleague/omnipay-netbanx.git",
+                "reference": "a56900120e676385cc42d67c82985fcaaa752140"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/netbanx/zipball/096c89afa088a22c3dc1aa1cb12a553f4d954cdd",
-                "reference": "096c89afa088a22c3dc1aa1cb12a553f4d954cdd",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-netbanx/zipball/a56900120e676385cc42d67c82985fcaaa752140",
+                "reference": "a56900120e676385cc42d67c82985fcaaa752140",
                 "shasum": ""
             },
             "require": {
@@ -2175,11 +2063,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/netbanx/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-netbanx/contributors"
                 }
             ],
             "description": "NetBanx driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/netbanx",
+            "homepage": "https://github.com/thephpleague/omnipay-netbanx",
             "keywords": [
                 "gateway",
                 "merchant",
@@ -2188,20 +2076,20 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-04-14 12:22:59"
+            "time": "2014-09-17 00:38:46"
         },
         {
             "name": "omnipay/omnipay",
-            "version": "v2.3.0",
+            "version": "v2.3.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/omnipay.git",
-                "reference": "7aadce55949d198fb6a273b99c6948e714e74251"
+                "url": "https://github.com/thephpleague/omnipay.git",
+                "reference": "ae75717ec00b93069768102af11b9dd909c78bd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/omnipay/zipball/7aadce55949d198fb6a273b99c6948e714e74251",
-                "reference": "7aadce55949d198fb6a273b99c6948e714e74251",
+                "url": "https://api.github.com/repos/thephpleague/omnipay/zipball/ae75717ec00b93069768102af11b9dd909c78bd3",
+                "reference": "ae75717ec00b93069768102af11b9dd909c78bd3",
                 "shasum": ""
             },
             "require": {
@@ -2252,11 +2140,11 @@
                 },
                 {
                     "name": "Omnipay Community",
-                    "homepage": "https://github.com/omnipay/omnipay/graphs/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay/graphs/contributors"
                 }
             ],
             "description": "Includes Omnipay payment processing library and all officially supported gateways",
-            "homepage": "https://github.com/omnipay/omnipay",
+            "homepage": "https://github.com/thephpleague/omnipay",
             "keywords": [
                 "2checkout",
                 "2co",
@@ -2300,20 +2188,20 @@
                 "twocheckout",
                 "worldpay"
             ],
-            "time": "2014-05-12 01:11:38"
+            "time": "2014-09-17 00:29:37"
         },
         {
             "name": "omnipay/payfast",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/payfast.git",
-                "reference": "edae26145dc3075d5857b8630606e5c2ddbe6890"
+                "url": "https://github.com/thephpleague/omnipay-payfast.git",
+                "reference": "b5b0a0ce86a6471871e2b149643fc8cb836c465f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/payfast/zipball/edae26145dc3075d5857b8630606e5c2ddbe6890",
-                "reference": "edae26145dc3075d5857b8630606e5c2ddbe6890",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-payfast/zipball/b5b0a0ce86a6471871e2b149643fc8cb836c465f",
+                "reference": "b5b0a0ce86a6471871e2b149643fc8cb836c465f",
                 "shasum": ""
             },
             "require": {
@@ -2344,11 +2232,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/payfast/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-payfast/contributors"
                 }
             ],
             "description": "PayFast driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/payfast",
+            "homepage": "https://github.com/thephpleague/omnipay-payfast",
             "keywords": [
                 "gateway",
                 "merchant",
@@ -2357,20 +2245,20 @@
                 "payfast",
                 "payment"
             ],
-            "time": "2014-04-14 11:26:10"
+            "time": "2014-09-17 00:39:04"
         },
         {
             "name": "omnipay/payflow",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/payflow.git",
-                "reference": "271ce635923eb66c1de5bb9a902c39fa98ac9d31"
+                "url": "https://github.com/thephpleague/omnipay-payflow.git",
+                "reference": "9d86e3478dd42cbe40ab9466a7505c4f99c70ee7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/payflow/zipball/271ce635923eb66c1de5bb9a902c39fa98ac9d31",
-                "reference": "271ce635923eb66c1de5bb9a902c39fa98ac9d31",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-payflow/zipball/9d86e3478dd42cbe40ab9466a7505c4f99c70ee7",
+                "reference": "9d86e3478dd42cbe40ab9466a7505c4f99c70ee7",
                 "shasum": ""
             },
             "require": {
@@ -2401,11 +2289,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/payflow/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-payflow/contributors"
                 }
             ],
             "description": "Payflow driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/payflow",
+            "homepage": "https://github.com/thephpleague/omnipay-payflow",
             "keywords": [
                 "gateway",
                 "merchant",
@@ -2414,20 +2302,20 @@
                 "payflow",
                 "payment"
             ],
-            "time": "2014-04-14 11:26:12"
+            "time": "2014-09-17 00:38:58"
         },
         {
             "name": "omnipay/paymentexpress",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/paymentexpress.git",
-                "reference": "37e9f893fc6b87fdd64a5e6d1282b52c583d5dec"
+                "url": "https://github.com/thephpleague/omnipay-paymentexpress.git",
+                "reference": "a6309569a4a4372fe1c9cb464ff2ef57101df46d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/paymentexpress/zipball/37e9f893fc6b87fdd64a5e6d1282b52c583d5dec",
-                "reference": "37e9f893fc6b87fdd64a5e6d1282b52c583d5dec",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-paymentexpress/zipball/a6309569a4a4372fe1c9cb464ff2ef57101df46d",
+                "reference": "a6309569a4a4372fe1c9cb464ff2ef57101df46d",
                 "shasum": ""
             },
             "require": {
@@ -2458,11 +2346,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/paymentexpress/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-paymentexpress/contributors"
                 }
             ],
             "description": "Payment Express (DPS) driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/paymentexpress",
+            "homepage": "https://github.com/thephpleague/omnipay-paymentexpress",
             "keywords": [
                 "direct payment solutions",
                 "dps",
@@ -2477,20 +2365,20 @@
                 "pxpay",
                 "pxpost"
             ],
-            "time": "2014-05-19 16:04:33"
+            "time": "2014-09-17 00:37:09"
         },
         {
             "name": "omnipay/paypal",
-            "version": "v2.3.0",
+            "version": "v2.3.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/paypal.git",
-                "reference": "1c7ac319ab80993d14bf9d3bf43872cf522bcd70"
+                "url": "https://github.com/thephpleague/omnipay-paypal.git",
+                "reference": "c323164929de91d877661a519d0991515ef5e762"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/paypal/zipball/1c7ac319ab80993d14bf9d3bf43872cf522bcd70",
-                "reference": "1c7ac319ab80993d14bf9d3bf43872cf522bcd70",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-paypal/zipball/c323164929de91d877661a519d0991515ef5e762",
+                "reference": "c323164929de91d877661a519d0991515ef5e762",
                 "shasum": ""
             },
             "require": {
@@ -2521,11 +2409,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/paypal/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-paypal/contributors"
                 }
             ],
             "description": "PayPal gateway for Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/paypal",
+            "homepage": "https://github.com/thephpleague/omnipay-paypal",
             "keywords": [
                 "gateway",
                 "merchant",
@@ -2535,7 +2423,7 @@
                 "paypal",
                 "purchase"
             ],
-            "time": "2014-04-08 08:12:59"
+            "time": "2014-09-17 00:39:56"
         },
         {
             "name": "omnipay/pin",
@@ -2596,16 +2484,16 @@
         },
         {
             "name": "omnipay/sagepay",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/sagepay.git",
-                "reference": "cf655b3ba1d9e7f66991768af06e3da898a28812"
+                "url": "https://github.com/thephpleague/omnipay-sagepay.git",
+                "reference": "2d24d15c7a78e2fe1ffb7af705948a60a6492dc6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/sagepay/zipball/cf655b3ba1d9e7f66991768af06e3da898a28812",
-                "reference": "cf655b3ba1d9e7f66991768af06e3da898a28812",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-sagepay/zipball/2d24d15c7a78e2fe1ffb7af705948a60a6492dc6",
+                "reference": "2d24d15c7a78e2fe1ffb7af705948a60a6492dc6",
                 "shasum": ""
             },
             "require": {
@@ -2636,11 +2524,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/sagepay/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-sagepay/contributors"
                 }
             ],
             "description": "Sage Pay driver for the Omnipay PHP payment processing library",
-            "homepage": "https://github.com/omnipay/sagepay",
+            "homepage": "https://github.com/thephpleague/omnipay-sagepay",
             "keywords": [
                 "gateway",
                 "merchant",
@@ -2651,7 +2539,7 @@
                 "sage pay",
                 "sagepay"
             ],
-            "time": "2014-04-10 02:24:11"
+            "time": "2014-09-17 00:40:02"
         },
         {
             "name": "omnipay/securepay",
@@ -2826,16 +2714,16 @@
         },
         {
             "name": "omnipay/worldpay",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omnipay/worldpay.git",
-                "reference": "d45390a79de5d0601b065657ec25cacdf7954fd4"
+                "url": "https://github.com/thephpleague/omnipay-worldpay.git",
+                "reference": "5353f02b7f800b93d8aeae606d6df09afa538457"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omnipay/worldpay/zipball/d45390a79de5d0601b065657ec25cacdf7954fd4",
-                "reference": "d45390a79de5d0601b065657ec25cacdf7954fd4",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-worldpay/zipball/5353f02b7f800b93d8aeae606d6df09afa538457",
+                "reference": "5353f02b7f800b93d8aeae606d6df09afa538457",
                 "shasum": ""
             },
             "require": {
@@ -2866,11 +2754,11 @@
                 },
                 {
                     "name": "Omnipay Contributors",
-                    "homepage": "https://github.com/omnipay/worldpay/contributors"
+                    "homepage": "https://github.com/thephpleague/omnipay-worldpay/contributors"
                 }
             ],
             "description": "WorldPay driver for the Omnipay payment processing library",
-            "homepage": "https://github.com/omnipay/worldpay",
+            "homepage": "https://github.com/thephpleague/omnipay-worldpay",
             "keywords": [
                 "gateway",
                 "merchant",
@@ -2879,20 +2767,20 @@
                 "payment",
                 "worldpay"
             ],
-            "time": "2014-05-14 05:02:40"
+            "time": "2014-09-17 00:37:18"
         },
         {
             "name": "patchwork/utf8",
-            "version": "v1.1.24",
+            "version": "v1.1.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nicolas-grekas/Patchwork-UTF8.git",
-                "reference": "40f552c019956f446553b19f7de2da2f9c74d730"
+                "reference": "2d43bd047b120279511d45e76e61c5a9812d9a83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/40f552c019956f446553b19f7de2da2f9c74d730",
-                "reference": "40f552c019956f446553b19f7de2da2f9c74d730",
+                "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/2d43bd047b120279511d45e76e61c5a9812d9a83",
+                "reference": "2d43bd047b120279511d45e76e61c5a9812d9a83",
                 "shasum": ""
             },
             "require": {
@@ -2905,6 +2793,11 @@
                 "ext-mbstring": "Use Mbstring for best performance"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
             "autoload": {
                 "psr-0": {
                     "Patchwork": "class/",
@@ -2930,7 +2823,7 @@
                 "utf-8",
                 "utf8"
             ],
-            "time": "2014-06-17 08:23:06"
+            "time": "2014-08-05 08:00:32"
         },
         {
             "name": "patricktalmadge/bootstrapper",
@@ -4014,12 +3907,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/webpatser/laravel-countries.git",
-                "reference": "82983e90bf14ed0c9ec3976bd616a01dd62c984b"
+                "reference": "ca8ac7d6b90b2d82f29b8759f1e9f0ee4ef2cc20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webpatser/laravel-countries/zipball/82983e90bf14ed0c9ec3976bd616a01dd62c984b",
-                "reference": "82983e90bf14ed0c9ec3976bd616a01dd62c984b",
+                "url": "https://api.github.com/repos/webpatser/laravel-countries/zipball/ca8ac7d6b90b2d82f29b8759f1e9f0ee4ef2cc20",
+                "reference": "ca8ac7d6b90b2d82f29b8759f1e9f0ee4ef2cc20",
                 "shasum": ""
             },
             "require": {
@@ -4058,7 +3951,7 @@
                 "iso_3166_3",
                 "laravel"
             ],
-            "time": "2014-07-24 13:26:08"
+            "time": "2014-09-26 09:55:24"
         },
         {
             "name": "zizaco/confide",
@@ -4128,17 +4021,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "f6b802a6bbfd0b852eba0dd477704df75608cec7"
+                "reference": "3ffb9c13fc7298def2a25ed7d851f54c83af44a6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/f6b802a6bbfd0b852eba0dd477704df75608cec7",
-                "reference": "f6b802a6bbfd0b852eba0dd477704df75608cec7",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/3ffb9c13fc7298def2a25ed7d851f54c83af44a6",
+                "reference": "3ffb9c13fc7298def2a25ed7d851f54c83af44a6",
                 "shasum": ""
             },
             "require": {
+                "ext-json": "*",
+                "ext-mbstring": "*",
                 "facebook/webdriver": "~0.4",
-                "guzzlehttp/guzzle": "4.*",
+                "guzzlehttp/guzzle": "~4.0",
                 "php": ">=5.4.0",
                 "phpunit/phpunit": "~4.0",
                 "symfony/browser-kit": "~2.4",
@@ -4150,15 +4045,19 @@
                 "symfony/yaml": "~2.4"
             },
             "require-dev": {
-                "facebook/php-sdk": "3.*",
-                "monolog/monolog": "*",
-                "videlalvaro/php-amqplib": "*"
+                "codeception/specify": "~0.3",
+                "facebook/php-sdk": "~3.2",
+                "monolog/monolog": "~1.8",
+                "pda/pheanstalk": "~2.0",
+                "phpseclib/phpseclib": "~0.3.6",
+                "videlalvaro/php-amqplib": "~2.4"
             },
             "suggest": {
                 "codeception/phpbuiltinserver": "Extension to start and stop PHP built-in web server for your tests",
                 "codeception/specify": "BDD-style code blocks",
                 "codeception/verify": "BDD-style assertions",
-                "monolog/monolog": "Log test steps"
+                "monolog/monolog": "Log test steps",
+                "phpseclib/phpseclib": "Extension required to use the SFTP option in the FTP Module."
             },
             "bin": [
                 "codecept"
@@ -4189,7 +4088,61 @@
                 "functional testing",
                 "unit testing"
             ],
-            "time": "2014-07-04 10:31:02"
+            "time": "2014-09-27 02:27:22"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "26404e0c90565b614ee76b988b9bc8790d77f590"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/26404e0c90565b614ee76b988b9bc8790d77f590",
+                "reference": "26404e0c90565b614ee76b988b9bc8790d77f590",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~5.3"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Instantiator\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2014-08-25 15:09:25"
         },
         {
             "name": "facebook/webdriver",
@@ -4237,17 +4190,17 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "8e90e67c65b0dc08ef608c8993d6cb08b94b4b1a"
+                "reference": "514ee50a5aaa46f8006bc5dc1c9a39d55202983d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8e90e67c65b0dc08ef608c8993d6cb08b94b4b1a",
-                "reference": "8e90e67c65b0dc08ef608c8993d6cb08b94b4b1a",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/514ee50a5aaa46f8006bc5dc1c9a39d55202983d",
+                "reference": "514ee50a5aaa46f8006bc5dc1c9a39d55202983d",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/streams": "~1.4",
+                "guzzlehttp/streams": "~2.1",
                 "php": ">=5.4.0"
             },
             "require-dev": {
@@ -4261,7 +4214,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.1.x-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -4294,7 +4247,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2014-07-23 19:40:03"
+            "time": "2014-09-25 04:48:09"
         },
         {
             "name": "guzzlehttp/streams",
@@ -4302,12 +4255,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/streams.git",
-                "reference": "3b761a328e5ed6ed519e960aded95d7acbe77894"
+                "reference": "30d5c8e7646e004768054c4143a433c89bc9ece0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/streams/zipball/3b761a328e5ed6ed519e960aded95d7acbe77894",
-                "reference": "3b761a328e5ed6ed519e960aded95d7acbe77894",
+                "url": "https://api.github.com/repos/guzzle/streams/zipball/30d5c8e7646e004768054c4143a433c89bc9ece0",
+                "reference": "30d5c8e7646e004768054c4143a433c89bc9ece0",
                 "shasum": ""
             },
             "require": {
@@ -4319,7 +4272,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -4347,120 +4300,7 @@
                 "Guzzle",
                 "stream"
             ],
-            "time": "2014-07-19 18:43:42"
-        },
-        {
-            "name": "ocramius/instantiator",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Ocramius/Instantiator.git",
-                "reference": "cc754c2289ffd4483c319f6ed6ee88ce21676f64"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Ocramius/Instantiator/zipball/cc754c2289ffd4483c319f6ed6ee88ce21676f64",
-                "reference": "cc754c2289ffd4483c319f6ed6ee88ce21676f64",
-                "shasum": ""
-            },
-            "require": {
-                "ocramius/lazy-map": "1.0.*",
-                "php": "~5.3"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Instantiator\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://marco-pivetta.com/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/Ocramius/Instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2014-06-15 11:44:46"
-        },
-        {
-            "name": "ocramius/lazy-map",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Ocramius/LazyMap.git",
-                "reference": "5c77102e225d225ae2d74d5f2cc488527834b821"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Ocramius/LazyMap/zipball/5c77102e225d225ae2d74d5f2cc488527834b821",
-                "reference": "5c77102e225d225ae2d74d5f2cc488527834b821",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.7",
-                "phpmd/phpmd": "1.5.*",
-                "phpunit/phpunit": ">=3.7",
-                "satooshi/php-coveralls": "~0.6",
-                "squizlabs/php_codesniffer": "1.4.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "LazyMap\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A library that provides lazy instantiation logic for a map of objects",
-            "homepage": "https://github.com/Ocramius/LazyMap",
-            "keywords": [
-                "lazy",
-                "lazy instantiation",
-                "lazy loading",
-                "map",
-                "service location"
-            ],
-            "time": "2014-05-01 22:15:23"
+            "time": "2014-09-15 01:45:40"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -4468,12 +4308,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "9171bca1b0c859fe6d8b5951bf0805a741794afd"
+                "reference": "0f0063f283597359ea5cb4e1afdf1a14b0ac5038"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9171bca1b0c859fe6d8b5951bf0805a741794afd",
-                "reference": "9171bca1b0c859fe6d8b5951bf0805a741794afd",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0f0063f283597359ea5cb4e1afdf1a14b0ac5038",
+                "reference": "0f0063f283597359ea5cb4e1afdf1a14b0ac5038",
                 "shasum": ""
             },
             "require": {
@@ -4505,9 +4345,6 @@
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
@@ -4525,7 +4362,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-07-09 09:03:35"
+            "time": "2014-09-01 22:04:32"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -4662,16 +4499,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "dev-master",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "a0802561692c3b2bb0ed972f7ffafbfab068e580"
+                "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a0802561692c3b2bb0ed972f7ffafbfab068e580",
-                "reference": "a0802561692c3b2bb0ed972f7ffafbfab068e580",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32",
+                "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32",
                 "shasum": ""
             },
             "require": {
@@ -4708,7 +4545,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2014-06-26 07:15:38"
+            "time": "2014-03-03 05:10:30"
         },
         {
             "name": "phpunit/phpunit",
@@ -4716,12 +4553,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "e243de0b5264da8454105455bda0881f5b2ac972"
+                "reference": "5ee7af96d62a3fe9cf466fab1b505ac8dc1796c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e243de0b5264da8454105455bda0881f5b2ac972",
-                "reference": "e243de0b5264da8454105455bda0881f5b2ac972",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5ee7af96d62a3fe9cf466fab1b505ac8dc1796c6",
+                "reference": "5ee7af96d62a3fe9cf466fab1b505ac8dc1796c6",
                 "shasum": ""
             },
             "require": {
@@ -4740,6 +4577,7 @@
                 "sebastian/diff": "~1.1",
                 "sebastian/environment": "~1.0",
                 "sebastian/exporter": "~1.0",
+                "sebastian/global-state": "1.0.*@dev",
                 "sebastian/version": "~1.0",
                 "symfony/yaml": "~2.0"
             },
@@ -4752,7 +4590,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3.x-dev"
+                    "dev-master": "4.4.x-dev"
                 }
             },
             "autoload": {
@@ -4761,10 +4599,6 @@
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "",
-                "../../symfony/yaml/"
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
@@ -4776,13 +4610,13 @@
                 }
             ],
             "description": "The PHP Unit Testing framework.",
-            "homepage": "http://www.phpunit.de/",
+            "homepage": "https://phpunit.de/",
             "keywords": [
                 "phpunit",
                 "testing",
                 "xunit"
             ],
-            "time": "2014-07-22 22:57:02"
+            "time": "2014-09-19 08:44:28"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -4790,16 +4624,16 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "f9f31b9e7f93483fd4dbd500ee41e2e5fc0923b7"
+                "reference": "3d40ae857a3941ede714be45079e85f9e956b4b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/f9f31b9e7f93483fd4dbd500ee41e2e5fc0923b7",
-                "reference": "f9f31b9e7f93483fd4dbd500ee41e2e5fc0923b7",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3d40ae857a3941ede714be45079e85f9e956b4b3",
+                "reference": "3d40ae857a3941ede714be45079e85f9e956b4b3",
                 "shasum": ""
             },
             "require": {
-                "ocramius/instantiator": "~1.0",
+                "doctrine/instantiator": "~1.0,>=1.0.1",
                 "php": ">=5.3.3",
                 "phpunit/php-text-template": "~1.2"
             },
@@ -4821,9 +4655,6 @@
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
@@ -4840,7 +4671,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2014-07-05 15:46:50"
+            "time": "2014-09-10 14:10:18"
         },
         {
             "name": "sebastian/comparator",
@@ -4913,21 +4744,24 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "ac84cfdec593945f36f24074d6ea17d296e86f76"
+                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ac84cfdec593945f36f24074d6ea17d296e86f76",
-                "reference": "ac84cfdec593945f36f24074d6ea17d296e86f76",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7",
+                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -4940,14 +4774,13 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                },
                 {
                     "name": "Kore Nordmann",
                     "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Diff implementation",
@@ -4955,7 +4788,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2014-05-12 05:21:40"
+            "time": "2014-08-15 10:29:00"
         },
         {
             "name": "sebastian/environment",
@@ -5014,12 +4847,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "eb54a69388e5b7ea48561a65588f067fdda0c886"
+                "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/eb54a69388e5b7ea48561a65588f067fdda0c886",
-                "reference": "eb54a69388e5b7ea48561a65588f067fdda0c886",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c7d59948d6e82818e1bdff7cadb6c34710eb7dc0",
+                "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0",
                 "shasum": ""
             },
             "require": {
@@ -5044,11 +4877,6 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                },
                 {
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
@@ -5057,14 +4885,17 @@
                     "name": "Volker Dusch",
                     "email": "github@wallbash.com"
                 },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net",
-                    "role": "Lead"
-                },
                 {
                     "name": "Bernhard Schussek",
                     "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
@@ -5073,7 +4904,58 @@
                 "export",
                 "exporter"
             ],
-            "time": "2014-05-05 08:31:02"
+            "time": "2014-09-10 00:51:36"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "cd2f406aa90b591e1c45023c3a8d77edcb417bac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/cd2f406aa90b591e1c45023c3a8d77edcb417bac",
+                "reference": "cd2f406aa90b591e1c45023c3a8d77edcb417bac",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2014-09-04 07:21:11"
         },
         {
             "name": "sebastian/version",
@@ -5117,12 +4999,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "07ff901ce8b081cf227091b4919d347fa999b2a0"
+                "reference": "6644c5c6b395e63a55186dea1817eed0ceb1c075"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/07ff901ce8b081cf227091b4919d347fa999b2a0",
-                "reference": "07ff901ce8b081cf227091b4919d347fa999b2a0",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/6644c5c6b395e63a55186dea1817eed0ceb1c075",
+                "reference": "6644c5c6b395e63a55186dea1817eed0ceb1c075",
                 "shasum": ""
             },
             "require": {
@@ -5144,20 +5026,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Yaml Component",
             "homepage": "http://symfony.com",
-            "time": "2014-07-09 09:06:26"
+            "time": "2014-09-22 11:59:59"
         }
     ],
     "aliases": [
@@ -5171,6 +5051,7 @@
         "webpatser/laravel-countries": 20,
         "codeception/codeception": 20
     },
+    "prefer-stable": false,
     "platform": [
 
     ],

From 58c6e250284e9d9b838db06bc0d84497021719b8 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 28 Sep 2014 12:23:05 +0300
Subject: [PATCH 29/33] Resolved issue downloading Omnipay code

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 13d095c0e0a8..7d4d4ef7d1f0 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
 		"anahkiasen/former": "dev-master",
 		"barryvdh/laravel-debugbar": "dev-master",
 		"chumper/datatable": "2.x",
-		"omnipay/omnipay": "2.x",
+		"thephpleague/omnipay": "2.x",
 		"intervention/image": "1.x",
 		"webpatser/laravel-countries": "dev-master"		
 	},

From c8a1932e4f2288d76cd2a4bc9b2e20241e4ace37 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 28 Sep 2014 12:35:43 +0300
Subject: [PATCH 30/33] Resolved issue downloading Omnipay code

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 7d4d4ef7d1f0..9e756d5ba09f 100644
--- a/composer.json
+++ b/composer.json
@@ -16,9 +16,9 @@
 		"anahkiasen/former": "dev-master",
 		"barryvdh/laravel-debugbar": "dev-master",
 		"chumper/datatable": "2.x",
-		"thephpleague/omnipay": "2.x",
+		"omnipay/omnipay": "~2.0",
 		"intervention/image": "1.x",
-		"webpatser/laravel-countries": "dev-master"		
+		"webpatser/laravel-countries": "dev-master"
 	},
 	"require-dev": {
 		"codeception/codeception": "dev-master"

From 3efc85395792fef308bcb5f91b0068c5e0885ee3 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 28 Sep 2014 13:30:54 +0300
Subject: [PATCH 31/33] Removed env file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 294af63cfb98..76f31224a734 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@
 /ninja.sublime-project
 /ninja.sublime-workspace
 /tests/_log
+.env.development.php
 .idea
 .project
 /nbproject/private/
\ No newline at end of file

From 1a0090c810dfdb1012bf7a793040abbf6b51680f Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 28 Sep 2014 13:32:14 +0300
Subject: [PATCH 32/33] Removed env file

---
 .env.development.php | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 .env.development.php

diff --git a/.env.development.php b/.env.development.php
deleted file mode 100644
index fde3ed2083c6..000000000000
--- a/.env.development.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-return array(
-
-  //'TAG_MANAGER_KEY' => '',
-  //'ANALYTICS_KEY' => '',
-  //'NINJA_DEV' => false,
-  
-);

From c535afa5ed63767440f052fc3aafe558913675e5 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 28 Sep 2014 13:37:54 +0300
Subject: [PATCH 33/33] Added webbased update support

---
 app/controllers/AccountController.php         | 43 +++++++++++++++++++
 ...11_05_180133_confide_setup_users_table.php |  6 +--
 app/models/Gateway.php                        |  2 +-
 app/routes.php                                |  4 +-
 app/views/accounts/product.blade.php          |  4 +-
 5 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index c342d6986dd4..ed307aaf76b7 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -19,6 +19,49 @@ class AccountController extends \BaseController {
 		$this->contactMailer = $contactMailer;
 	}	
 
+	public function install()
+	{
+		if (!Utils::isNinja() && !Schema::hasTable('accounts')) {
+			try {
+				Artisan::call('migrate');
+				Artisan::call('db:seed');		
+			} catch (Exception $e) {
+	      Response::make($e->getMessage(), 500);
+	    }
+		}
+
+		return Redirect::to('/');
+	}
+
+	public function update()
+	{
+		if (!Utils::isNinja()) {
+			try {
+				Artisan::call('migrate');			
+			} catch (Exception $e) {
+	      Response::make($e->getMessage(), 500);
+	    }
+	  }
+
+    return Redirect::to('/');
+	}
+
+	public function reset()
+	{
+		if (Utils::isNinjaDev()) {			
+			Confide::logout();
+			try {
+				Artisan::call('migrate:reset');
+				Artisan::call('migrate');				
+				Artisan::call('db:seed');		
+			} catch (Exception $e) {
+	      Response::make($e->getMessage(), 500);
+	    }
+		}
+
+		return Redirect::to('/');
+	}
+
 	public function getStarted()
 	{	
 		if (Auth::check())
diff --git a/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php b/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
index 65326c575b82..7412ebe74560 100755
--- a/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
+++ b/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
@@ -331,11 +331,11 @@ class ConfideSetupUsersTable extends Migration {
             $t->decimal('amount', 13, 2);
             $t->decimal('balance', 13, 2);
         
-            $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade'); 
+            $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
             $t->foreign('account_id')->references('id')->on('accounts'); 
-            $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');; 
+            $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); 
             $t->foreign('invoice_status_id')->references('id')->on('invoice_statuses');
-            $t->foreign('recurring_invoice_id')->references('id')->on('invoices');
+            $t->foreign('recurring_invoice_id')->references('id')->on('invoices')->onDelete('cascade');
 
             $t->unsignedInteger('public_id')->index();
             $t->unique( array('account_id','public_id') );
diff --git a/app/models/Gateway.php b/app/models/Gateway.php
index bb6afda0a3ef..7d84a7db32ec 100755
--- a/app/models/Gateway.php
+++ b/app/models/Gateway.php
@@ -21,7 +21,7 @@ class Gateway extends Eloquent
 		
 		if ($paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY)
 		{
-			$fields = Omnipay::create($this->provider)->getDefaultParameters();	
+			$fields = Omnipay::create($this->provider)->getDefaultParameters();				
 		}
 		else 
 		{
diff --git a/app/routes.php b/app/routes.php
index d4569f43c8d2..bcd098c9058a 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -22,6 +22,9 @@
 //dd(gethostname());
 //Log::error('test');
 
+Route::get('install', 'AccountController@install');
+Route::get('update', 'AccountController@update');
+Route::get('reset', 'AccountController@reset');
 
 Route::get('/', 'HomeController@showIndex');
 Route::get('/rocksteady', 'HomeController@showIndex');
@@ -52,7 +55,6 @@ Route::post('signup/validate', 'AccountController@checkEmail');
 Route::post('signup/submit', 'AccountController@submitSignup');
 
 
-
 // Confide routes
 Route::get('login', 'UserController@login');
 Route::post('login', 'UserController@do_login');
diff --git a/app/views/accounts/product.blade.php b/app/views/accounts/product.blade.php
index 6893beac28af..daa4dc01c7b6 100644
--- a/app/views/accounts/product.blade.php
+++ b/app/views/accounts/product.blade.php
@@ -3,7 +3,9 @@
 @section('content') 
   @parent
 
-  {{ Former::open($url)->method($method)->addClass('col-md-8 col-md-offset-2 warn-on-exit') }}
+  {{ Former::open($url)->method($method)
+      ->rules(['product_key' => 'required|max:20'])
+      ->addClass('col-md-8 col-md-offset-2 warn-on-exit') }}
 
 
   {{ Former::legend($title) }}