diff --git a/.env.example b/.env.example
index 651ccbbc5207..bd40885edb04 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,7 @@
 APP_ENV=development
 APP_DEBUG=true
 APP_URL=http://ninja.dev
+APP_CIPHER=rijndael-128
 APP_KEY=
 
 DB_TYPE=mysql
diff --git a/app/Console/Commands/SendRecurringInvoices.php b/app/Console/Commands/SendRecurringInvoices.php
index ece16d94baa5..a5fe2cdaf9b9 100644
--- a/app/Console/Commands/SendRecurringInvoices.php
+++ b/app/Console/Commands/SendRecurringInvoices.php
@@ -1,9 +1,15 @@
 <?php namespace App\Console\Commands;
 
+use DateTime;
+use Carbon;
+use Utils;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 use App\Ninja\Mailers\ContactMailer as Mailer;
+use App\Models\Invoice;
+use App\Models\InvoiceItem;
+use App\Models\Invitation;
 
 class SendRecurringInvoices extends Command
 {
diff --git a/app/Events/QuoteApproved.php b/app/Events/QuoteApproved.php
new file mode 100644
index 000000000000..12b5384b35e3
--- /dev/null
+++ b/app/Events/QuoteApproved.php
@@ -0,0 +1,23 @@
+<?php namespace App\Events;
+
+use App\Events\Event;
+
+use Illuminate\Queue\SerializesModels;
+
+class QuoteApproved extends Event {
+
+	use SerializesModels;
+
+    public $invoice;
+
+	/**
+	 * Create a new event instance.
+	 *
+	 * @return void
+	 */
+	public function __construct($invoice)
+	{
+		$this->invoice = $invoice;
+	}
+
+}
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index c7a75d356dd5..1475cbb5cb09 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -1,5 +1,6 @@
 <?php namespace App\Exceptions;
 
+use Utils;
 use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
@@ -24,7 +25,9 @@ class Handler extends ExceptionHandler {
 	 */
 	public function report(Exception $e)
 	{
-		return parent::report($e);
+        Utils::logError(Utils::getErrorString($e));
+        return false;
+		//return parent::report($e);
 	}
 
 	/**
@@ -36,7 +39,6 @@ class Handler extends ExceptionHandler {
 	 */
 	public function render($request, Exception $e)
 	{
-		return parent::render($request, $e);
+        return parent::render($request, $e);
 	}
-
 }
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 879cdbf464aa..193445f00c03 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -12,6 +12,7 @@ use Validator;
 use View;
 use stdClass;
 use Cache;
+use Response;
 
 use App\Models\User;
 use App\Models\Activity;
@@ -153,7 +154,7 @@ class AccountController extends BaseController
             if ($count == 0) {
                 return Redirect::to('gateways/create');
             } else {
-                return View::make('accounts.payments', ['showAdd' => $count < 2]);
+                return View::make('accounts.payments', ['showAdd' => $count < 3]);
             }
         } elseif ($section == ACCOUNT_NOTIFICATIONS) {
             $data = [
@@ -554,6 +555,7 @@ class AccountController extends BaseController
         $user->notify_sent = Input::get('notify_sent');
         $user->notify_viewed = Input::get('notify_viewed');
         $user->notify_paid = Input::get('notify_paid');
+        $user->notify_approved = Input::get('notify_approved');
         $user->save();
 
         Session::flash('message', trans('texts.updated_settings'));
@@ -675,7 +677,7 @@ class AccountController extends BaseController
         $user->last_name = trim(Input::get('new_last_name'));
         $user->email = trim(strtolower(Input::get('new_email')));
         $user->username = $user->email;
-        $user->password = trim(Input::get('new_password'));
+        $user->password = bcrypt(trim(Input::get('new_password')));
         $user->registered = true;
         $user->save();
 
@@ -738,4 +740,12 @@ class AccountController extends BaseController
 
         return Redirect::to('/')->with('clearGuestKey', true);
     }
+
+    public function resendConfirmation()
+    {
+        $user = Auth::user();
+        $this->userMailer->sendConfirmation($user);
+
+        return Redirect::to('/company/details')->with('message', trans('texts.confirmation_resent'));
+    }
 }
diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php
index 489b2fb2d65c..29002f8727b1 100644
--- a/app/Http/Controllers/AccountGatewayController.php
+++ b/app/Http/Controllers/AccountGatewayController.php
@@ -25,10 +25,11 @@ class AccountGatewayController extends BaseController
                     ->join('gateways', 'gateways.id', '=', 'account_gateways.gateway_id')
                     ->where('account_gateways.deleted_at', '=', null)
                     ->where('account_gateways.account_id', '=', Auth::user()->account_id)
-                    ->select('account_gateways.public_id', 'gateways.name', 'account_gateways.deleted_at');
+                    ->select('account_gateways.public_id', 'gateways.name', 'account_gateways.deleted_at', 'account_gateways.gateway_id');
 
         return Datatable::query($query)
             ->addColumn('name', function ($model) { return link_to('gateways/'.$model->public_id.'/edit', $model->name); })
+            ->addColumn('payment_type', function ($model) { return Gateway::getPrettyPaymentType($model->gateway_id); })
             ->addColumn('dropdown', function ($model) {
               $actions = '<div class="btn-group tr-action" style="visibility:hidden;">
                   <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown">
@@ -68,6 +69,9 @@ class AccountGatewayController extends BaseController
         $data['method'] = 'PUT';
         $data['title'] = trans('texts.edit_gateway') . ' - ' . $accountGateway->gateway->name;
         $data['config'] = $configFields;
+        $data['paymentTypeId'] = $accountGateway->getPaymentType();
+        $data['selectGateways'] = Gateway::where('id', '=', $accountGateway->gateway_id)->get();
+
 
         return View::make('accounts.account_gateway', $data);
     }
@@ -92,6 +96,7 @@ class AccountGatewayController extends BaseController
         $data['url'] = 'gateways';
         $data['method'] = 'POST';
         $data['title'] = trans('texts.add_gateway');
+        $data['selectGateways'] = Gateway::where('payment_library_id', '=', 1)->where('id', '!=', GATEWAY_PAYPAL_EXPRESS)->where('id', '!=', GATEWAY_PAYPAL_EXPRESS)->orderBy('name')->get();
 
         return View::make('accounts.account_gateway', $data);
     }
@@ -101,6 +106,17 @@ class AccountGatewayController extends BaseController
         $selectedCards = $accountGateway ? $accountGateway->accepted_credit_cards : 0;
         $account = Auth::user()->account;
 
+        $paymentTypes = [];
+        foreach ([PAYMENT_TYPE_CREDIT_CARD, PAYMENT_TYPE_PAYPAL, PAYMENT_TYPE_BITCOIN] as $type) {
+            if ($accountGateway || !$account->getGatewayByType($type)) {
+                $paymentTypes[$type] = trans('texts.'.strtolower($type));
+
+                if ($type == PAYMENT_TYPE_BITCOIN) {
+                    $paymentTypes[$type] .= ' - BitPay';
+                }
+            }
+        }
+
         $creditCardsArray = unserialize(CREDIT_CARDS);
         $creditCards = [];
         foreach ($creditCardsArray as $card => $name) {
@@ -113,25 +129,10 @@ class AccountGatewayController extends BaseController
 
         $account->load('account_gateways');
         $currentGateways = $account->account_gateways;
-        $gateways = Gateway::where('payment_library_id', '=', 1)->orderBy('name');
-        $onlyPayPal = false;
-        if (!$accountGateway) {
-            if (count($currentGateways) > 0) {
-                $currentGateway = $currentGateways[0];
-                if ($currentGateway->isPayPal()) {
-                    $gateways->where('id', '!=', GATEWAY_PAYPAL_EXPRESS);
-                } else {
-                    $gateways->where('id', '=', GATEWAY_PAYPAL_EXPRESS);
-                    $onlyPayPal = true;
-                }
-            }
-        }
-        $gateways = $gateways->get();
+        $gateways = Gateway::where('payment_library_id', '=', 1)->orderBy('name')->get();
 
         foreach ($gateways as $gateway) {
-            $paymentLibrary = $gateway->paymentlibrary;
             $gateway->fields = $gateway->getFields();
-
             if ($accountGateway && $accountGateway->gateway_id == $gateway->id) {
                 $accountGateway->fields = $gateway->fields;
             }
@@ -143,6 +144,7 @@ class AccountGatewayController extends BaseController
         }
 
         return [
+            'paymentTypes' => $paymentTypes,
             'account' => $account,
             'accountGateway' => $accountGateway,
             'config' => false,
@@ -150,7 +152,6 @@ class AccountGatewayController extends BaseController
             'creditCardTypes' => $creditCards,
             'tokenBillingOptions' => $tokenBillingOptions,
             'showBreadcrumbs' => false,
-            'onlyPayPal' => $onlyPayPal,
             'countGateways' => count($currentGateways)
         ];
     }
@@ -174,8 +175,15 @@ class AccountGatewayController extends BaseController
     public function save($accountGatewayPublicId = false)
     {
         $rules = array();
+        $paymentType = Input::get('payment_type_id');
         $gatewayId = Input::get('gateway_id');
 
+        if ($paymentType == PAYMENT_TYPE_PAYPAL) {
+            $gatewayId = GATEWAY_PAYPAL_EXPRESS;
+        } elseif ($paymentType == PAYMENT_TYPE_BITCOIN) {
+            $gatewayId = GATEWAY_BITPAY;
+        }
+
         if (!$gatewayId) {
             Session::flash('error', trans('validation.required', ['attribute' => 'gateway']));
             return Redirect::to('gateways/create')
@@ -183,7 +191,6 @@ class AccountGatewayController extends BaseController
         }
 
         $gateway = Gateway::findOrFail($gatewayId);
-        $paymentLibrary = $gateway->paymentlibrary;
         $fields = $gateway->getFields();
 
         foreach ($fields as $field => $details) {
@@ -207,25 +214,28 @@ class AccountGatewayController extends BaseController
                 ->withInput();
         } else {
             $account = Account::with('account_gateways')->findOrFail(Auth::user()->account_id);
+            $oldConfig = null;
 
             if ($accountGatewayPublicId) {
                 $accountGateway = AccountGateway::scope($accountGatewayPublicId)->firstOrFail();
+                $oldConfig = json_decode($accountGateway->config);
             } else {
                 $accountGateway = AccountGateway::createNew();
                 $accountGateway->gateway_id = $gatewayId;
             }
 
-            $isMasked = false;
-
             $config = new stdClass();
             foreach ($fields as $field => $details) {
                 $value = trim(Input::get($gateway->id.'_'.$field));
-
+                // if the new value is masked use the original value
                 if ($value && $value === str_repeat('*', strlen($value))) {
-                    $isMasked = true;
+                    $value = $oldConfig->$field;
+                }
+                if (!$value && ($field == 'testMode' || $field == 'developerMode')) {
+                    // do nothing
+                } else {
+                    $config->$field = $value;
                 }
-
-                $config->$field = $value;
             }
 
             $cardCount = 0;
@@ -235,19 +245,12 @@ class AccountGatewayController extends BaseController
                 }
             }
 
-            // if the values haven't changed don't update the config
-            if ($isMasked && $accountGatewayPublicId) {
-                $accountGateway->accepted_credit_cards = $cardCount;
+            $accountGateway->accepted_credit_cards = $cardCount;
+            $accountGateway->config = json_encode($config);
+
+            if ($accountGatewayPublicId) {
                 $accountGateway->save();
-            // if there's an existing config for this gateway update it
-            } elseif (!$isMasked && $accountGatewayPublicId && $accountGateway->gateway_id == $gatewayId) {
-                $accountGateway->accepted_credit_cards = $cardCount;
-                $accountGateway->config = json_encode($config);
-                $accountGateway->save();
-            // otherwise, create a new gateway config
             } else {
-                $accountGateway->config = json_encode($config);
-                $accountGateway->accepted_credit_cards = $cardCount;
                 $account->account_gateways()->save($accountGateway);
             }
 
diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php
index 2ac38180d07e..ddef45e053a3 100644
--- a/app/Http/Controllers/AppController.php
+++ b/app/Http/Controllers/AppController.php
@@ -95,6 +95,7 @@ class AppController extends BaseController
         // Artisan::call('migrate:rollback', array('--force' => true)); // Debug Purposes
         Artisan::call('migrate', array('--force' => true));
         Artisan::call('db:seed', array('--force' => true));
+        Artisan::call('optimize', array('--force' => true));
         
         $firstName = trim(Input::get('first_name'));
         $lastName = trim(Input::get('last_name'));
@@ -104,6 +105,7 @@ class AppController extends BaseController
         $user = $account->users()->first();
 
         //Auth::login($user, true);
+        $this->accountRepo->registerUser($user);
 
         return Redirect::to('/login');
     }
@@ -158,6 +160,7 @@ class AppController extends BaseController
             try {
                 Artisan::call('migrate', array('--force' => true));
                 Artisan::call('db:seed', array('--force' => true));
+                Artisan::call('optimize', array('--force' => true));
             } catch (Exception $e) {
                 Response::make($e->getMessage(), 500);
             }
@@ -171,6 +174,7 @@ class AppController extends BaseController
         if (!Utils::isNinja()) {
             try {
                 Artisan::call('migrate', array('--force' => true));
+                Artisan::call('optimize', array('--force' => true));
                 Cache::flush();
             } catch (Exception $e) {
                 Response::make($e->getMessage(), 500);
diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index d2b1205023c5..fa3bf91b2ddf 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -204,7 +204,8 @@ class ClientController extends BaseController
     private function save($publicId = null)
     {
         $rules = array(
-            'email' => 'required',
+            'email' => 'email|required_without:first_name',
+            'first_name' => 'required_without:email',
         );
         $validator = Validator::make(Input::all(), $rules);
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 8a777144760e..605199573759 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,12 +1,13 @@
 <?php namespace App\Http\Controllers;
 
-use App\Libraries\Utils;
-use App\Ninja\Mailers\Mailer;
 use Redirect;
-use App\Models\Account;
 use Auth;
 use View;
 use Input;
+use Session;
+use App\Models\Account;
+use App\Libraries\Utils;
+use App\Ninja\Mailers\Mailer;
 
 class HomeController extends BaseController
 {
diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php
index 34fbdf9cbd33..aa2bb712752e 100644
--- a/app/Http/Controllers/InvoiceApiController.php
+++ b/app/Http/Controllers/InvoiceApiController.php
@@ -23,9 +23,18 @@ class InvoiceApiController extends Controller
 
     public function index()
     {
-        $invoices = Invoice::scope()->where('invoices.is_quote', '=', false)->orderBy('created_at', 'desc')->get();
-        $invoices = Utils::remapPublicIds($invoices->toArray());
+        $invoices = Invoice::scope()->with('invitations')->where('invoices.is_quote', '=', false)->orderBy('created_at', 'desc')->get();
 
+        // Add the first invitation link to the data
+        foreach ($invoices as $key => $invoice) {
+            foreach ($invoice->invitations as $subKey => $invitation) {
+                $invoices[$key]['link'] = $invitation->getLink();
+            }
+            unset($invoice['invitations']);
+        }
+
+        $invoices = Utils::remapPublicIds($invoices->toArray());
+                
         $response = json_encode($invoices, JSON_PRETTY_PRINT);
         $headers = Utils::getApiHeaders(count($invoices));
 
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 6dd32aa3aff0..f94fc288f9a8 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -176,6 +176,7 @@ class InvoiceController extends BaseController
 
         $invoice->load('user', 'invoice_items', 'invoice_design', 'account.country', 'client.contacts', 'client.country');
         $client = $invoice->client;
+        $account = $client->account;
 
         if (!$client || $client->is_deleted) {
             return View::make('invoices.deleted');
@@ -188,13 +189,13 @@ class InvoiceController extends BaseController
 
         Session::set($invitationKey, true);
         Session::set('invitation_key', $invitationKey);
-        Session::set('white_label', $client->account->isWhiteLabel());
+        Session::set('white_label', $account->isWhiteLabel());
 
-        $client->account->loadLocalizationSettings();
+        $account->loadLocalizationSettings();
 
         $invoice->invoice_date = Utils::fromSqlDate($invoice->invoice_date);
         $invoice->due_date = Utils::fromSqlDate($invoice->due_date);
-        $invoice->is_pro = $client->account->isPro();
+        $invoice->is_pro = $account->isPro();
         
         $contact = $invitation->contact;
         $contact->setVisible([
@@ -203,16 +204,30 @@ class InvoiceController extends BaseController
             'email',
             'phone', ]);
 
+        // Determine payment options
+        $paymentTypes = [];
+        if ($client->getGatewayToken()) {
+            $paymentTypes[] = [
+                'url' => URL::to("payment/{$invitation->invitation_key}/".PAYMENT_TYPE_TOKEN), 'label' => trans('texts.use_card_on_file')
+            ];
+        }
+        foreach([PAYMENT_TYPE_CREDIT_CARD, PAYMENT_TYPE_PAYPAL, PAYMENT_TYPE_BITCOIN] as $type) {
+            if ($account->getGatewayByType($type)) {
+                $paymentTypes[] = [
+                    'url' => URL::to("/payment/{$invitation->invitation_key}/{$type}"), 'label' => trans('texts.'.strtolower($type))
+                ];
+            }
+        }
+        
         $data = array(
             'isConverted' => $invoice->quote_invoice_id ? true : false,
             'showBreadcrumbs' => false,
-            'hideLogo' => $client->account->isWhiteLabel(),
+            'hideLogo' => $account->isWhiteLabel(),
             'invoice' => $invoice->hidePrivateFields(),
             'invitation' => $invitation,
-            'invoiceLabels' => $client->account->getInvoiceLabels(),
+            'invoiceLabels' => $account->getInvoiceLabels(),
             'contact' => $contact,
-            'hasToken' => $client->getGatewayToken(),
-            'countGateways' => AccountGateway::scope(false, $client->account->id)->count(),
+            'paymentTypes' => $paymentTypes
         );
 
         return View::make('invoices.view', $data);
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 3d2ac1aeab36..6bc4b700896c 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -3,6 +3,7 @@
 use Datatable;
 use Input;
 use Redirect;
+use Request;
 use Session;
 use Utils;
 use View;
@@ -11,13 +12,15 @@ use Omnipay;
 use CreditCard;
 use URL;
 use Cache;
-
+use Event;
 use App\Models\Invoice;
 use App\Models\Invitation;
 use App\Models\Client;
 use App\Models\PaymentType;
 use App\Models\Country;
-
+use App\Models\License;
+use App\Models\Payment;
+use App\Models\AccountGatewayToken;
 use App\Ninja\Repositories\PaymentRepository;
 use App\Ninja\Repositories\InvoiceRepository;
 use App\Ninja\Repositories\AccountRepository;
@@ -245,126 +248,66 @@ class PaymentController extends BaseController
         $invoice = $invitation->invoice;
         $key = $invoice->invoice_number.'_details';
         $gateway = $invoice->client->account->getGatewayByType(Session::get('payment_type'))->gateway;
-        $paymentLibrary = $gateway->paymentlibrary;
         $currencyCode = $invoice->client->currency ? $invoice->client->currency->code : ($invoice->account->currency ? $invoice->account->currency->code : 'USD');
 
-        if ($input && $paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY) {
+        if ($input) {
             $data = self::convertInputForOmnipay($input);
-
             Session::put($key, $data);
-        } elseif ($input && $paymentLibrary->id == PAYMENT_LIBRARY_PHP_PAYMENTS) {
-            $input = Input::all();
-            $data = [
-                'first_name' => $input['first_name'],
-                'last_name' => $input['last_name'],
-                'cc_number' => $input['card_number'],
-                'cc_exp' => $input['expiration_month'].$input['expiration_year'],
-                'cc_code' => $input['cvv'],
-                'street' => $input['address1'],
-                'street2' => $input['address2'],
-                'city' => $input['city'],
-                'state' => $input['state'],
-                'postal_code' => $input['postal_code'],
-                'amt' => $invoice->balance,
-                'ship_to_street' => $input['address1'],
-                'ship_to_city' => $input['city'],
-                'ship_to_state' => $input['state'],
-                'ship_to_postal_code' => $input['postal_code'],
-                'currency_code' => $currencyCode,
-            ];
-
-            switch ($gateway->id) {
-                case GATEWAY_BEANSTREAM:
-                    $data['phone'] = $input['phone'];
-                    $data['email'] = $input['email'];
-                    $data['country'] = $input['country'];
-                    $data['ship_to_country'] = $input['country'];
-                    break;
-                case GATEWAY_BRAINTREE:
-                    $data['ship_to_state'] = 'Ohio'; //$input['state'];
-                    break;
-            }
-
-            if (strlen($data['cc_exp']) == 5) {
-                $data['cc_exp'] = '0'.$data['cc_exp'];
-            }
-
-            Session::put($key, $data);
-
-            return $data;
         } elseif (Session::get($key)) {
             $data = Session::get($key);
         } else {
             $data = [];
         }
 
-        if ($paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY) {
-            $card = new CreditCard($data);
+        $card = new CreditCard($data);
 
-            return [
-                'amount' => $invoice->balance,
-                'card' => $card,
-                'currency' => $currencyCode,
-                'returnUrl' => URL::to('complete'),
-                'cancelUrl' => $invitation->getLink(),
-                'description' => trans('texts.' . $invoice->getEntityType()) . " {$invoice->invoice_number}",
-            ];
-        } else {
-            return $data;
-        }
+        return [
+            'amount' => $invoice->getRequestedAmount(),
+            'card' => $card,
+            'currency' => $currencyCode,
+            'returnUrl' => URL::to('complete'),
+            'cancelUrl' => $invitation->getLink(),
+            'description' => trans('texts.' . $invoice->getEntityType()) . " {$invoice->invoice_number}",
+        ];
     }
 
-    public function show_payment($invitationKey)
-    {
-        // Handle token billing
-        if (Input::get('use_token') == 'true') {
-            return self::do_payment($invitationKey, false, true);
-        }
+    public function show_payment($invitationKey, $paymentType = false)
+    {        
+        $invitation = Invitation::with('invoice.invoice_items', 'invoice.client.currency', 'invoice.client.account.account_gateways.gateway')->where('invitation_key', '=', $invitationKey)->firstOrFail();
+        $invoice = $invitation->invoice;
+        $client = $invoice->client;
+        $account = $client->account;
+        $useToken = false;
 
-        if (Input::has('use_paypal')) {
-            Session::put('payment_type', Input::get('use_paypal') == 'true' ? PAYMENT_TYPE_PAYPAL : PAYMENT_TYPE_CREDIT_CARD);
-        } elseif (!Session::has('payment_type')) {
-            Session::put('payment_type', PAYMENT_TYPE_ANY);
+        if (!$paymentType) {
+            $paymentType = $account->account_gateways[0]->getPaymentType();
+        } else if ($paymentType == PAYMENT_TYPE_TOKEN) {
+            $useToken = true;
+            $paymentType = PAYMENT_TYPE_CREDIT_CARD;
         }
+        Session::put('payment_type', $paymentType);
 
-        // For PayPal we redirect straight to their site
-        $usePayPal = false;
-        if ($usePayPal = Input::get('use_paypal')) {
-            $usePayPal = $usePayPal == 'true';
-        } else {
-            $invitation = Invitation::with('invoice.client.account', 'invoice.client.account.account_gateways.gateway')->where('invitation_key', '=', $invitationKey)->firstOrFail();
-            $account = $invitation->invoice->client->account;
-            if (count($account->account_gateways) == 1 && $account->getGatewayByType(PAYMENT_TYPE_PAYPAL)) {
-                $usePayPal = true;
-            }
-        }
-        if ($usePayPal) {
+        // Handle offsite payments
+        if ($useToken || $paymentType != PAYMENT_TYPE_CREDIT_CARD) {
             if (Session::has('error')) {
                 Session::reflash();
                 return Redirect::to('view/'.$invitationKey);
             } else {
-                return self::do_payment($invitationKey, false);
+                return self::do_payment($invitationKey, false, $useToken);
             }
-        } else {
-	   Session::put('payment_type', PAYMENT_TYPE_ANY);
-	}
+        }
 
-        $invitation = Invitation::with('invoice.invoice_items', 'invoice.client.currency', 'invoice.client.account.account_gateways.gateway')->where('invitation_key', '=', $invitationKey)->firstOrFail();
-        $invoice = $invitation->invoice;
-        $client = $invoice->client;
-        $accountGateway = $invoice->client->account->getGatewayByType(Session::get('payment_type'));
-        $gateway = $invoice->client->account->getGatewayByType(Session::get('payment_type'))->gateway;
-        $paymentLibrary = $gateway->paymentlibrary;
+        $accountGateway = $invoice->client->account->getGatewayByType($paymentType);
+        $gateway = $accountGateway->gateway;
         $acceptedCreditCardTypes = $accountGateway->getCreditcardTypes();
 
         $data = [
             'showBreadcrumbs' => false,
             'url' => 'payment/'.$invitationKey,
-            'amount' => $invoice->balance,
+            'amount' => $invoice->getRequestedAmount(),
             'invoiceNumber' => $invoice->invoice_number,
             'client' => $client,
             'contact' => $invitation->contact,
-            'paymentLibrary' => $paymentLibrary,
             'gateway' => $gateway,
             'acceptedCreditCardTypes' => $acceptedCreditCardTypes,
             'countries' => Cache::get('countries'),
@@ -401,7 +344,6 @@ class PaymentController extends BaseController
         $account->load('account_gateways.gateway');
         $accountGateway = $account->getGatewayByType(Session::get('payment_type'));
         $gateway = $accountGateway->gateway;
-        $paymentLibrary = $gateway->paymentlibrary;
         $acceptedCreditCardTypes = $accountGateway->getCreditcardTypes();
 
         $affiliate = Affiliate::find(Session::get('affiliate_id'));
@@ -413,7 +355,6 @@ class PaymentController extends BaseController
             'amount' => $affiliate->price,
             'client' => false,
             'contact' => false,
-            'paymentLibrary' => $paymentLibrary,
             'gateway' => $gateway,
             'acceptedCreditCardTypes' => $acceptedCreditCardTypes,
             'countries' => Cache::get('countries'),
@@ -519,13 +460,13 @@ class PaymentController extends BaseController
         $productId = Input::get('product_id', PRODUCT_ONE_CLICK_INSTALL);
 
         $license = License::where('license_key', '=', $licenseKey)
-                    ->where('is_claimed', '=', false)
+                    ->where('is_claimed', '<', 3)
                     ->where('product_id', '=', $productId)
                     ->first();
 
         if ($license) {
             if ($license->transaction_reference != 'TEST_MODE') {
-                $license->is_claimed = true;
+                $license->is_claimed = $license->is_claimed + 1;
                 $license->save();
             }
 
@@ -564,8 +505,8 @@ class PaymentController extends BaseController
         $client = $invoice->client;
         $account = $client->account;
         $accountGateway = $account->getGatewayByType(Session::get('payment_type'));
-        $paymentLibrary = $accountGateway->gateway->paymentlibrary;
-
+        
+        /*
         if ($onSite) {
             $client->address1 = trim(Input::get('address1'));
             $client->address2 = trim(Input::get('address2'));
@@ -574,67 +515,66 @@ class PaymentController extends BaseController
             $client->postal_code = trim(Input::get('postal_code'));
             $client->save();
         }
-
+        */
+        
         try {
-            if ($paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY) {
-                $gateway = self::createGateway($accountGateway);
-                $details = self::getPaymentDetails($invitation, $useToken || !$onSite ? false : Input::all());
-                
-                if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
-                    if ($useToken) {
-                        $details['cardReference'] = $client->getGatewayToken();
-                    } elseif ($account->token_billing_type_id == TOKEN_BILLING_ALWAYS || Input::get('token_billing')) {
-                        $tokenResponse = $gateway->createCard($details)->send();
-                        $cardReference = $tokenResponse->getCardReference();
-                        $details['cardReference'] = $cardReference;
+            $gateway = self::createGateway($accountGateway);
+            $details = self::getPaymentDetails($invitation, $useToken || !$onSite ? false : Input::all());
+            
+            if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
+                if ($useToken) {
+                    $details['cardReference'] = $client->getGatewayToken();
+                } elseif ($account->token_billing_type_id == TOKEN_BILLING_ALWAYS || Input::get('token_billing')) {
+                    $tokenResponse = $gateway->createCard($details)->send();
+                    $cardReference = $tokenResponse->getCardReference();
+                    $details['cardReference'] = $cardReference;
 
-                        $token = AccountGatewayToken::where('client_id', '=', $client->id)
-                                    ->where('account_gateway_id', '=', $accountGateway->id)->first();
+                    $token = AccountGatewayToken::where('client_id', '=', $client->id)
+                                ->where('account_gateway_id', '=', $accountGateway->id)->first();
 
-                        if (!$token) {
-                            $token = new AccountGatewayToken();
-                            $token->account_id = $account->id;
-                            $token->contact_id = $invitation->contact_id;
-                            $token->account_gateway_id = $accountGateway->id;
-                            $token->client_id = $client->id;
-                        }
-
-                        $token->token = $cardReference;
-                        $token->save();
+                    if (!$token) {
+                        $token = new AccountGatewayToken();
+                        $token->account_id = $account->id;
+                        $token->contact_id = $invitation->contact_id;
+                        $token->account_gateway_id = $accountGateway->id;
+                        $token->client_id = $client->id;
                     }
+
+                    $token->token = $cardReference;
+                    $token->save();
                 }
+            }
+            
+            $response = $gateway->purchase($details)->send();
+            $ref = $response->getTransactionReference();
+
+            if (!$ref) {
                 
-                $response = $gateway->purchase($details)->send();
-                $ref = $response->getTransactionReference();
+                Session::flash('error', $response->getMessage());
 
-                if (!$ref) {
-                    
-                    Session::flash('error', $response->getMessage());
-
-                    if ($onSite) {
-                        return Redirect::to('payment/'.$invitationKey)->withInput();
-                    } else {
-                        return Redirect::to('view/'.$invitationKey);
-                    }
-                }
-
-                if ($response->isSuccessful()) {
-                    $payment = self::createPayment($invitation, $ref);
-                    Session::flash('message', trans('texts.applied_payment'));
-
-                    return Redirect::to('view/'.$payment->invitation->invitation_key);
-                } elseif ($response->isRedirect()) {
-                    $invitation->transaction_reference = $ref;
-                    $invitation->save();
-
-                    Session::save();
-                    $response->redirect();
+                if ($onSite) {
+                    return Redirect::to('payment/'.$invitationKey)->withInput();
                 } else {
-                    Session::flash('error', $response->getMessage());
-
-                    return Utils::fatalError('Sorry, there was an error processing your payment. Please try again later.<p>', $response->getMessage());
+                    return Redirect::to('view/'.$invitationKey);
                 }
             }
+
+            if ($response->isSuccessful()) {
+                $payment = self::createPayment($invitation, $ref);
+                Session::flash('message', trans('texts.applied_payment'));
+
+                return Redirect::to('view/'.$payment->invitation->invitation_key);
+            } elseif ($response->isRedirect()) {
+                $invitation->transaction_reference = $ref;
+                $invitation->save();
+
+                Session::save();
+                $response->redirect();
+            } else {
+                Session::flash('error', $response->getMessage());
+
+                return Utils::fatalError('Sorry, there was an error processing your payment. Please try again later.<p>', $response->getMessage());
+            }
         } catch (\Exception $e) {
             $errorMessage = trans('texts.payment_error');
             Session::flash('error', $errorMessage."<p>".$e->getMessage());
@@ -663,12 +603,17 @@ class PaymentController extends BaseController
         $payment->invitation_id = $invitation->id;
         $payment->account_gateway_id = $accountGateway->id;
         $payment->invoice_id = $invoice->id;
-        $payment->amount = $invoice->balance;
+        $payment->amount = $invoice->getRequestedAmount();
         $payment->client_id = $invoice->client_id;
         $payment->contact_id = $invitation->contact_id;
         $payment->transaction_reference = $ref;
         $payment->payment_date = date_create()->format('Y-m-d');
 
+        if ($invoice->partial) {
+            $invoice->partial = 0;
+            $invoice->save();
+        }
+
         if ($payerId) {
             $payment->payer_id = $payerId;
         }
diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php
index 3bee3b0c304a..039adc0b5643 100644
--- a/app/Http/Controllers/QuoteController.php
+++ b/app/Http/Controllers/QuoteController.php
@@ -6,7 +6,8 @@ use Redirect;
 use Utils;
 use View;
 use Cache;
-
+use Event;
+use Session;
 use App\Models\Account;
 use App\Models\Client;
 use App\Models\Country;
@@ -17,10 +18,13 @@ use App\Models\PaymentTerm;
 use App\Models\Product;
 use App\Models\Size;
 use App\Models\TaxRate;
+use App\Models\Invitation;
+use App\Models\Activity;
 use App\Ninja\Mailers\ContactMailer as Mailer;
 use App\Ninja\Repositories\InvoiceRepository;
 use App\Ninja\Repositories\ClientRepository;
 use App\Ninja\Repositories\TaxRateRepository;
+use App\Events\QuoteApproved;
 
 class QuoteController extends BaseController
 {
@@ -187,7 +191,9 @@ class QuoteController extends BaseController
         $invoice = $invitation->invoice;
 
         if ($invoice->is_quote && !$invoice->quote_invoice_id) {
-            Activity::approveQuote($invitation);
+            Event::fire(new QuoteApproved($invoice));            
+            Activity::approveQuote($invitation);            
+
             $invoice = $this->invoiceRepo->cloneInvoice($invoice, $invoice->id);
             Session::flash('message', trans('texts.converted_to_invoice'));
 
diff --git a/app/Http/Controllers/TokenController.php b/app/Http/Controllers/TokenController.php
index f84411a60243..3b9d546849ab 100644
--- a/app/Http/Controllers/TokenController.php
+++ b/app/Http/Controllers/TokenController.php
@@ -93,11 +93,6 @@ class TokenController extends BaseController
      */
     public function create()
     {
-        if (!Auth::user()->confirmed) {
-            Session::flash('error', trans('texts.register_to_add_user'));
-            return Redirect::to('company/advanced_settings/user_management');
-        }
-
         $data = [
           'showBreadcrumbs' => false,
           'token' => null,
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index e4d3d512bfa1..19f3708fee64 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -336,7 +336,7 @@ class UserController extends BaseController
 
         // save the new password
         $user = Auth::user();
-        $user->password = $password;
+        $user->password = bcrypt($password);
         $user->save();
 
         return RESULT_SUCCESS;
diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php
index 361177721b25..50eebe347811 100644
--- a/app/Http/Middleware/StartupCheck.php
+++ b/app/Http/Middleware/StartupCheck.php
@@ -9,6 +9,7 @@ use Redirect;
 use Cache;
 use Session;
 use Event;
+use App\Models\Language;
 use App\Events\UserSettingsChanged;
 
 class StartupCheck
@@ -48,14 +49,13 @@ class StartupCheck
         ];
         foreach ($cachedTables as $name => $class) {
             if (!Cache::has($name)) {
-                $orderBy = 'id';
-
                 if ($name == 'paymentTerms') {
                     $orderBy = 'num_days';
-                } elseif (property_exists($class, 'name') && $name != 'paymentTypes') {
+                } elseif (in_array($name, ['currencies', 'sizes', 'industries', 'languages'])) {
                     $orderBy = 'name';
+                } else {
+                    $orderBy = 'id';
                 }
-
                 Cache::forever($name, $class::orderBy($orderBy)->get());
             }
         }
diff --git a/app/Http/routes.php b/app/Http/routes.php
index d090b43ec94a..5499f2c3537a 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -36,7 +36,7 @@ Route::post('get_started', 'AccountController@getStarted');
 // Client visible pages
 Route::get('view/{invitation_key}', 'InvoiceController@view');
 Route::get('approve/{invitation_key}', 'QuoteController@approve');
-Route::get('payment/{invitation_key}', 'PaymentController@show_payment');
+Route::get('payment/{invitation_key}/{payment_type?}', 'PaymentController@show_payment');
 Route::post('payment/{invitation_key}', 'PaymentController@do_payment');
 Route::get('complete', 'PaymentController@offsite_payment');
 Route::get('client/quotes', 'QuoteController@clientIndex');
@@ -71,7 +71,7 @@ get('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getEma
 post('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postEmail'));
 get('/password/reset', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getReset'));
 post('/password/reset', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postReset'));
-get('user/confirm/{code}', 'UserController@confirm');
+get('/user/confirm/{code}', 'UserController@confirm');
 
 /*
 // Confide routes
@@ -167,6 +167,7 @@ Route::group(['middleware' => 'auth'], function() {
     Route::get('api/credits/{client_id?}', array('as'=>'api.credits', 'uses'=>'CreditController@getDatatable'));
     Route::post('credits/bulk', 'CreditController@bulk');
 
+    get('/resend_confirmation', 'AccountController@resendConfirmation');
     //Route::resource('timesheets', 'TimesheetController');
 });
 
@@ -182,6 +183,33 @@ Route::group(['middleware' => 'api', 'prefix' => 'api/v1'], function()
     Route::post('email_invoice', 'InvoiceApiController@emailInvoice');
 });
 
+// Redirects for legacy links
+Route::get('/rocksteady', function() {
+    return Redirect::to(NINJA_WEB_URL, 301);
+});
+Route::get('/about', function() {
+    return Redirect::to(NINJA_WEB_URL, 301);
+});
+Route::get('/contact', function() {
+    return Redirect::to(NINJA_WEB_URL.'/contact', 301);
+});
+Route::get('/plans', function() {
+    return Redirect::to(NINJA_WEB_URL.'/pricing', 301);
+});
+Route::get('/faq', function() {
+    return Redirect::to(NINJA_WEB_URL.'/how-it-works', 301);
+});
+Route::get('/features', function() {
+    return Redirect::to(NINJA_WEB_URL.'/features', 301);
+});
+Route::get('/testimonials', function() {
+    return Redirect::to(NINJA_WEB_URL, 301);
+});
+Route::get('/compare-online-invoicing{sites?}', function() {
+    return Redirect::to(NINJA_WEB_URL, 301);
+});
+
+
 define('CONTACT_EMAIL', Config::get('mail.from.address'));
 define('CONTACT_NAME', Config::get('mail.from.name'));
 define('SITE_URL', Config::get('app.url'));
@@ -308,6 +336,7 @@ define('GATEWAY_TWO_CHECKOUT', 27);
 define('GATEWAY_BEANSTREAM', 29);
 define('GATEWAY_PSIGATE', 30);
 define('GATEWAY_MOOLAH', 31);
+define('GATEWAY_BITPAY', 42);
 
 define('EVENT_CREATE_CLIENT', 1);
 define('EVENT_CREATE_INVOICE', 2);
@@ -321,7 +350,7 @@ define('NINJA_GATEWAY_ID', GATEWAY_AUTHORIZE_NET);
 define('NINJA_GATEWAY_CONFIG', '{"apiLoginId":"626vWcD5","transactionKey":"4bn26TgL9r4Br4qJ","testMode":"","developerMode":""}');
 define('NINJA_WEB_URL', 'https://www.invoiceninja.com');
 define('NINJA_APP_URL', 'https://app.invoiceninja.com');
-define('NINJA_VERSION', '2.0');
+define('NINJA_VERSION', '1.7.2');
 define('NINJA_DATE', '2000-01-01');
 define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com');
 define('RELEASES_URL', 'https://github.com/hillelcoren/invoice-ninja/releases/');
@@ -350,6 +379,8 @@ define('TOKEN_BILLING_ALWAYS', 4);
 
 define('PAYMENT_TYPE_PAYPAL', 'PAYMENT_TYPE_PAYPAL');
 define('PAYMENT_TYPE_CREDIT_CARD', 'PAYMENT_TYPE_CREDIT_CARD');
+define('PAYMENT_TYPE_BITCOIN', 'PAYMENT_TYPE_BITCOIN');
+define('PAYMENT_TYPE_TOKEN', 'PAYMENT_TYPE_TOKEN');
 define('PAYMENT_TYPE_ANY', 'PAYMENT_TYPE_ANY');
 
 /*
diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php
index 33d799e4acb7..d6789909c4c5 100644
--- a/app/Libraries/Utils.php
+++ b/app/Libraries/Utils.php
@@ -165,6 +165,7 @@ class Utils
             'user_agent' => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '',
             'ip' => Request::getClientIp(),
             'count' => Session::get('error_count', 0),
+            //'input' => Input::all()
         ];
 
         Log::error($error."\n", $data);
diff --git a/app/Listeners/HandleInvoicePaid.php b/app/Listeners/HandleInvoicePaid.php
index 159b001abad4..d072abd00357 100644
--- a/app/Listeners/HandleInvoicePaid.php
+++ b/app/Listeners/HandleInvoicePaid.php
@@ -31,8 +31,10 @@ class HandleInvoicePaid {
 	 */
 	public function handle(InvoicePaid $event)
 	{
-        $this->contactMailer->sendPaymentConfirmation($payment);
+        $payment = $event->payment;
         $invoice = $payment->invoice;
+        
+        $this->contactMailer->sendPaymentConfirmation($payment);
                 
         foreach ($invoice->account->users as $user)
         {
diff --git a/app/Listeners/HandleQuoteApproved.php b/app/Listeners/HandleQuoteApproved.php
new file mode 100644
index 000000000000..3a49aa9b5af5
--- /dev/null
+++ b/app/Listeners/HandleQuoteApproved.php
@@ -0,0 +1,42 @@
+<?php namespace App\Listeners;
+
+use App\Events\QuoteApproved;
+use App\Ninja\Mailers\UserMailer;
+
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldBeQueued;
+
+class HandleQuoteApproved {
+
+    protected $userMailer;
+
+	/**
+	 * Create the event handler.
+	 *
+	 * @return void
+	 */
+    public function __construct(UserMailer $userMailer)
+    {
+        $this->userMailer = $userMailer;
+    }   
+
+	/**
+	 * Handle the event.
+	 *
+	 * @param  QuoteApproved  $event
+	 * @return void
+	 */
+	public function handle(QuoteApproved $event)
+	{
+        $invoice = $event->invoice;
+
+        foreach ($invoice->account->users as $user)
+        {
+            if ($user->{'notify_approved'})
+            {
+                $this->userMailer->sendNotification($user, $invoice, 'approved');
+            }
+        }
+	}
+
+}
diff --git a/app/Models/Account.php b/app/Models/Account.php
index ff896e30779e..4dadd3d521c3 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -113,9 +113,7 @@ class Account extends Eloquent
         foreach ($this->account_gateways as $gateway) {
             if (!$type || $type == PAYMENT_TYPE_ANY) {
                 return $gateway;
-            } elseif ($gateway->isPayPal() && $type == PAYMENT_TYPE_PAYPAL) {
-                return $gateway;
-            } elseif (!$gateway->isPayPal() && $type == PAYMENT_TYPE_CREDIT_CARD) {
+            } elseif ($gateway->isPaymentType($type)) {
                 return $gateway;
             }
         }
@@ -230,6 +228,7 @@ class Account extends Eloquent
             'subtotal',
             'paid_to_date',
             'balance_due',
+            'amount_due',
             'terms',
             'your_invoice',
             'quote',
diff --git a/app/Models/AccountGateway.php b/app/Models/AccountGateway.php
index c7f008fb67f8..62c3456473ce 100644
--- a/app/Models/AccountGateway.php
+++ b/app/Models/AccountGateway.php
@@ -1,5 +1,6 @@
 <?php namespace App\Models;
 
+use App\Models\Gateway;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class AccountGateway extends EntityModel
@@ -26,8 +27,12 @@ class AccountGateway extends EntityModel
         return $arrayOfImages;
     }
 
-    public function isPayPal() {
-        return $this->gateway_id == GATEWAY_PAYPAL_EXPRESS;
+    public function getPaymentType() {
+        return Gateway::getPaymentType($this->gateway_id);
+    }
+    
+    public function isPaymentType($type) {
+        return $this->getPaymentType() == $type;
     }
 }
 
diff --git a/app/Models/AccountGatewayToken.php b/app/Models/AccountGatewayToken.php
index 7726df1301f0..b706882af77d 100644
--- a/app/Models/AccountGatewayToken.php
+++ b/app/Models/AccountGatewayToken.php
@@ -1,5 +1,6 @@
 <?php namespace App\Models;
 
+use Eloquent;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class AccountGatewayToken extends Eloquent
diff --git a/app/Models/Activity.php b/app/Models/Activity.php
index 25c38f5d21cc..c8ea1c62b811 100644
--- a/app/Models/Activity.php
+++ b/app/Models/Activity.php
@@ -187,7 +187,7 @@ class Activity extends Eloquent
             $diff = floatval($invoice->amount) - floatval($invoice->getOriginal('amount'));
 
             $fieldChanged = false;
-            foreach (['invoice_number', 'po_number', 'invoice_date', 'due_date', 'terms', 'public_notes', 'invoice_footer'] as $field) {
+            foreach (['invoice_number', 'po_number', 'invoice_date', 'due_date', 'terms', 'public_notes', 'invoice_footer', 'partial'] as $field) {
                 if ($invoice->$field != $invoice->getOriginal($field)) {
                     $fieldChanged = true;
                     break;
diff --git a/app/Models/Affiliate.php b/app/Models/Affiliate.php
index f88b96c3fc1e..63fcb71ce357 100644
--- a/app/Models/Affiliate.php
+++ b/app/Models/Affiliate.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class Affiliate extends Eloquent
 {
     public $timestamps = true;
diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php
index cb275e23e826..d0b4bd847972 100644
--- a/app/Models/Gateway.php
+++ b/app/Models/Gateway.php
@@ -7,11 +7,6 @@ class Gateway extends Eloquent
 {
     public $timestamps = true;
 
-    public function paymentlibrary()
-    {
-        return $this->belongsTo('\App\Models\PaymentLibrary', 'payment_library_id');
-    }
-
     public function getLogoUrl()
     {
         return '/images/gateways/logo_'.$this->provider.'.png';
@@ -37,18 +32,20 @@ class Gateway extends Eloquent
 
     public function getFields()
     {
-        $paymentLibrary =  $this->paymentlibrary;
+        return Omnipay::create($this->provider)->getDefaultParameters();
+    }
 
-        if ($paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY) {
-            $fields = Omnipay::create($this->provider)->getDefaultParameters();
+    public static function getPaymentType($gatewayId) {
+        if ($gatewayId == GATEWAY_PAYPAL_EXPRESS) {
+            return PAYMENT_TYPE_PAYPAL;
+        } else if ($gatewayId == GATEWAY_BITPAY) {
+            return PAYMENT_TYPE_BITCOIN;
         } else {
-            $fields = Payment_Utility::load('config', 'drivers/'.strtolower($this->provider));
+            return PAYMENT_TYPE_CREDIT_CARD;
         }
+    }
 
-        if ($fields == null) {
-            $fields = array();
-        }
-
-        return $fields;
+    public static function getPrettyPaymentType($gatewayId) {
+        return trans('texts.' . strtolower(Gateway::getPaymentType($gatewayId)));
     }
 }
diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php
index 58aedfb5cd5b..d55a16d25a99 100644
--- a/app/Models/Invitation.php
+++ b/app/Models/Invitation.php
@@ -9,7 +9,7 @@ class Invitation extends EntityModel
 
     public function invoice()
     {
-        return $this->belongsTo('App\Models\Invoice');
+        return $this->belongsTo('App\Models\Invoice')->withTrashed();
     }
 
     public function contact()
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 294a4eef1ba3..e457732dcfff 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -72,6 +72,11 @@ class Invoice extends EntityModel
         return $this->invoice_status_id >= INVOICE_STATUS_PAID;
     }
 
+    public function getRequestedAmount()
+    {
+        return $this->partial > 0 ? $this->partial : $this->balance;
+    }
+
     public function hidePrivateFields()
     {
         $this->setVisible([
@@ -99,6 +104,7 @@ class Invoice extends EntityModel
             'custom_value2',
             'custom_taxes1',
             'custom_taxes2',
+            'partial',
         ]);
 
         $this->client->setVisible([
@@ -236,8 +242,6 @@ Invoice::deleting(function ($invoice) {
     Activity::archiveInvoice($invoice);
 });
 
-// TODO: Fix for L5
-/*Invoice::restoring(function ($invoice) {
+Invoice::restoring(function ($invoice) {
     Activity::restoreInvoice($invoice);
 });
-*/
\ No newline at end of file
diff --git a/app/Models/License.php b/app/Models/License.php
index dff6f25b409a..93898f8d7d18 100644
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -1,5 +1,6 @@
 <?php namespace App\Models;
 
+use Eloquent;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class License extends Eloquent
diff --git a/app/Models/Project.php b/app/Models/Project.php
index 2dad20d29436..921090293581 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -2,6 +2,7 @@
 
 use Auth;
 use Utils;
+use Eloquent;
 
 class Project extends Eloquent
 {
diff --git a/app/Models/ProjectCode.php b/app/Models/ProjectCode.php
index 5849c5f23d89..1eece95d4c65 100644
--- a/app/Models/ProjectCode.php
+++ b/app/Models/ProjectCode.php
@@ -2,7 +2,7 @@
 
 use Auth;
 use Utils;
-
+use Eloquent;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class ProjectCode extends Eloquent
diff --git a/app/Models/Timesheet.php b/app/Models/Timesheet.php
index 107110ebb718..085cb3ef3390 100644
--- a/app/Models/Timesheet.php
+++ b/app/Models/Timesheet.php
@@ -1,5 +1,6 @@
 <?php namespace App\Models;
 
+use Eloquent;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Timesheet extends Eloquent
diff --git a/app/Models/TimesheetEvent.php b/app/Models/TimesheetEvent.php
index 7fc981198000..44a04f842119 100644
--- a/app/Models/TimesheetEvent.php
+++ b/app/Models/TimesheetEvent.php
@@ -2,7 +2,7 @@
 
 use Auth;
 use Utils;
-
+use Eloquent;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class TimesheetEvent extends Eloquent
diff --git a/app/Models/TimesheetEventSource.php b/app/Models/TimesheetEventSource.php
index 9ae36be0c156..99ee62f69f86 100644
--- a/app/Models/TimesheetEventSource.php
+++ b/app/Models/TimesheetEventSource.php
@@ -2,7 +2,7 @@
 
 use Auth;
 use Utils;
-
+use Eloquent;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class TimesheetEventSource extends Eloquent
diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php
index 98acdc810ead..8ac55cb281e7 100644
--- a/app/Ninja/Mailers/ContactMailer.php
+++ b/app/Ninja/Mailers/ContactMailer.php
@@ -19,7 +19,7 @@ class ContactMailer extends Mailer
         $subject = trans("texts.{$entityType}_subject", ['invoice' => $invoice->invoice_number, 'account' => $invoice->account->getDisplayName()]);
         $accountName = $invoice->account->getDisplayName();
         $emailTemplate = $invoice->account->getEmailTemplate($entityType);
-        $invoiceAmount = Utils::formatMoney($invoice->amount, $invoice->client->currency_id);
+        $invoiceAmount = Utils::formatMoney($invoice->getRequestedAmount(), $invoice->client->currency_id);
 
         foreach ($invoice->invitations as $invitation) {
             if (!$invitation->user || !$invitation->user->email) {
diff --git a/app/Ninja/Mailers/UserMailer.php b/app/Ninja/Mailers/UserMailer.php
index ad82923b7727..5831e66b5cdc 100644
--- a/app/Ninja/Mailers/UserMailer.php
+++ b/app/Ninja/Mailers/UserMailer.php
@@ -39,8 +39,8 @@ class UserMailer extends Mailer
             return;
         }
         
-        $view = 'invoice_'.$notificationType;
         $entityType = $invoice->getEntityType();
+        $view = "{$entityType}_{$notificationType}";
 
         $data = [
             'entityType' => $entityType,
diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php
index d4569bea4b47..2a5276787723 100644
--- a/app/Ninja/Repositories/ClientRepository.php
+++ b/app/Ninja/Repositories/ClientRepository.php
@@ -34,7 +34,10 @@ class ClientRepository
     public function getErrors($data)
     {
         $contact = isset($data['contacts']) ? (array) $data['contacts'][0] : (isset($data['contact']) ? $data['contact'] : []);
-        $validator = \Validator::make($contact, ['email' => 'required|email']);
+        $validator = \Validator::make($contact, [
+            'email' => 'email|required_without:first_name',
+            'first_name' => 'required_without:email',
+        ]);
         if ($validator->fails()) {
             return $validator->messages();
         }
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 5bfbcdd7c187..af0857989321 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -19,7 +19,7 @@ class InvoiceRepository
             ->where('contacts.deleted_at', '=', null)
             ->where('invoices.is_recurring', '=', false)
             ->where('contacts.is_primary', '=', true)
-            ->select('clients.public_id as client_public_id', 'invoice_number', 'invoice_status_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'invoices.balance', 'invoice_date', 'due_date', 'invoice_statuses.name as invoice_status_name', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email', 'quote_id', 'quote_invoice_id', 'invoices.deleted_at', 'invoices.is_deleted');
+            ->select('clients.public_id as client_public_id', 'invoice_number', 'invoice_status_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'invoices.balance', 'invoice_date', 'due_date', 'invoice_statuses.name as invoice_status_name', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email', 'quote_id', 'quote_invoice_id', 'invoices.deleted_at', 'invoices.is_deleted', 'invoices.partial');
 
         if (!\Session::get('show_trash:'.$entityType)) {
             $query->where('invoices.deleted_at', '=', null);
@@ -86,7 +86,7 @@ class InvoiceRepository
           ->where('invoices.is_deleted', '=', false)
           ->where('clients.deleted_at', '=', null)
           ->where('invoices.is_recurring', '=', false)
-          ->select('invitation_key', 'invoice_number', 'invoice_date', 'invoices.balance as balance', 'due_date', 'clients.public_id as client_public_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'start_date', 'end_date', 'clients.currency_id');
+          ->select('invitation_key', 'invoice_number', 'invoice_date', 'invoices.balance as balance', 'due_date', 'clients.public_id as client_public_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'start_date', 'end_date', 'clients.currency_id', 'invoices.partial');
 
         $table = \Datatable::query($query)
             ->addColumn('invoice_number', function ($model) use ($entityType) { return link_to('/view/'.$model->invitation_key, $model->invoice_number); })
@@ -94,7 +94,11 @@ class InvoiceRepository
             ->addColumn('amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id); });
 
         if ($entityType == ENTITY_INVOICE) {
-            $table->addColumn('balance', function ($model) { return Utils::formatMoney($model->balance, $model->currency_id); });
+            $table->addColumn('balance', function ($model) {
+                return $model->partial > 0 ?
+                    trans('texts.partial_remaining', ['partial' => Utils::formatMoney($model->partial, $model->currency_id), 'balance' => Utils::formatMoney($model->balance, $model->currency_id)]) :
+                    Utils::formatMoney($model->balance, $model->currency_id);
+            });
         }
 
         return $table->addColumn('due_date', function ($model) { return Utils::fromSqlDate($model->due_date); })
@@ -122,7 +126,11 @@ class InvoiceRepository
               ->addColumn('amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id); });
 
         if ($entityType == ENTITY_INVOICE) {
-            $table->addColumn('balance', function ($model) { return Utils::formatMoney($model->balance, $model->currency_id); });
+            $table->addColumn('balance', function ($model) {
+                return $model->partial > 0 ?
+                    trans('texts.partial_remaining', ['partial' => Utils::formatMoney($model->partial, $model->currency_id), 'balance' => Utils::formatMoney($model->balance, $model->currency_id)]) :
+                    Utils::formatMoney($model->balance, $model->currency_id);
+            });
         }
 
         return $table->addColumn('due_date', function ($model) { return Utils::fromSqlDate($model->due_date); })
@@ -182,7 +190,10 @@ class InvoiceRepository
     public function getErrors($input)
     {
         $contact = (array) $input->client->contacts[0];
-        $rules = ['email' => 'required|email'];
+        $rules = [
+            'email' => 'email|required_without:first_name',
+            'first_name' => 'required_without:email',
+        ];
         $validator = \Validator::make($contact, $rules);
 
         if ($validator->fails()) {
@@ -223,10 +234,22 @@ class InvoiceRepository
 
         $account = \Auth::user()->account;
 
+        if ((isset($data['set_default_terms']) && $data['set_default_terms'])
+            || (isset($data['set_default_footer']) && $data['set_default_footer'])) {
+            if (isset($data['set_default_terms']) && $data['set_default_terms']) {
+                $account->invoice_terms = trim($data['terms']);
+            }
+            if (isset($data['set_default_footer']) && $data['set_default_footer']) {
+                $account->invoice_footer = trim($data['invoice_footer']);
+            }
+            $account->save();
+        }
+
         $invoice->client_id = $data['client_id'];
         $invoice->discount = round(Utils::parseFloat($data['discount']), 2);
         $invoice->is_amount_discount = $data['is_amount_discount'] ? true : false;
         $invoice->invoice_number = trim($data['invoice_number']);
+        $invoice->partial = round(Utils::parseFloat($data['partial']), 2);
         $invoice->is_recurring = $data['is_recurring'] && !Utils::isDemo() ? true : false;
         $invoice->invoice_date = isset($data['invoice_date_sql']) ? $data['invoice_date_sql'] : Utils::toSqlDate($data['invoice_date']);
 
@@ -360,17 +383,6 @@ class InvoiceRepository
             $invoice->invoice_items()->save($invoiceItem);
         }
 
-        if ((isset($data['set_default_terms']) && $data['set_default_terms'])
-            || (isset($data['set_default_footer']) && $data['set_default_footer'])) {
-            if (isset($data['set_default_terms']) && $data['set_default_terms']) {
-                $account->invoice_terms = trim($data['terms']);
-            }
-            if (isset($data['set_default_footer']) && $data['set_default_footer']) {
-                $account->invoice_footer = trim($data['invoice_footer']);
-            }
-            $account->save();
-        }
-
         return $invoice;
     }
 
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index e5fd505a007a..3ce33b355412 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -26,6 +26,9 @@ class EventServiceProvider extends ServiceProvider {
         'App\Events\InvoicePaid' => [
             'App\Listeners\HandleInvoicePaid',
         ],
+        'App\Events\QuoteApproved' => [
+            'App\Listeners\HandleQuoteApproved',
+        ],
 	];
 
 	/**
diff --git a/composer.json b/composer.json
index cacff91bee1d..08c769297bbb 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,8 @@
         "coatesap/omnipay-realex": "~2.0",
         "fruitcakestudio/omnipay-sisow": "~2.0",
         "alfaproject/omnipay-skrill": "dev-master",
-        "illuminate/html": "5.*"
+        "illuminate/html": "5.*",
+        "omnipay/bitpay": "dev-master"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "~4.0",
diff --git a/composer.lock b/composer.lock
index f4e80c72ccd6..d1ea10533e32 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "f464570c808999ffcb0fa78193b13229",
+    "hash": "4093891914bbd46ffab78737da36898a",
     "packages": [
         {
             "name": "alfaproject/omnipay-neteller",
@@ -335,12 +335,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Chumper/Datatable.git",
-                "reference": "58f212270a4bd37ebf1371cb5302749cbbcb941d"
+                "reference": "bdd90cbe65b3544761f69ea199a1b9591770f3fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Chumper/Datatable/zipball/58f212270a4bd37ebf1371cb5302749cbbcb941d",
-                "reference": "58f212270a4bd37ebf1371cb5302749cbbcb941d",
+                "url": "https://api.github.com/repos/Chumper/Datatable/zipball/bdd90cbe65b3544761f69ea199a1b9591770f3fc",
+                "reference": "bdd90cbe65b3544761f69ea199a1b9591770f3fc",
                 "shasum": ""
             },
             "require": {
@@ -380,7 +380,7 @@
                 "jquery",
                 "laravel"
             ],
-            "time": "2015-04-04 15:19:43"
+            "time": "2015-04-08 12:11:23"
         },
         {
             "name": "classpreloader/classpreloader",
@@ -1374,12 +1374,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "8f3761154b4c1f5128365dfc32cbf757f27d97b6"
+                "reference": "7edc830d19733a40afae5641aabf0acf6be1961b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/8f3761154b4c1f5128365dfc32cbf757f27d97b6",
-                "reference": "8f3761154b4c1f5128365dfc32cbf757f27d97b6",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/7edc830d19733a40afae5641aabf0acf6be1961b",
+                "reference": "7edc830d19733a40afae5641aabf0acf6be1961b",
                 "shasum": ""
             },
             "require": {
@@ -1422,7 +1422,7 @@
                 "thumbnail",
                 "watermark"
             ],
-            "time": "2015-03-18 17:41:04"
+            "time": "2015-04-08 17:43:59"
         },
         {
             "name": "ircmaxell/password-compat",
@@ -2346,6 +2346,64 @@
             ],
             "time": "2015-01-19 19:06:04"
         },
+        {
+            "name": "omnipay/bitpay",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/omnipay-bitpay.git",
+                "reference": "e659f0e993c586cb36acafaf50835570b4a16eb2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-bitpay/zipball/e659f0e993c586cb36acafaf50835570b4a16eb2",
+                "reference": "e659f0e993c586cb36acafaf50835570b4a16eb2",
+                "shasum": ""
+            },
+            "require": {
+                "omnipay/common": "~2.0"
+            },
+            "require-dev": {
+                "omnipay/tests": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Omnipay\\BitPay\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Adrian Macneil",
+                    "email": "adrian@adrianmacneil.com"
+                },
+                {
+                    "name": "Omnipay Contributors",
+                    "homepage": "https://github.com/thephpleague/omnipay-bitpay/contributors"
+                }
+            ],
+            "description": "BitPay driver for the Omnipay payment processing library",
+            "homepage": "https://github.com/thephpleague/omnipay-bitpay",
+            "keywords": [
+                "bitcoin",
+                "bitpay",
+                "gateway",
+                "merchant",
+                "omnipay",
+                "pay",
+                "payment"
+            ],
+            "time": "2015-03-23 14:18:26"
+        },
         {
             "name": "omnipay/buckaroo",
             "version": "v2.0.1",
@@ -2981,16 +3039,16 @@
         },
         {
             "name": "omnipay/mollie",
-            "version": "3.0.3",
+            "version": "v3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/omnipay-mollie.git",
-                "reference": "ea3830b0aaa845430387e5afc1f638be18a152ec"
+                "reference": "a89cb0d15447023b24c03f86873c1c1489cd021b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/omnipay-mollie/zipball/ea3830b0aaa845430387e5afc1f638be18a152ec",
-                "reference": "ea3830b0aaa845430387e5afc1f638be18a152ec",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-mollie/zipball/a89cb0d15447023b24c03f86873c1c1489cd021b",
+                "reference": "a89cb0d15447023b24c03f86873c1c1489cd021b",
                 "shasum": ""
             },
             "require": {
@@ -3034,7 +3092,7 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-10-15 14:25:03"
+            "time": "2015-03-03 18:55:42"
         },
         {
             "name": "omnipay/multisafepay",
@@ -3730,16 +3788,16 @@
         },
         {
             "name": "omnipay/stripe",
-            "version": "v2.2.0",
+            "version": "v2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/omnipay-stripe.git",
-                "reference": "b3ed1028bb72837905012311fa74259d9ed8ba3c"
+                "reference": "906377e50045dc2ba9c612aa1f6924157e1f750e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/b3ed1028bb72837905012311fa74259d9ed8ba3c",
-                "reference": "b3ed1028bb72837905012311fa74259d9ed8ba3c",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/906377e50045dc2ba9c612aa1f6924157e1f750e",
+                "reference": "906377e50045dc2ba9c612aa1f6924157e1f750e",
                 "shasum": ""
             },
             "require": {
@@ -3783,7 +3841,7 @@
                 "payment",
                 "stripe"
             ],
-            "time": "2015-03-16 19:24:07"
+            "time": "2015-04-14 18:55:56"
         },
         {
             "name": "omnipay/targetpay",
@@ -5313,16 +5371,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "2.0.15",
+            "version": "2.0.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67"
+                "reference": "934fd03eb6840508231a7f73eb8940cf32c3b66c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/34cc484af1ca149188d0d9e91412191e398e0b67",
-                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/934fd03eb6840508231a7f73eb8940cf32c3b66c",
+                "reference": "934fd03eb6840508231a7f73eb8940cf32c3b66c",
                 "shasum": ""
             },
             "require": {
@@ -5371,7 +5429,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-01-24 10:06:35"
+            "time": "2015-04-11 04:35:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -5510,16 +5568,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74"
+                "reference": "eab81d02569310739373308137284e0158424330"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/db32c18eba00b121c145575fcbcd4d4d24e6db74",
-                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/eab81d02569310739373308137284e0158424330",
+                "reference": "eab81d02569310739373308137284e0158424330",
                 "shasum": ""
             },
             "require": {
@@ -5555,20 +5613,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2015-01-17 09:51:32"
+            "time": "2015-04-08 04:46:07"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.6.1",
+            "version": "4.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "08b2aacdd8433abbba468f995d6d64b76a7a62ec"
+                "reference": "163232991e652e6efed2f8470326fffa61e848e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/08b2aacdd8433abbba468f995d6d64b76a7a62ec",
-                "reference": "08b2aacdd8433abbba468f995d6d64b76a7a62ec",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/163232991e652e6efed2f8470326fffa61e848e2",
+                "reference": "163232991e652e6efed2f8470326fffa61e848e2",
                 "shasum": ""
             },
             "require": {
@@ -5607,9 +5665,6 @@
             "autoload": {
                 "classmap": [
                     "src/"
-                ],
-                "files": [
-                    "src/Framework/Assert/Functions.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5630,7 +5685,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-04-03 13:46:59"
+            "time": "2015-04-11 05:23:21"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -6118,7 +6173,8 @@
         "webpatser/laravel-countries": 20,
         "lokielse/omnipay-alipay": 20,
         "alfaproject/omnipay-neteller": 20,
-        "alfaproject/omnipay-skrill": 20
+        "alfaproject/omnipay-skrill": 20,
+        "omnipay/bitpay": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/config/app.php b/config/app.php
index 9a72079f9e25..a8dd21bff24c 100644
--- a/config/app.php
+++ b/config/app.php
@@ -13,7 +13,7 @@ return [
 	|
 	*/
 
-	'debug' => true,
+	'debug' => env('APP_DEBUG', ''),
 
 	/*
 	|--------------------------------------------------------------------------
@@ -80,7 +80,7 @@ return [
 
 	'key' => env('APP_KEY', ''),
 
-	'cipher' => MCRYPT_RIJNDAEL_128,
+	'cipher' => env('APP_CIPHER', MCRYPT_RIJNDAEL_128),
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/database/migrations/2014_10_01_141248_add_company_vat_number.php b/database/migrations/2014_10_01_141248_add_company_vat_number.php
index b93a217712ed..4222b2ee15fd 100644
--- a/database/migrations/2014_10_01_141248_add_company_vat_number.php
+++ b/database/migrations/2014_10_01_141248_add_company_vat_number.php
@@ -17,7 +17,7 @@ class AddCompanyVatNumber extends Migration {
 			$table->string('vat_number')->nullable();
 		});
         
-                Schema::table('clients', function($table)
+        Schema::table('clients', function($table)
 		{
 			$table->string('vat_number')->nullable();
 		});
@@ -34,7 +34,8 @@ class AddCompanyVatNumber extends Migration {
 		{
 			$table->dropColumn('vat_number');
 		});
-                Schema::table('clients', function($table)
+
+        Schema::table('clients', function($table)
 		{
 			$table->dropColumn('vat_number');
 		});	
diff --git a/database/migrations/2015_04_12_093447_add_sv_language.php b/database/migrations/2015_04_12_093447_add_sv_language.php
index 5b327827cf92..2228b6b3e94e 100644
--- a/database/migrations/2015_04_12_093447_add_sv_language.php
+++ b/database/migrations/2015_04_12_093447_add_sv_language.php
@@ -12,7 +12,8 @@ class AddSvLanguage extends Migration {
 	 */
 	public function up()
 	{
-		DB::table('languages')->insert(['name' => 'Swedish', 'locale' => 'sv']);
+        DB::table('languages')->insert(['name' => 'Swedish', 'locale' => 'sv']);
+        DB::table('languages')->insert(['name' => 'Spanish - Spain', 'locale' => 'es_ES']);
 	}
 
 	/**
@@ -22,8 +23,13 @@ class AddSvLanguage extends Migration {
 	 */
 	public function down()
 	{
-        $language = \App\Models\Language::whereLocale('sv')->first();
-        $language->delete();
+        if ($language = \App\Models\Language::whereLocale('sv')->first()) {
+            $language->delete();
+        }
+
+        if ($language = \App\Models\Language::whereLocale('es_ES')->first()) {
+            $language->delete();
+        }
 	}
 
 }
diff --git a/database/migrations/2015_04_13_100333_add_notify_approved.php b/database/migrations/2015_04_13_100333_add_notify_approved.php
new file mode 100644
index 000000000000..8f0a4fd74060
--- /dev/null
+++ b/database/migrations/2015_04_13_100333_add_notify_approved.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddNotifyApproved extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+        Schema::table('users', function($table)
+        {
+            $table->boolean('notify_approved')->default(true);
+        });
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+        Schema::table('users', function($table)
+        {
+            $table->dropColumn('notify_approved');
+        });
+	}
+
+}
diff --git a/database/migrations/2015_04_16_122647_add_partial_amount_to_invoices.php b/database/migrations/2015_04_16_122647_add_partial_amount_to_invoices.php
new file mode 100644
index 000000000000..eed323094502
--- /dev/null
+++ b/database/migrations/2015_04_16_122647_add_partial_amount_to_invoices.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddPartialAmountToInvoices extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+        Schema::table('invoices', function($table)
+        {
+            $table->decimal('partial', 13, 2)->nullable();
+        });
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+        Schema::table('invoices', function($table)
+        {
+            $table->dropColumn('partial');
+        });
+	}
+
+}
diff --git a/database/seeds/PaymentLibrariesSeeder.php b/database/seeds/PaymentLibrariesSeeder.php
index d676ea97058a..73b8090c73be 100644
--- a/database/seeds/PaymentLibrariesSeeder.php
+++ b/database/seeds/PaymentLibrariesSeeder.php
@@ -22,7 +22,8 @@ class PaymentLibrariesSeeder extends Seeder
 			['name' => 'PaymentSense', 'provider' => 'PaymentSense', 'payment_library_id' => 1],
 			['name' => 'Realex', 'provider' => 'Realex_Remote', 'payment_library_id' => 1],
 			['name' => 'Sisow', 'provider' => 'Sisow', 'payment_library_id' => 1],
-			['name' => 'Skrill', 'provider' => 'Skrill', 'payment_library_id' => 1]
+			['name' => 'Skrill', 'provider' => 'Skrill', 'payment_library_id' => 1],
+            ['name' => 'BitPay', 'provider' => 'BitPay', 'payment_library_id' => 1],
 		];
 		
 		foreach ($gateways as $gateway)
diff --git a/public/css/built.css b/public/css/built.css
index f3ee1192a763..bc5b107ccf87 100644
--- a/public/css/built.css
+++ b/public/css/built.css
@@ -2863,6 +2863,7 @@ body.modal-open { overflow:inherit; padding-right:inherit !important; }
 .radio input[type="radio"],
 .checkbox input[type="checkbox"] {
     margin-left: 0;
+    padding-left: 0px !important;
     margin-right: 5px;
     height: inherit;
     width: inherit;
@@ -2871,3 +2872,7 @@ body.modal-open { overflow:inherit; padding-right:inherit !important; }
     position: relative;
     margin-top: 3px;
 }
+
+div.checkbox > label {
+    padding-left: 0px !important;
+}
diff --git a/public/css/style.css b/public/css/style.css
index 963e607370c6..05e67cd404b3 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -792,6 +792,7 @@ body.modal-open { overflow:inherit; padding-right:inherit !important; }
 .radio input[type="radio"],
 .checkbox input[type="checkbox"] {
     margin-left: 0;
+    padding-left: 0px !important;
     margin-right: 5px;
     height: inherit;
     width: inherit;
@@ -800,3 +801,7 @@ body.modal-open { overflow:inherit; padding-right:inherit !important; }
     position: relative;
     margin-top: 3px;
 }
+
+div.checkbox > label {
+    padding-left: 0px !important;
+}
\ No newline at end of file
diff --git a/public/js/built.js b/public/js/built.js
index b7608fd24faa..f2489077e991 100644
--- a/public/js/built.js
+++ b/public/js/built.js
@@ -31896,6 +31896,12 @@ function GetPdf(invoice, javascript){
   //set default style for report
   doc.setFont('Helvetica','');
 
+  // For partial payments show "Amount Due" rather than "Balance Due"
+  if (!invoiceLabels.balance_due_orig) {
+    invoiceLabels.balance_due_orig = invoiceLabels.balance_due;
+  }
+  invoiceLabels.balance_due = NINJA.parseFloat(invoice.partial) ? invoiceLabels.amount_due : invoiceLabels.balance_due_orig;
+
   eval(javascript);
 
   // add footer
@@ -32528,13 +32534,20 @@ function displayInvoice(doc, invoice, x, y, layout, rightAlignX) {
 }
 
 function getInvoiceDetails(invoice) {
-  return [
+  var fields = [
     {'invoice_number': invoice.invoice_number},
     {'po_number': invoice.po_number},
     {'invoice_date': invoice.invoice_date},
     {'due_date': invoice.due_date},
-    {'balance_due': formatMoney(invoice.balance_amount, invoice.client.currency_id)},
   ];
+
+  if (NINJA.parseFloat(invoice.partial)) {
+    fields.push({'total': formatMoney(invoice.total_amount, invoice.client.currency_id)});
+  }
+
+  fields.push({'balance_due': formatMoney(invoice.balance_amount, invoice.client.currency_id)})
+
+  return fields;
 }
 
 function getInvoiceDetailsHeight(invoice, layout) {
@@ -32589,6 +32602,10 @@ function displaySubtotals(doc, layout, invoice, y, rightAlignTitleX)
     data.push({'paid_to_date': formatMoney(paid, invoice.client.currency_id)});
   }
 
+  if (NINJA.parseFloat(invoice.partial) && invoice.total_amount != invoice.subtotal_amount) {
+    data.push({'total': formatMoney(invoice.total_amount, invoice.client.currency_id)});
+  }
+
   var options = {
     hasheader: true,
     rightAlignX: 550,
@@ -32785,11 +32802,17 @@ function calculateAmounts(invoice) {
     total += roundToTwo(invoice.custom_value2);
   }
 
-  invoice.balance_amount = roundToTwo(total) - (roundToTwo(invoice.amount) - roundToTwo(invoice.balance));
+  invoice.total_amount = roundToTwo(total) - (roundToTwo(invoice.amount) - roundToTwo(invoice.balance));
   invoice.discount_amount = discount;
   invoice.tax_amount = tax;
   invoice.has_taxes = hasTaxes;
 
+  if (NINJA.parseFloat(invoice.partial)) {
+    invoice.balance_amount = roundToTwo(invoice.partial);
+  } else {
+    invoice.balance_amount = invoice.total_amount;
+  }
+
   return invoice;
 }
 
diff --git a/public/js/script.js b/public/js/script.js
index 81913aa4c396..680231a07262 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -83,6 +83,12 @@ function GetPdf(invoice, javascript){
   //set default style for report
   doc.setFont('Helvetica','');
 
+  // For partial payments show "Amount Due" rather than "Balance Due"
+  if (!invoiceLabels.balance_due_orig) {
+    invoiceLabels.balance_due_orig = invoiceLabels.balance_due;
+  }
+  invoiceLabels.balance_due = NINJA.parseFloat(invoice.partial) ? invoiceLabels.amount_due : invoiceLabels.balance_due_orig;
+
   eval(javascript);
 
   // add footer
@@ -715,13 +721,20 @@ function displayInvoice(doc, invoice, x, y, layout, rightAlignX) {
 }
 
 function getInvoiceDetails(invoice) {
-  return [
+  var fields = [
     {'invoice_number': invoice.invoice_number},
     {'po_number': invoice.po_number},
     {'invoice_date': invoice.invoice_date},
     {'due_date': invoice.due_date},
-    {'balance_due': formatMoney(invoice.balance_amount, invoice.client.currency_id)},
   ];
+
+  if (NINJA.parseFloat(invoice.partial)) {
+    fields.push({'total': formatMoney(invoice.total_amount, invoice.client.currency_id)});
+  }
+
+  fields.push({'balance_due': formatMoney(invoice.balance_amount, invoice.client.currency_id)})
+
+  return fields;
 }
 
 function getInvoiceDetailsHeight(invoice, layout) {
@@ -776,6 +789,10 @@ function displaySubtotals(doc, layout, invoice, y, rightAlignTitleX)
     data.push({'paid_to_date': formatMoney(paid, invoice.client.currency_id)});
   }
 
+  if (NINJA.parseFloat(invoice.partial) && invoice.total_amount != invoice.subtotal_amount) {
+    data.push({'total': formatMoney(invoice.total_amount, invoice.client.currency_id)});
+  }
+
   var options = {
     hasheader: true,
     rightAlignX: 550,
@@ -972,11 +989,17 @@ function calculateAmounts(invoice) {
     total += roundToTwo(invoice.custom_value2);
   }
 
-  invoice.balance_amount = roundToTwo(total) - (roundToTwo(invoice.amount) - roundToTwo(invoice.balance));
+  invoice.total_amount = roundToTwo(total) - (roundToTwo(invoice.amount) - roundToTwo(invoice.balance));
   invoice.discount_amount = discount;
   invoice.tax_amount = tax;
   invoice.has_taxes = hasTaxes;
 
+  if (NINJA.parseFloat(invoice.partial)) {
+    invoice.balance_amount = roundToTwo(invoice.partial);
+  } else {
+    invoice.balance_amount = invoice.total_amount;
+  }
+
   return invoice;
 }
 
diff --git a/readme.md b/readme.md
index 1ccf35513890..37236a85d6c3 100644
--- a/readme.md
+++ b/readme.md
@@ -3,7 +3,7 @@
 
 ### [https://www.invoiceninja.com](https://www.invoiceninja.com)
 
-#### Note: the application has recently been updated to Laravel 5. Please use the [1.7.x branch](https://github.com/hillelcoren/invoice-ninja/tree/1.7.x) for a more stable build.
+##### Please [click here](https://bitnami.com/stack/invoice-ninja) to vote for us to be added to Bitnami's one-click install library
 
 If you'd like to use our code to sell your own invoicing app we have an affiliate program. Get in touch for more details.
 
diff --git a/resources/lang/da/texts.php b/resources/lang/da/texts.php
index 80cda729a834..59c05e563509 100644
--- a/resources/lang/da/texts.php
+++ b/resources/lang/da/texts.php
@@ -580,5 +580,19 @@ return array(
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
   'converted' => 'Converted',
+
+  'email_approved' => 'Email me when a quote is <b>approved</b>',
+  'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
+  'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
+
+  'gateway_help_42' => 'Note: use a BitPay Legacy API Key, not an API token.',
+  'payment_type_credit_card' => 'Credit card',
+  'payment_type_paypal' => 'PayPal',
+  'payment_type_bitcoin' => 'Bitcoin',
+  'knowledge_base' => 'Knowledge Base',
+  'partial' => 'Partial',
+  'partial_remaining' => ':partial of :balance',
     
 );
diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index cdb8b241bc4d..646ebf4af9e9 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -543,34 +543,48 @@ return array(
   'delete_token' => 'Token löschen',
   'token' => 'Token',
 
-  'add_gateway' => 'Add Gateway',
-  'delete_gateway' => 'Delete Gateway',
-  'edit_gateway' => 'Edit Gateway',
-  'updated_gateway' => 'Successfully updated gateway',
-  'created_gateway' => 'Successfully created gateway',
-  'deleted_gateway' => 'Successfully deleted gateway',
+  'add_gateway' => 'Zahlungsanbieter hinzufügen',
+  'delete_gateway' => 'Zahlungsanbieter löschen',
+  'edit_gateway' => 'Zahlungsanbieter bearbeiten',
+  'updated_gateway' => 'Zahlungsanbieter aktualisiert',
+  'created_gateway' => 'Zahlungsanbieter erfolgreich hinzugefügt',
+  'deleted_gateway' => 'Zahlungsanbieter erfolgreich gelöscht',
   'pay_with_paypal' => 'PayPal',
-  'pay_with_card' => 'Credit card',
+  'pay_with_card' => 'Kreditkarte',
 
   'change_password' => 'Passwort ändern',
   'current_password' => 'Aktuelles Passwort',
   'new_password' => 'Neues Passwort',
   'confirm_password' => 'Passwort bestätigen',
   'password_error_incorrect' => 'Das aktuelle Passwort ist nicht korrekt.',
-  'password_error_invalid' => 'Das neue Kennwort ist ungültig.',
+  'password_error_invalid' => 'Das neue Passwort ist ungültig.',
   'updated_password' => 'Passwort erfolgreich aktualisiert',
 
-  'api_tokens' => 'API Tokens',
-  'users_and_tokens' => 'Users & Tokens',
+  'api_tokens' => 'API Token',
+  'users_and_tokens' => 'Benutzer & Token',
   'account_login' => 'Account Login',
-  'recover_password' => 'Recover your password',
-  'forgot_password' => 'Forgot your password?',
-  'email_address' => 'Email address',
-  'lets_go' => 'Let’s go',
-  'password_recovery' => 'Password Recovery',
-  'send_email' => 'Send email',
-  'set_password' => 'Set Password',
-  'converted' => 'Converted',
-    
+  'recover_password' => 'Passwort wiederherstellen',
+  'forgot_password' => 'Passwort vergessen?',
+  'email_address' => 'E-Mail-Adresse',
+  'lets_go' => "Auf geht's",
+  'password_recovery' => 'Passwort Wiederherstellung',
+  'send_email' => 'E-Mail verschicken',
+  'set_password' => 'Passwort festlegen',
+  'converted' => 'Umgewandelt',
 
-);
+  'email_approved' => 'Per E-Mail benachrichtigen, wenn ein Angebot  <b>angenommen</b> wurde',
+  'notification_quote_approved_subject' => 'Angebot :invoice wurde von :client angenommen.',
+  'notification_quote_approved' => 'Der folgende Kunde :client nahm das Angebot :invoice über :amount an.',
+  'resend_confirmation' => 'Bestätigungsmail erneut senden',
+  'confirmation_resent' => 'Bestätigungsemail wurde erneut gesendet',
+
+  'gateway_help_42' => 'Note: use a BitPay Legacy API Key, not an API token.',
+  'payment_type_credit_card' => 'Credit card',
+  'payment_type_paypal' => 'PayPal',
+  'payment_type_bitcoin' => 'Bitcoin',
+  'knowledge_base' => 'Knowledge Base',
+  'partial' => 'Partial',
+  'partial_remaining' => ':partial of :balance',
+
+
+);
\ No newline at end of file
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 8c3959020dc3..3ab0a35d27ee 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -173,7 +173,7 @@ return array(
   'are_you_sure' => 'Are you sure?',
 
   // payment pages
-  'payment_type_id' => 'Payment type',
+  'payment_type_id' => 'Payment Type',
   'amount' => 'Amount',
 
   // account/company pages
@@ -187,7 +187,7 @@ return array(
   'remove_logo' => 'Remove logo',
   'logo_help' => 'Supported: JPEG, GIF and PNG. Recommended size: 200px width by 120px height',
   'payment_gateway' => 'Payment Gateway',
-  'gateway_id' => 'Provider',
+  'gateway_id' => 'Gateway',
   'email_notifications' => 'Email Notifications',
   'email_sent' => 'Email me when an invoice is <b>sent</b>',
   'email_viewed' => 'Email me when an invoice is <b>viewed</b>',
@@ -578,6 +578,20 @@ return array(
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
   'converted' => 'Converted',
+
+  'email_approved' => 'Email me when a quote is <b>approved</b>',
+  'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
+  'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
   
-  
+  'gateway_help_42' => 'Note: use a BitPay Legacy API Key, not an API token.',
+  'payment_type_credit_card' => 'Credit card',
+  'payment_type_paypal' => 'PayPal',
+  'payment_type_bitcoin' => 'Bitcoin',
+  'knowledge_base' => 'Knowledge Base',
+  'partial' => 'Partial',
+  'partial_remaining' => ':partial of :balance',
+
+
 );
diff --git a/resources/lang/es/texts.php b/resources/lang/es/texts.php
index 2a06257d8c4b..e00057bcbb98 100644
--- a/resources/lang/es/texts.php
+++ b/resources/lang/es/texts.php
@@ -550,7 +550,21 @@ return array(
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
   'converted' => 'Converted',
-    
+  
+  'email_approved' => 'Email me when a quote is <b>approved</b>',
+  'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
+  'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
+
+  'gateway_help_42' => 'Note: use a BitPay Legacy API Key, not an API token.',
+  'payment_type_credit_card' => 'Credit card',
+  'payment_type_paypal' => 'PayPal',
+  'payment_type_bitcoin' => 'Bitcoin',
+  'knowledge_base' => 'Knowledge Base',
+  'partial' => 'Partial',
+  'partial_remaining' => ':partial of :balance',
+
 
 
 );
\ No newline at end of file
diff --git a/resources/lang/es_ES/pagination.php b/resources/lang/es_ES/pagination.php
new file mode 100644
index 000000000000..9cbe91da3011
--- /dev/null
+++ b/resources/lang/es_ES/pagination.php
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Anterior',
+
+    'next'     => 'Siguiente &raquo;',
+
+);
diff --git a/resources/lang/es_ES/public.php b/resources/lang/es_ES/public.php
new file mode 100644
index 000000000000..7f5ecb9008e2
--- /dev/null
+++ b/resources/lang/es_ES/public.php
@@ -0,0 +1,209 @@
+<?php 
+
+return [
+  
+  'title' => 'Free Open-Source Online Invoicing',
+  'description' => 'Invoice Ninja is a free, open-source solution for invoicing and billing customers. With Invoice Ninja, you can easily build and send beautiful invoices from any device that has access to the web. Your clients can print your invoices, download them as pdf files, and even pay you online from within the system.',
+  'invoice_now' => 'Invoice Now',
+  'no_signup_needed' => 'No signup needed',
+
+  'link_blog' => 'Blog',
+  'link_about_us' => 'About Us',
+  'link_contact_us' => 'Contact Us',
+  'link_features' => 'Features',
+  'link_plans' => 'Plans',
+  'link_compare' => 'Compare',
+  'link_testimonials' => 'Testimonials',
+  'link_faq' => 'FAQ',
+
+  'my_account' => 'My Account',
+  'login' => 'Login',
+  'connect_with_us' => 'Connect with Us',
+  'safe_and_secure' => 'Safe & Secure',
+  'toggle_navigation' => 'Toggle navigation',
+
+
+  'home' => [
+    'header' => 'THE <span style="color:#2299c0">SIMPLE</span> &amp; <span style="color:#edd71e">FREE</span> WAY TO INVOICE CLIENTS',
+    'sub_header' => 'It\'s just that easy. Stop spending time on complicated and expensive invoicing.<br>No fuss, just get started and get paid.',
+    'footer' => '<span>Simple, Intuitive Invoicing,</span>Anywhere.',
+
+    'free_always' => 'Free, Always',
+    'free_always_text' => 'Send unlimited invoices to 500 clients per month and never pay a dime. You are welcome to unlock still more awesome features with our Pro Plan, but our free app is a top-notch product that will do everything you need it to do, without any subscription or fees.',
+
+    'open_source' => 'Open-Source',
+    'open_source_text' => 'No mysterious corporate silos here! Just full <a href="https://github.com/hillelcoren/invoice-ninja" target="_blank">source code</a> transparency and a devotion to working with anyone interested to build a better electronic invoicing platform. We even offer a handy <a href="http://hillelcoren.com/invoice-ninja/self-hosting/" target="_blank">zip download</a> for a self-hosted version of Invoice Ninja.',
+
+    'live_pdf' => 'Live .PDF View',
+    'live_pdf_text' => 'See how your edited invoice will look as a print-friendly pdf while you make the changes. Our pdf generator works in real time as you make your changes. You can even preview four beautiful preset designs. Just create, save, send, and you’re done!',
+
+    'online_payments' => 'Online Payments',
+    'online_payments_text' => 'Invoices sent with our app integrate seamlessly with the gateway credit card processor of your choice, to make it super easy for your clients to send you money with just a few clicks. We play nicely with Authorize.Net, Stripe, PayPal and loads more - 23 in all!',
+  ],
+
+  'about' => [
+    'header' => '<span class="thin">About</span> Invoice Ninja',
+    'what_is' => 'What is Invoice Ninja?',
+
+    'team_ninja' => 'Team Ninja',
+    'team_ninja_text' => 'Invoice Ninja is managed by a team of seasoned web workers. We launched in early 2014 and have been thrilled by the enthusiastic response we’ve received from our growing community of users.',
+
+    'co_founder' => 'Co-Founder',
+    'ceo' => 'CEO',
+    'cto' => '',
+    'designer' => 'Designer',
+    'marketing' => 'Marketing',
+
+    'shalom_bio' => 'Shalom has specialized in small business development for nearly 10 years. In addition to InvoiceNinja.com Shalom is CEO of a leading tour agency in Israel.',
+    'hillel_bio' => 'Hillel has been developing enterprise applications for 15 years. His open-source <a href="http://hillelcoren.com/flex-autocomplete/" target="_blank">AutoComplete</a> component has been used by thousands of developers around the world.',
+    'razi_bio' => 'Razi is a pixel nerd with a great deal of experience in design for web sites and applications. When she isn\'t busy with InvoiceNinja she runs a small web agency in Stockholm called kantorp-wegl.in',
+    'ben_bio' => 'A veteran digital marketer and content strategist, Ben specializes in building communities around brands that make business easier for freelancers, SMBs and micro-entrepreneurs.',    
+  ],
+
+  'contact' => [
+    'header' => 'Questions, special requests, or just want to say hi?',
+    'sub_header' => 'Fill in the form below and we\'ll get back to you as soon as possible. Hope to hear from you!',
+    'other_ways' => 'Other ways to reach us',
+    
+    'name' => 'Name',
+    'name_help' => 'Please enter your name.',
+
+    'email' => 'Email Address',
+    'email_help' => 'Please enter a valid e-mail address.',
+
+    'message' => 'Message',
+    'message_help' => 'Please enter a message.',    
+    'send_message' => 'Send Message',
+  ],
+
+  'features' => [
+    'header' => '<span class="thin">The</span> Features',
+    'footer' => 'Like what you see?',
+    'footer_action' => 'Get started today!',
+
+    'open_source' => 'Open Source Platform',
+    'open_source_text1' => 'Set the code free! Here at Invoice Ninja, we’re all about creating the best possible app, and inviting scrutiny via full code transparency is a central manifestation of this value.',
+    'open_source_text2' => 'We firmly believe that being an open source product helps everyone involved. We’re looking forward to seeing what the developers out there can do to take Invoice Ninja into new realms of usefulness.',
+
+    'free_forever' => 'FREE. Forever.',
+    'free_forever_text1' => 'Yeah, you read that correctly. You don’t have to pay us a cent to use our tools. We know how tough it is to make ends meet as a web-based business, and we’re bent on providing a top-notch product that will do everything you need it to do, without any subscription or opt-in fees.',
+    'free_forever_text2' => 'Try Invoice Ninja out. You literally have nothing to lose. We’re confident that you’ll find the experience so positive that you’ll never need to turn elsewhere.',
+
+    'secure' => 'Secure & Private',
+    'secure_text1' => 'Invoice Ninja has been built from the ground up to keep your data safe. Only you have access to your login & accounting details, & we will never share your transaction data to any third party.',
+    'secure_text2' => 'Our website operates with 256-bit encryption, which is even more secure than most banking websites. Invoice Ninja uses the TLS 1.0 cryptographic protocol, AES_256_CBC string encryption, SHA1 message authentication and DHE_RSA key exchanges. We feel safe here and have invested heavily in measures to ensure that you do too.',
+
+    'live_pdf' => 'Live .PDF View',
+    'live_pdf_text1' => 'With Invoice Ninja, we’ve done away with the need for cumbersome multi-click invoice previewing after each save.',
+    'live_pdf_text2' => 'When you enter the details of your customer and/or invoice in our editor, you can instantly see the results in the pdf preview pane below. Want to see what your invoice would look like in a different layout style? The live pdf can show you four beautiful preset styles in real time too.',
+    'live_pdf_text3' => 'Just create, save, send, and you’re done!',
+
+    'online_payments' => 'Online Payments',
+    'online_payments_text1' => 'Invoice Ninja seamlessly integrates with all of the top internet payment processors and gateways so you can get paid for your work quickly and easily.',
+    'online_payments_text2' => 'Invoices created with our tools aren’t just for bookkeeping purposes - they bring in the Benjamins. We also make it super easy to choose the right gateway for the specific needs of your business and are happy to help you to get started working with the gateway of your choice. What’s more, we’re constantly working on rolling out additional gateway integrations, so if you don’t see the one you use here, just let us know, and there’s a good chance we’ll add it for you.',
+  ],
+
+  'plans' => [
+    'header' => '<span class="thin">The</span> Plans',
+    'free' => 'Free',
+    'unlimited' => 'Unlimited',
+    'pro_plan' => 'Pro Plan',
+
+    'go_pro' => 'Go Pro to Unlock Premium Invoice Ninja Features',
+    'go_pro_text' => 'We believe that the free version of Invoice Ninja is a truly awesome product loaded with the key features you need to bill your clients electronically. But for those who crave still more Ninja awesomeness, we\'ve unmasked the Invoice Ninja Pro plan, which offers more versatility, power and customization options for just $50 per year.',
+
+    'number_clients' => 'Number of clients per account',
+    'unlimited_invoices' => 'Unlimited client invoices',
+    'company_logo' => 'Add your company logo',
+    'live_pdf' => 'Live .PDF invoice creation',
+    'four_templates' => '4 beautiful invoice templates',
+    'payments' => 'Accept credit card payments',
+    'additional_templates' => 'Additional invoice templates',
+    'multi_user' => 'Multi-user support',
+    'quotes' => 'Quotes/pro-forma invoices',
+    'advanced_settings' => 'Advanced invoice settings',
+    'data_vizualizations' => 'Dynamic data vizualizations',
+    'email_support' => 'Priority email support',
+    'remove_created_by' => 'Remove "Created by Invoice Ninja"',
+    'latest_features' => 'Latest and greatest features',
+    'pricing' => 'Pricing',
+    'free_always' => 'Free<span> /Always!</span>',
+    'year_price' => '$50<span> /Year</span>',
+  ],
+
+  'compare' => [
+    'header' => '<span class="thin">How We</span> Compare',
+    'free_plan_comparison' => 'Free Plan Comparison',
+    'paid_plan_comparison' => 'Paid Plan Comparison',
+    'app' => 'App',
+    'cost' => 'Cost',
+    'clients' => 'Clients',
+    'invoices' => 'Invoices',
+    'payment_gateways' => 'Payment Gateways',
+    'custom_logo' => 'Custom Logo',
+    'multiple_templates' => 'Multiple Templates',
+    'recurring_payments' => 'Recurring Payments',
+    'open_source' => 'Open Source',
+    'per_month' => 'per month',
+    'per_year' => 'per year',
+    'free' => 'Free',
+    'unlimited' => 'Unlimited',
+  ],
+
+  'testimonials' => [
+    'testimonials' => 'testimonials',
+    'header' => 'Since we launched Invoice Ninja in March of 2014, we\'ve been overwhelmed by a deluge of user love. Here\'s a small taste of the glowing things people have to say about the great experiences the\'ve been having with our free e-invoicing app!',
+  ],
+
+  'faq' => [
+    'header' => '<span class="thin">The</span> FAQs',
+
+    'question1' => 'I know it isn’t standard ninja practice to reveal too many identity details, but who are you guys exactly?',
+    'answer1' => 'We’re a small team of highly skilled digital journeymen based in Israel. We love open source, we love disrupting the big business status quo, and we love building helpful tools that are easy to use. We believe that everyone else’s web-based cash flow tools are unnecessarily expensive, clunky and complicated - and we’re bent on proving these beliefs with Invoice Ninja.',
+
+    'question2' => 'How do I get started using Invoice Ninja?',
+    'answer2' => 'Just click on the big, yellow "Invoice Now" button on our homepage!',
+
+    'question3' => 'Do you offer customer support?',
+    'answer3' => 'We sure do. Support is super important to us. Feel free to email us at <a href="mailto:support@invoiceninja.com">support@invoiceninja.com</a> with any questions you might have. We almost always reply within one business day.',
+
+    'question4' => 'Is Invoice Ninja really free? For how long?',
+    'answer4' => 'Yes, our basic app is 100% free. Forever and ever. For real. We also offer a paid Pro version of Invoice Ninja (you can learn all about its awesome features <a href="https://www.invoiceninja.com/plans">here</a>), but it\'s important to us that the free version have all of the key features people need to do business.',
+
+    'question5' => 'How is Invoice Ninja able to offer this all for free? How are you making any money?',
+    'answer5' => 'We’re mostly in this line of work because we believe it’s high time that a good electronic invoicing tool be available for free. There isn’t much money in it - yet. We do offer a paid <a href="https://www.invoiceninja.com/plans">Pro </a> version of the app that we\'ve souped up with premium features. And when our users open up new accounts with payment processor gateways by clicking on links from our site, we make modest commissions as a gateway affiliate. So if zillions of freelancers and small businesses start running credit card charges through Invoice Ninja, or if scores of users go <a href="https://www.invoiceninja.com/plans">Pro</a>, there’s a decent chance we\'ll recover our investment.',
+
+    'question6' => 'Really? So does that mean you’re not collecting information about me so you can sell me stuff or so that some other company can spam me according to my interests?',
+    'answer6' => 'No way. We’re not mining your data, and we’re not selling you out. That wouldn’t be very ninja of us, would it?',
+
+    'question7' => 'But don’t you have access to my merchant and banking accounts?',
+    'answer7' => 'Actually, we don’t. When you link an account at a third party financial institution with your Invoice Ninja account, you’re essentially giving our app permission to send money to you and nothing more. This is all managed by the tech teams at your financial service providers, who go to great lengths to ensure their integrations can’t be exploited or abused.',
+
+    'question8' => 'Given that Invoice Ninja is an open source app, how can I be sure that my financial information is safe with you?',
+    'answer8' => 'There\'s a big difference between “open source" and “open data.” Anyone who wants to use the code that drives Invoice Ninja to create their own products or to make improvements to ours can do so. It’s available for anyone who wants to download and work with. But that’s just the source code - totally separate from what happens with that code on the Invoice Ninja servers. You’re the only one who has full access to what you\'re doing with our product. For more details on the security of our servers and how we handle our users\' information, please read the next question.',
+
+    'question9' => 'So just how secure is this app?',
+    'answer9' => 'Extremely. Data uploaded by our users runs through connections with 256-bit encryption, which is twice as many encryption bits that most bank websites use. We use the TLS 1.0 cryptographic protocol, AES_256_CBC string encryption, SHA1 message authentication and DHE_RSA key exchanges. It’s fancy stuff that we put in place to make sure no one can gain access to your information except you.',
+
+    'question10' => 'How do I remove the small "Created by Invoice Ninja” image from the bottom of my invoices?',
+    'answer10' => 'The amazingly affordable <a href="https://www.invoiceninja.com/plans">Pro</a> version of Invoice Ninja allows you to do this and oh so much more.',
+
+    'question11' => 'Can I see what the application looks like with sample data?',
+    'answer11' => 'Sure, <a href="https://www.invoiceninja.com/demo">click here</a> to try out our demo account.',
+
+    'question12' => 'I hear that there\'s a version of Invoice Ninja that I can install myself on my own servers? Where can I learn more about this?',
+    'answer12' => 'The rumors are true! Full instructions are available <a href="http://hillelcoren.com/invoice-ninja/self-hosting/" target="_blank">here</a>.',
+
+    'question13' => 'I\'m seeing the options to assign various statuses to my invoices, clients, credits and payments. What\'s the difference between "active," "archived" and "deleted"?',
+    'answer13' => 'These three handy statuses for invoices, clients, credits and payments allow you to keep your own cash flow management as straightforward and accessible as possible from your Invoice Ninja dashboard. None of these statuses will actually purge any records from your account - even "deleted" can always be recovered at any point in the future. "Active" means the record will appear in the relevant queue of records. To stash a record away so it\'s still fully operational but no longer cluttering up your interface, simply set it to be "archived." To deactivate a record and render it inaccessible to your clients, mark it "deleted."',
+
+    'question14' => 'My question wasn\'t covered by any of the content on this FAQ page. How can I get in touch with you?',
+    'answer14' => 'Please email us at <a href="mailto:contact@invoiceninja.com">contact@invoiceninja.com</a> with any questions or comments you have. We love hearing from the people who use our app! We’ll do our best to reply to your email within the business day.',
+
+    'miss_something' => 'Did we miss something?',
+    'miss_something_text' => 'Please email us at <a href="mailto:contact@invoiceninja.com" style="font-weight: bold">contact@invoiceninja.com</a> with any questions or comments you have. We love hearing from the people who use our app! We’ll do our best to reply to your email within the business day.',
+
+  ],
+
+
+];
\ No newline at end of file
diff --git a/resources/lang/es_ES/reminders.php b/resources/lang/es_ES/reminders.php
new file mode 100644
index 000000000000..094e8788814b
--- /dev/null
+++ b/resources/lang/es_ES/reminders.php
@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "password" => "Las contraseñas deben contener al menos 6 caracteres y coincidir.",
+
+    "user"     => "No podemos encontrar a un usuario con ese correo electrónico.",
+
+    "token"    => "Este token de recuperación de contraseña es inválido.",
+
+    "sent"     => "¡Recordatorio de contraseña enviado!",
+
+);
diff --git a/resources/lang/es_ES/texts.php b/resources/lang/es_ES/texts.php
new file mode 100644
index 000000000000..0fbf4030239e
--- /dev/null
+++ b/resources/lang/es_ES/texts.php
@@ -0,0 +1,598 @@
+<?php
+
+return array(
+
+   // client
+   'organization' => 'Empresa',
+   'name' => 'Nombre de Empresa',
+   'website' => 'Sitio Web',
+   'work_phone' => 'Teléfono',
+   'address' => 'Dirección',
+   'address1' => 'Calle',
+   'address2' => 'Bloq/Pta',
+   'city' => 'Ciudad',
+   'state' => 'Provincia',
+   'postal_code' => 'Código Postal',
+   'country_id' => 'País',
+   'contacts' => 'Contactos',
+   'first_name' => 'Nombres',
+   'last_name' => 'Apellidos',
+   'phone' => 'Teléfono',
+   'email' => 'Email',
+   'additional_info' => 'Información adicional',
+   'payment_terms' => 'Plazos de pago', //
+   'currency_id' => 'Divisa',
+   'size_id' => 'Tamaño',
+   'industry_id' => 'Industria',
+   'private_notes' => 'Notas Privadas',
+
+   // invoice
+   'invoice' => 'Factura',
+   'client' => 'Cliente',
+   'invoice_date' => 'Fecha de factura',
+   'due_date' => 'Fecha de pago',
+   'invoice_number' => 'Número de Factura',
+   'invoice_number_short' => 'Factura Nº',
+   'po_number' => 'Apartado de correo',
+   'po_number_short' => 'Apdo.',
+   'frequency_id' => 'Frecuencia',
+   'discount' => 'Descuento',
+   'taxes' => 'Impuestos',
+   'tax' => 'IVA', 
+   'item' => 'Concepto',
+   'description' => 'Descripción',
+   'unit_cost' => 'Coste unitario',
+   'quantity' => 'Cantidad',
+   'line_total' => 'Total',
+   'subtotal' => 'Subtotal',
+   'paid_to_date' => 'Pagado',
+   'balance_due' => 'Pendiente',
+   'invoice_design_id' => 'Diseño',
+   'terms' => 'Términos',
+   'your_invoice' => 'Tu factura',
+   'remove_contact' => 'Eliminar contacto',
+   'add_contact' => 'Añadir contacto',
+   'create_new_client' => 'Crear nuevo cliente',
+   'edit_client_details' => 'Editar detalles del cliente',
+   'enable' => 'Activar',
+   'learn_more' => 'Saber más',
+   'manage_rates' => 'Gestionar tarifas',
+   'note_to_client' => 'Nota para el cliente',
+   'invoice_terms' => 'Términos de facturación',
+   'save_as_default_terms' => 'Guardar como términos por defecto',
+   'download_pdf' => 'Descargar PDF',
+   'pay_now' => 'Pagar Ahora',
+   'save_invoice' => 'Guardar factura',
+   'clone_invoice' => 'Clonar factura',
+   'archive_invoice' => 'Archivar factura',
+   'delete_invoice' => 'Eliminar factura',
+   'email_invoice' => 'Enviar factura por email',
+   'enter_payment' => 'Agregar pago',
+   'tax_rates' => 'Tasas de impuesto',
+   'rate' => 'Tasas',
+   'settings' => 'Configuración',
+   'enable_invoice_tax' => 'Activar impuesto <b>para la factura</b>',
+   'enable_line_item_tax' => 'Activar impuesto <b>por concepto</b>',
+
+   // navigation
+   'dashboard' => 'Inicio',
+   'clients' => 'Clientes',
+   'invoices' => 'Facturas',
+   'payments' => 'Pagos',
+   'credits' => 'Créditos',
+   'history' => 'Historial',
+   'search' => 'Búsqueda',
+   'sign_up' => 'Registrarse',
+   'guest' => 'Invitado',
+   'company_details' => 'Detalles de la Empresa',
+   'online_payments' => 'Pagos en Linea',
+   'notifications' => 'Notificaciones',
+   'import_export' => 'Importar/Exportar',
+   'done' => 'Hecho',
+   'save' => 'Guardar',
+   'create' => 'Crear',
+   'upload' => 'Subir',
+   'import' => 'Importar',
+   'download' => 'Descargar',
+   'cancel' => 'Cancelar',
+   'close' => 'Cerrar',
+   'provide_email' => 'Por favor facilita una dirección de correo válida.',
+   'powered_by' => 'Creado por',
+   'no_items' => 'No hay datos',
+
+   // recurring invoices
+   'recurring_invoices' => 'Facturas recurrentes',
+   'recurring_help' => '<p>Enviar facturas automáticamente a clientes semanalmente, bi-mensualmente, mensualmente, trimestral o anualmente. </p>
+   <p>Uso :MONTH, :QUARTER or :YEAR para fechas dinámicas. Matemáticas básicas también funcionan bien. Por ejemplo: :MONTH-1.</p>
+   <p>Ejemplos de variables dinámicas de factura:</p>
+   <ul>
+      <li>"Afiliación de gimnasio para el mes de:MONTH" => Afiliación de gimnasio para el mes de julio"</li>
+      <li>":YEAR+1 suscripción anual" => "2015 suscripción anual"</li>
+      <li>"Retainer payment for :QUARTER+1" => "Pago anticipo de pagos para T2"</li>
+   </ul>',
+
+   // dashboard
+   'in_total_revenue' => 'Ingreso Total',
+   'billed_client' => 'Cliente Facturado',
+   'billed_clients' => 'Clientes Facturados',
+   'active_client' => 'Cliente Activo',
+   'active_clients' => 'Clientes Activos', 
+   'invoices_past_due' => 'Facturas Vencidas',
+   'upcoming_invoices' => 'Próximas Facturas',
+   'average_invoice' => 'Promedio de Facturación',
+
+      // list pages
+    'archive' => 'Archivar',
+    'delete' => 'Eliminar',
+    'archive_client' => 'Archivar Cliente',
+    'delete_client' => 'Eliminar Cliente',
+    'archive_payment' => 'Archivar Pago',
+    'delete_payment' => 'Eliminar Pago',
+    'archive_credit' => 'Archivar Crédito',
+    'delete_credit' => 'Eliminar Crédito',
+    'show_archived_deleted' => 'Mostrar archivados o eliminados en ',
+    'filter' => 'Filtrar',
+    'new_client' => 'Nuevo Cliente',
+    'new_invoice' => 'Nueva Factura',
+    'new_payment' => 'Nuevo Pago',
+    'new_credit' => 'Nuevo Crédito',
+    'contact' => 'Contacto',
+    'date_created' => 'Fecha de Creación',
+    'last_login' => 'Último Acceso',
+    'balance' => 'Balance',
+    'action' => 'Acción',
+    'status' => 'Estado',
+    'invoice_total' => 'Total Facturado',
+    'frequency' => 'Frequencia',
+    'start_date' => 'Fecha de Inicio',
+    'end_date' => 'Fecha de Finalización',
+    'transaction_reference' => 'Referencia de Transacción',
+    'method' => 'Método',
+    'payment_amount' => 'Valor del Pago',
+    'payment_date' => 'Fecha de Pago',
+    'credit_amount' => 'Cantidad de Crédito',
+    'credit_balance' => 'Balance de Crédito',
+    'credit_date' => 'Fecha de Crédito',
+    'empty_table' => 'Tabla vacía',
+    'select' => 'Seleccionar',
+    'edit_client' => 'Editar Cliente',
+    'edit_invoice' => 'Editar Factura',
+
+    // client view page
+    'create_invoice' => 'Crear Factura',
+    'Create Invoice' => 'Crear Factura',
+    'enter_credit' => 'Agregar Crédito',
+    'last_logged_in' => 'Último inicio de sesión',
+    'details' => 'Detalles',
+    'standing' => 'Situación', //
+    'credit' => 'Crédito',
+    'activity' => 'Actividad',
+    'date' => 'Fecha',
+    'message' => 'Mensaje',
+    'adjustment' => 'Ajustes',
+    'are_you_sure' => '¿Está Seguro?',
+
+   // payment pages
+   'payment_type_id' => 'Tipo de pago',
+   'amount' => 'Cantidad',
+   
+       // Nuevo texto extraido - New text extracted
+   'Recommended Gateway' => 'Pasarelas Recomendadas',//
+   'Accepted Credit Cards' => 'Tarjetas de Credito Permitidas',//
+   'Payment Gateway' => 'Pasarelas de Pago',//
+   'Select Gateway' => 'Seleccione Pasarela',//
+   'Enable' => 'Activo',//
+   'Api Login Id' => 'Introduzca Api Id',//
+   'Transaction Key' => 'Clave de Transacción',//
+   'Create an account' => 'Crear cuenta nueva',//
+   'Other Options' => 'Otras Opciones',//
+
+   // account/company pages
+   'work_email' => 'Correo electrónico de la empresa',
+   'language_id' => 'Idioma',
+   'timezone_id' => 'Zona horaria',
+   'date_format_id' => 'Formato de fecha',
+   'datetime_format_id' => 'Format de fecha/hora',
+   'users' => 'Usuarios',
+   'localization' => 'Localización',
+   'remove_logo' => 'Eliminar logo',
+   'logo_help' => 'Formatos aceptados: JPEG, GIF y PNG. Altura recomendada: 120px',
+   'payment_gateway' => 'Pasarela de pago',
+   'gateway_id' => 'Proveedor',
+   'email_notifications' => 'Notificaciones de email',
+   'email_sent' => 'Avísame por email cuando una factura <b>se envía</b>',
+   'email_viewed' => 'Avísame por email cuando una factura <b>se visualiza</b>',
+   'email_paid' => 'Avísame por email cuando una factura <b>se paga</b>',
+   'site_updates' => 'Actualizaciones del sitio',
+   'custom_messages' => 'Mensajes a medida',
+   'default_invoice_terms' => 'Configurar términos de factura por defecto',
+   'default_email_footer' => 'Configurar firma de email por defecto',
+   'import_clients' => 'Importar datos del cliente',
+   'csv_file' => 'Seleccionar archivo CSV',
+   'export_clients' => 'Exportar datos del cliente',
+   'select_file' => 'Seleccionar archivo',
+   'first_row_headers' => 'Usar la primera fila como encabezados',
+   'column' => 'Columna',
+   'sample' => 'Ejemplo',
+   'import_to' => 'Importar a',
+   'client_will_create' => 'cliente se creará',
+   'clients_will_create' => 'clientes se crearan',
+
+   // application messages
+   'created_client' => 'cliente creado con éxito',
+   'created_clients' => ':count clientes creados con éxito',
+   'updated_settings' => 'Configuración actualizada con éxito',
+   'removed_logo' => 'Logo eliminado con éxito',
+   'sent_message' => 'Mensaje enviado con éxito',
+   'invoice_error' => 'Seleccionar cliente y corregir errores.',
+   'limit_clients' => 'Lo sentimos, se ha pasado del límite de :count clientes',
+   'payment_error' => 'Ha habido un error en el proceso de tu pago. Inténtalo de nuevo más tarde.',
+   'registration_required' => 'Inscríbete para enviar una factura',
+   'confirmation_required' => 'Por favor confirma tu dirección de correo electrónico',
+
+   'updated_client' => 'Cliente actualizado con éxito',
+   'created_client' => 'Cliente creado con éxito',
+   'archived_client' => 'Cliente archivado con éxito',
+   'archived_clients' => ':count clientes archivados con éxito',
+   'deleted_client' => 'Cliente eliminado con éxito',
+   'deleted_clients' => ':count clientes eliminados con éxito',
+
+   'updated_invoice' => 'Factura actualizada con éxito',
+   'created_invoice' => 'Factura creada con éxito',
+   'cloned_invoice' => 'Factura clonada con éxito',
+   'emailed_invoice' => 'Factura enviada con éxito',
+   'and_created_client' => 'y cliente creado ',
+   'archived_invoice' => 'Factura archivada con éxito',
+   'archived_invoices' => ':count facturas archivados con éxito',
+   'deleted_invoice' => 'Factura eliminada con éxito',
+   'deleted_invoices' => ':count facturas eliminadas con éxito',
+
+   'created_payment' => 'Pago creado con éxito',
+   'archived_payment' => 'Pago archivado con éxito',
+   'archived_payments' => ':count pagos archivados con éxito',
+   'deleted_payment' => 'Pago eliminado con éxito',
+   'deleted_payments' => ':count pagos eliminados con éxito',
+   'applied_payment' => 'Pago aplicado con éxito',
+
+   'created_credit' => 'Crédito creado con éxito',
+   'archived_credit' => 'Crédito archivado con éxito',
+   'archived_credits' => ':count creditos archivados con éxito',
+   'deleted_credit' => 'Créditos eliminados con éxito',
+   'deleted_credits' => ':count creditos eliminados con éxito',
+
+   // Emails
+   'confirmation_subject' => 'Corfimación de tu cuenta en Invoice Ninja',
+   'confirmation_header' => 'Confirmación de Cuenta',
+   'confirmation_message' => 'Por favor, haz clic en el enlace abajo para confirmar tu cuenta.',
+   'invoice_subject' => 'Nueva factura de :account',
+   'invoice_message' => 'Para visualizar tu factura por el valor de :amount, haz click en el enlace de abajo.',
+   'payment_subject' => 'Pago recibido',
+   'payment_message' => 'Gracias por su pago de :amount.',
+   'email_salutation' => 'Estimado :name,',
+   'email_signature' => 'Un cordial saludo,',
+   'email_from' => 'El equipo de Invoice Ninja ',
+   'user_email_footer' => 'Para ajustar la configuración de las notificaciones de tu email, visita '.SITE_URL.'/company/notifications',
+   'invoice_link_message' => 'Para visualizar la factura de cliente, haz clic en el enlace de abajo:',
+   'notification_invoice_paid_subject' => 'La factura :invoice ha sido pagada por el cliente :client',
+   'notification_invoice_sent_subject' => 'La factura :invoice ha sido enviada a el cliente :client',
+   'notification_invoice_viewed_subject' => 'La factura :invoice ha sido visualizado por el cliente:client',
+   'notification_invoice_paid' => 'Un pago por importe de :amount ha sido realizado por el cliente :client correspondiente a la factura :invoice.',
+   'notification_invoice_sent' => 'La factura :invoice por importe de :amount fue enviada al cliente :cliente.',
+   'notification_invoice_viewed' => 'La factura :invoice por importe de :amount fue visualizada por el cliente :client.',
+   'reset_password' => 'Puedes reconfigurar la contraseña de tu cuenta haciendo clic en el siguiente enlace:',
+   'reset_password_footer' => 'Si no has solicitado un cambio de contraseña, por favor contactate con nosostros: ' . CONTACT_EMAIL,
+
+   // Payment page
+   'secure_payment' => 'Pago seguro',
+   'card_number' => 'Número de tarjeta',
+   'expiration_month' => 'Mes de caducidad', 
+   'expiration_year' => 'Año de caducidad',
+   'cvv' => 'CVV',
+
+   // Security alerts
+   'confide' => array(
+      'too_many_attempts' => 'Demasiados intentos fallidos. Inténtalo de nuevo en un par de minutos.',
+      'wrong_credentials' => 'Contraseña o email incorrecto.',
+      'confirmation' => '¡Tu cuenta se ha confirmado!',
+      'wrong_confirmation' => 'Código de confirmación incorrecto.',
+      'password_forgot' => 'La información sobre el cambio de tu contraseña se ha enviado a tu dirección de correo electrónico.',
+      'password_reset' => 'Tu contraseña se ha cambiado con éxito.',
+      'wrong_password_reset' => 'Contraseña no válida. Inténtalo de nuevo',
+      ),
+
+   // Pro Plan
+   'pro_plan' => [
+   'remove_logo' => ':link haz click para eliminar el logo de Invoice Ninja',
+   'remove_logo_link' => 'Haz click aquí',
+   ],
+   'logout' => 'Cerrar sesión',   
+   'sign_up_to_save' => 'Registrate para guardar tu trabajo', 
+   'agree_to_terms' =>'Estoy de acuerdo con los términos de Invoice Ninja :terms',
+   'terms_of_service' => 'Términos de servicio',
+   'email_taken' => 'Esta dirección de correo electrónico ya se ha registrado',
+   'working' => 'Procesando',
+   'success' => 'Éxito',
+   'success_message' => 'Te has registrado con éxito. Por favor, haz clic en el enlace del correo de confirmación para verificar tu dirección de correo electrónico.',
+   'erase_data' => 'Esta acción eliminará todos tus datos de forma permanente.',
+   'password' => 'Contraseña',
+
+   'pro_plan_product' => 'Plan Pro',
+   'pro_plan_description' => 'Un año de inscripción al Plan Pro de Invoice Ninja.',
+   'pro_plan_success' => '¡Gracias por unirte a Invoice Ninja! Al realizar el pago de tu factura, se iniciara tu PLAN PRO.',
+   'unsaved_changes' => 'Tienes cambios no guardados',
+   'custom_fields' => 'Campos a medida',
+   'company_fields' => 'Campos de la empresa',
+   'client_fields' => 'Campos del cliente',
+   'field_label' => 'Etiqueta del campo',
+   'field_value' => 'Valor del campo',
+   'edit' => 'Editar',
+   'view_as_recipient' => 'Ver como destinitario',   
+
+   // product management
+   'product_library' => 'Inventario de productos',
+   'product' => 'Producto',
+   'products' => 'Productos',
+   'fill_products' => 'Auto-rellenar productos',
+   'fill_products_help' => 'Seleccionar un producto automáticamente <b>configurará la descripción y coste</b>',
+   'update_products' => 'Auto-actualizar productos',
+   'update_products_help' => 'Actualizar una factura automáticamente <b>actualizará los productos</b>',
+   'create_product' => 'Crear Producto',
+   'edit_product' => 'Editar Producto',
+   'archive_product' => 'Archivar Producto',
+   'updated_product' => 'Producto actualizado con éxito',
+   'created_product' => 'Producto creado con éxito',
+   'archived_product' => 'Producto archivado con éxito',
+   'pro_plan_custom_fields' => ':link haz click para para activar campos a medida',
+   'advanced_settings' => 'Configuración Avanzada',
+   'pro_plan_advanced_settings' => ':link haz click para para activar la configuración avanzada',
+   'invoice_design' => 'Diseño de factura',
+   'specify_colors' => 'Especificar colores',
+   'specify_colors_label' => 'Seleccionar los colores para usar en las facturas',
+   'chart_builder' => 'Constructor de graficos',
+   'ninja_email_footer' => 'Usa :site para facturar a tus clientes y recibir pagos de forma gratuita!',
+   'go_pro' => 'Hazte Pro',
+
+   // Quotes
+   'quote' => 'Presupuesto',
+   'quotes' => 'Presupuestos',
+   'quote_number' => 'Numero de Presupuesto',
+   'quote_number_short' => 'Presupuesto Nº ',
+   'quote_date' => 'Fecha Presupuesto',
+   'quote_total' => 'Total Presupuestado',
+   'your_quote' => 'Su Presupuesto',
+   'total' => 'Total',
+   'clone' => 'Clonar',
+
+    'new_quote' => 'Nuevo Presupuesto',
+    'create_quote' => 'Crear Presupuesto',
+    'edit_quote' => 'Editar Presupuesto',
+    'archive_quote' => 'Archivar Presupuesto',
+    'delete_quote' => 'Eliminar Presupuesto',
+    'save_quote' => 'Guardar Presupuesto',
+    'email_quote' => 'Enviar Presupuesto',
+    'clone_quote' => 'Clonar Presupuesto',
+    'convert_to_invoice' => 'Convertir a Factura',
+    'view_invoice' => 'Ver Factura',
+    'view_quote' => 'Ver Presupuesto',
+    'view_client' => 'Ver Cliente',
+
+    'updated_quote' => 'Presupuesto actualizado con éxito',
+    'created_quote' => 'Presupuesto creado con éxito',
+    'cloned_quote' => 'Presupuesto clonado con éxito',
+    'emailed_quote' => 'Presupuesto enviado con éxito',
+    'archived_quote' => 'Presupuesto archivado con éxito',
+    'archived_quotes' => ':count Presupuestos archivados con exito',
+    'deleted_quote' => 'Presupuesto eliminado con éxito',
+    'deleted_quotes' => ':count Presupuestos eliminados con exito',
+    'converted_to_invoice' => 'Presupuesto convertido a factura con éxito',
+
+    'quote_subject' => 'Nuevo Presupuesto de :account',
+    'quote_message' => 'Para ver el presupuesto por un importe de :amount, haga click en el enlace de abajo.',
+    'quote_link_message' => 'Para ver su presupuesto haga click en el enlace de abajo:',
+    'notification_quote_sent_subject' => 'El presupuesto :invoice enviado al cliente :client',
+    'notification_quote_viewed_subject' => 'El presupuesto :invoice fue visto por el cliente :client',
+    'notification_quote_sent' => 'El presupuesto :invoice por un valor de :amount, ha sido enviado al cliente :client.',
+    'notification_quote_viewed' => 'El presupuesto :invoice por un valor de :amount ha sido visto por el cliente :client.', 
+    'session_expired' => 'Su sesión ha caducado.',
+    'invoice_fields' => 'Campos de Factura',
+    'invoice_options' => 'Opciones de Factura',
+    'hide_quantity' => 'Ocultar Cantidad',
+    'hide_quantity_help' => 'Si las cantidades de tus partidas siempre son 1, entonces puedes organizar tus facturas mejor al no mostrar este campo.',
+    'hide_paid_to_date' => 'Ocultar valor pagado a la fecha',
+    'hide_paid_to_date_help' => 'Solo mostrar la opción “Pagado a la fecha” en sus facturas cuando se ha recibido un pago.',
+    'charge_taxes' => 'Cargar Impuestos',
+    'user_management' => 'Gestión de Usuario',
+    'add_user' => 'Añadir Usuario',
+    'send_invite' => 'Enviar Invitación', //Context for its use
+    'sent_invite' => 'Invitación enviada con éxito',
+    'updated_user' => 'Usario actualizado con éxito',
+    'invitation_message' => ':invitor te ha invitado a unirte a su cuenta en G-Factura.',
+    'register_to_add_user' => 'Regístrate para añadir usarios',
+    'user_state' => 'Estado',
+    'edit_user' => 'Editar Usario',
+    'delete_user' => 'Eliminar Usario',
+    'active' => 'Activo',
+    'pending' => 'Pendiente',
+    'deleted_user' => 'Usario eliminado con éxito',
+    'limit_users' => 'Lo sentimos, esta acción excederá el límite de ' . MAX_NUM_USERS . ' usarios',
+    'confirm_email_invoice' => '¿Estás seguro que quieres enviar esta factura?',
+    'confirm_email_quote' => '¿Estás seguro que quieres enviar este presupuesto?',
+    'confirm_recurring_email_invoice' => 'Se ha marcado esta factura como recurrente, estás seguro que quieres enviar esta factura?',
+    'cancel_account' => 'Cancelar Cuenta',
+    'cancel_account_message' => 'AVISO: Esta acción eliminará todos tus datos de forma permanente.',
+    'go_back' => 'Atrás',
+    'data_visualizations' => 'Visualización de Datos',
+    'sample_data' => 'Datos de Ejemplo',
+    'hide' => 'Ocultar',
+    'new_version_available' => 'Una nueva versión de :releases_link disponible. Estás utilizando la versión :user_version, la última versión es :latest_version',
+    'invoice_settings' => 'Configuración de Facturas',
+    'invoice_number_prefix' => 'Prefijo de Facturación',
+    'invoice_number_counter' => 'Numeración de Facturación',
+    'quote_number_prefix' => 'Prejijo de Presupuesto',
+    'quote_number_counter' => 'Numeración de Presupuestos',
+    'share_invoice_counter' => 'Compartir la numeración para presupuesto y facturación',
+    'invoice_issued_to' => 'Factura emitida a',
+    'invalid_counter' => 'Para evitar posibles conflictos, por favor crea un prefijo de facturación y de presupuesto.',
+    'mark_sent' => 'Marcar como enviado',
+
+
+   'gateway_help_1' => ':link para registrarse en Authorize.net.',
+   'gateway_help_2' => ':link para registrarse en Authorize.net.',
+   'gateway_help_17' => ':link para obtener su firma API de PayPal.',
+   'gateway_help_23' => 'Nota: utilizar su clave de API secreta, no es su clave de API publica.',
+   'gateway_help_27' => ':link para registrarse en TwoCheckout.',
+
+   'more_designs' => 'Más diseños',
+   'more_designs_title' => 'Diseños adicionales para factura',
+   'more_designs_cloud_header' => 'Pase a Pro para añadir más diseños de facturas',
+   'more_designs_cloud_text' => '',
+   'more_designs_self_host_header' => 'Obtenga 6 diseños más para facturas por sólo '.INVOICE_DESIGNS_PRICE, // comprobar
+   'more_designs_self_host_text' => '',
+   'buy' => 'Comprar',
+   'bought_designs' => 'Añadidos con exito los diseños de factura',
+
+   'sent' => 'Enviado',
+   'timesheets' => 'Parte de Horas',
+
+   'payment_title' => 'Introduzca su dirección de facturación y la infomración de su tarjeta de crédito',
+   'payment_cvv' => '*los tres últimos dígitos de la parte posterior de su tarjeta',
+   'payment_footer1' => '*La dirección de facturación debe coincidir con la de la tarjeta de crédito.',
+   'payment_footer2' => '*Por favor, haga clic en "Pagar ahora" sólo una vez - esta operación puede tardar hasta 1 minuto en procesarse.',
+   'vat_number' => 'NIF/CIF',
+
+   'id_number' => 'Número de Identificación',
+   'white_label_link' => 'Marca Blanca" ',
+   'white_label_text' => 'Obtener una licencia de marca blanca por'.WHITE_LABEL_PRICE.' para quitar la marca Invoice Ninja de la parte superior de las páginas del cliente.', // comprobar
+   'white_label_link' => 'Marca Blanca" ',
+   'bought_white_label' => 'Se ha conseguido con exito la licencia de Marca Blanca',
+   'white_labeled' => 'Marca Blanca',
+
+  'restore' => 'Restaurar',
+  'restore_invoice' => 'Restaurar Factura',
+  'restore_quote' => 'Restaurar Presupuesto',
+  'restore_client' => 'Restaurar Cliente',
+  'restore_credit' => 'Restaurar Pendiente', 
+  'restore_payment' => 'Restaurar Pago',
+
+  'restored_invoice' => 'Factura restaurada con éxito',
+  'restored_quote' => 'Presupuesto restaurada con éxito',
+  'restored_client' => 'Cliente restaurada con éxito',
+  'restored_payment' => 'Pago restaurada con éxito',
+  'restored_credit' => 'Pendiente restaurada con éxito',
+  
+  'reason_for_canceling' => 'Ayudenos a mejorar nuestro sitio diciendonos porque se va, Gracias',
+  'discount_percent' => 'Porcentaje',
+  'discount_amount' => 'Cantidad',
+
+// Ver. 1.7.0
+
+  'invoice_history' => 'Historial de Facturas',
+  'quote_history' => 'Historial de Presupuestos',
+  'current_version' => 'Versión Actual',
+  'select_versiony' => 'Seleccione la Versión',
+  'view_history' => 'Ver Historial',
+
+  'edit_payment' => 'Editar Pago',
+  'updated_payment' => 'Pago actualizado correctamente',
+  'deleted' => 'Eliminado',
+  'restore_user' => 'Restaurar Usuario',
+  'restored_user' => 'Usuario restaurado correctamente',
+  'show_deleted_users' => 'Mostrar usuarios eliminados',
+  'email_templates' => 'Plantillas de Email',
+  'invoice_email' => 'Email de Facturas',
+  'payment_email' => 'Email de Pagos',
+  'quote_email' => 'Email de Presupuestos',
+  'reset_all' => 'Restablecer Todos',
+  'approve' => 'Aprobar',  
+
+  'token_billing_type_id' => 'Token Billing', //¿?
+  'token_billing_help' => 'Permite almacenar tarjetas de crédito para posteriormente realizarles el cobro.',
+  'token_billing_1' => 'Deshabilitar',
+  'token_billing_2' => 'La casilla Opt-In se muestra pero no está seleccionada',
+  'token_billing_3' => 'La casilla Opt-Out se muestra y se selecciona',
+  'token_billing_4' => 'Siempre',
+  'token_billing_checkbox' => 'Almacenar datos de la tarjeta de crédito',
+  'view_in_stripe' => 'Ver en Stripe',
+  'use_card_on_file' => 'Use card on file', //??
+  'edit_payment_details' => 'Editar detalles de pago',
+  'token_billing' => 'Guardar datos de la tarjeta',
+  'token_billing_secure' => 'Los datos serán almacenados de forma segura por :stripe_link',
+
+  'support' => 'Soporte',
+  'contact_information' => 'Información de Contacto',
+  '256_encryption' => 'Encriptación de 256-Bit',
+  'amount_due' => 'Importe a pagar',
+  'billing_address' => 'Dirección de Envio',
+  'billing_method' => 'Método de facturación',
+  'order_overview' => 'Lista de pedidos',
+  'match_address' => '*La dirección debe coincidir con la dirección asociada a la tarjeta de crédito.',
+  'click_once' => '*Por favor, haga clic en "Pagar ahora" sólo una vez - la operación puede tardar hasta 1 minuto en ser procesada.',
+
+  'default_invoice_footer' => 'Establecer pie de página por defecto en factura',
+  'invoice_footer' => 'Pie de página de la factura',
+  'save_as_default_footer' => 'Guardar como pie de página por defecto',
+
+  'token_management' => 'Administrar Tokent', //?
+  'tokens' => 'Tokens',
+  'add_token' => 'Agregar Token',
+  'show_deleted_tokens' => 'Mostrar tokens eliminados',
+  'deleted_token' => 'Token eliminado correctamente',
+  'created_token' => 'Token creado correctamente',
+  'updated_token' => 'Token actualizado correctamente',
+  'edit_token' => 'Editar Token',
+  'delete_token' => 'Eliminar Token',
+  'token' => 'Token',
+
+  'add_gateway' => 'Agregar Pasarela',
+  'delete_gateway' => 'Eliminar Pasarela',
+  'edit_gateway' => 'Editar Pasarela',
+  'updated_gateway' => 'Pasarela actualizada correctamente',
+  'created_gateway' => 'Pasarela creada correctamente',
+  'deleted_gateway' => 'Pasarela eliminada correctamente',
+  'pay_with_paypal' => 'PayPal',
+  'pay_with_card' => 'Tarjeta de Crédito',
+
+  'change_password' => 'Cambiar Contraseña',
+  'current_password' => 'Contraseña Actual',
+  'new_password' => 'Nueva Contraseña',
+  'confirm_password' => 'Confirmar Contraseña',
+  'password_error_incorrect' => 'La contraseña actual es incorrecta.',
+  'password_error_invalid' => 'La nueva contraseña no es válida.',
+  'updated_password' => 'Contraseña actualizada correctamente',
+
+  'api_tokens' => 'API Tokens',
+  'users_and_tokens' => 'Usuarios & Tokens',
+  'account_login' => 'Iniciar Sesión',
+  'recover_password' => 'Recuperar su contraseña',
+  'forgot_password' => '¿Olvidaste tu contraseña?',
+  'email_address' => 'Dirección de Email',
+  'lets_go' => 'Acceder',
+  'password_recovery' => 'Recuperar Contraseña',
+  'send_email' => 'Enviar email',
+  'set_password' => 'Establecer Contraseña',
+  'converted' => 'Modificada',
+
+//------Texto extraido -----------------------------------------------------------------------------------------
+
+  '<i>Manual entry</i>' => '<i>Entrada Manual</i>',
+
+ // Error
+  'Whoops, looks like something went wrong.' => 'Vaya, parece que algo salió mal',
+  'Sorry, the page you are looking for could not be found.' => 'Lo sentimos, la página que está buscando no se pudo encontrar.',
+
+  'email_approved' => 'Email me when a quote is <b>approved</b>',
+  'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
+  'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
+
+  'gateway_help_42' => 'Note: use a BitPay Legacy API Key, not an API token.',
+  'payment_type_credit_card' => 'Credit card',
+  'payment_type_paypal' => 'PayPal',
+  'payment_type_bitcoin' => 'Bitcoin',
+  'knowledge_base' => 'Knowledge Base',
+  'partial' => 'Partial',
+  'partial_remaining' => ':partial of :balance',
+
+
+);
\ No newline at end of file
diff --git a/resources/lang/es_ES/validation.php b/resources/lang/es_ES/validation.php
new file mode 100644
index 000000000000..2baee0ab1da4
--- /dev/null
+++ b/resources/lang/es_ES/validation.php
@@ -0,0 +1,111 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | such as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    "accepted"         => ":attribute debe ser aceptado.",
+    "active_url"       => ":attribute no es una URL válida.",
+    "after"            => ":attribute debe ser una fecha posterior a :date.",
+    "alpha"            => ":attribute solo debe contener letras.",
+    "alpha_dash"       => ":attribute solo debe contener letras, números y guiones.",
+    "alpha_num"        => ":attribute solo debe contener letras y números.",
+    "array"            => ":attribute debe ser un conjunto.",
+    "before"           => ":attribute debe ser una fecha anterior a :date.",
+    "between"          => array(
+        "numeric" => ":attribute tiene que estar entre :min - :max.",
+        "file"    => ":attribute debe pesar entre :min - :max kilobytes.",
+        "string"  => ":attribute tiene que tener entre :min - :max caracteres.",
+        "array"   => ":attribute tiene que tener entre :min - :max ítems.",
+    ),
+    "confirmed"        => "La confirmación de :attribute no coincide.",
+    "date"             => ":attribute no es una fecha válida.",
+    "date_format"      => ":attribute no corresponde al formato :format.",
+    "different"        => ":attribute y :other deben ser diferentes.",
+    "digits"           => ":attribute debe tener :digits dígitos.",
+    "digits_between"   => ":attribute debe tener entre :min y :max dígitos.",
+    "email"            => ":attribute no es un correo válido",
+    "exists"           => ":attribute es inválido.",
+    "image"            => ":attribute debe ser una imagen.",
+    "in"               => ":attribute es inválido.",
+    "integer"          => ":attribute debe ser un número entero.",
+    "ip"               => ":attribute debe ser una dirección IP válida.",
+    "max"              => array(
+        "numeric" => ":attribute no debe ser mayor a :max.",
+        "file"    => ":attribute no debe ser mayor que :max kilobytes.",
+        "string"  => ":attribute no debe ser mayor que :max caracteres.",
+        "array"   => ":attribute no debe tener más de :max elementos.",
+    ),
+    "mimes"            => ":attribute debe ser un archivo con formato: :values.",
+    "min"              => array(
+        "numeric" => "El tamaño de :attribute debe ser de al menos :min.",
+        "file"    => "El tamaño de :attribute debe ser de al menos :min kilobytes.",
+        "string"  => ":attribute debe contener al menos :min caracteres.",
+        "array"   => ":attribute debe tener al menos :min elementos.",
+    ),
+    "not_in"           => ":attribute es inválido.",
+    "numeric"          => ":attribute debe ser numérico.",
+    "regex"            => "El formato de :attribute es inválido.",
+    "required"         => "El campo :attribute es obligatorio.",
+    "required_if"      => "El campo :attribute es obligatorio cuando :other es :value.",
+    "required_with"    => "El campo :attribute es obligatorio cuando :values está presente.",
+    "required_with_all" => "The :attribute field is required when :values is present.",
+    "required_without" => "El campo :attribute es obligatorio cuando :values no está presente.",
+    "required_without_all" => "The :attribute field is required when none of :values are present.",
+    "same"             => ":attribute y :other deben coincidir.",
+    "size"             => array(
+        "numeric" => "El tamaño de :attribute debe ser :size.",
+        "file"    => "El tamaño de :attribute debe ser :size kilobytes.",
+        "string"  => ":attribute debe contener :size caracteres.",
+        "array"   => ":attribute debe contener :size elementos.",
+    ),
+    "unique"     => ":attribute ya ha sido registrado.",
+    "url"        => "El formato :attribute es inválido.",
+    "positive"   => ":attribute debe ser mayor que cero.",
+    "has_credit" => "el cliente no tiene crédito suficiente.",
+
+    "positive" => "The :attribute must be greater than zero.",
+    "has_credit" => "The client does not have enough credit.",
+    "notmasked" => "The values are masked",
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => array(
+        'attribute-name' => array(
+            'rule-name' => 'custom-message',
+        ),
+    ),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => array(),
+
+);
diff --git a/resources/lang/fr/texts.php b/resources/lang/fr/texts.php
index 09a5a4339072..13c9ccb88234 100644
--- a/resources/lang/fr/texts.php
+++ b/resources/lang/fr/texts.php
@@ -571,6 +571,20 @@ return array(
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
   'converted' => 'Converted',
-    
+
+  'email_approved' => 'Email me when a quote is <b>approved</b>',
+  'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
+  'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
+  
+  'gateway_help_42' => 'Note: use a BitPay Legacy API Key, not an API token.',
+  'payment_type_credit_card' => 'Credit card',
+  'payment_type_paypal' => 'PayPal',
+  'payment_type_bitcoin' => 'Bitcoin',
+  'knowledge_base' => 'Knowledge Base',
+  'partial' => 'Partial',
+  'partial_remaining' => ':partial of :balance',
+  
 
 );
\ No newline at end of file
diff --git a/resources/lang/it/texts.php b/resources/lang/it/texts.php
index 4bc0f7f0a59c..ad40d5014e68 100644
--- a/resources/lang/it/texts.php
+++ b/resources/lang/it/texts.php
@@ -573,6 +573,20 @@ return array(
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
   'converted' => 'Converted',
+
+  'email_approved' => 'Email me when a quote is <b>approved</b>',
+  'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
+  'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
     
+  'gateway_help_42' => 'Note: use a BitPay Legacy API Key, not an API token.',
+  'payment_type_credit_card' => 'Credit card',
+  'payment_type_paypal' => 'PayPal',
+  'payment_type_bitcoin' => 'Bitcoin',
+  'knowledge_base' => 'Knowledge Base',
+  'partial' => 'Partial',
+  'partial_remaining' => ':partial of :balance',
+
     
 );
diff --git a/resources/lang/lt/texts.php b/resources/lang/lt/texts.php
index f78284d8bb7f..3bca31dd23ea 100644
--- a/resources/lang/lt/texts.php
+++ b/resources/lang/lt/texts.php
@@ -581,6 +581,20 @@ return array(
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
   'converted' => 'Converted',
+
+  'email_approved' => 'Email me when a quote is <b>approved</b>',
+  'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
+  'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
+
+  'gateway_help_42' => 'Note: use a BitPay Legacy API Key, not an API token.',
+  'payment_type_credit_card' => 'Credit card',
+  'payment_type_paypal' => 'PayPal',
+  'payment_type_bitcoin' => 'Bitcoin',
+  'knowledge_base' => 'Knowledge Base',
+  'partial' => 'Partial',
+  'partial_remaining' => ':partial of :balance',
     
 
     
diff --git a/resources/lang/nb_NO/texts.php b/resources/lang/nb_NO/texts.php
index f87c1fa93129..20cbada5e501 100644
--- a/resources/lang/nb_NO/texts.php
+++ b/resources/lang/nb_NO/texts.php
@@ -580,5 +580,19 @@ return array(
   'set_password' => 'Set Password',
   'converted' => 'Converted',
     
+  'email_approved' => 'Email me when a quote is <b>approved</b>',
+  'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
+  'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
+    
+  'gateway_help_42' => 'Note: use a BitPay Legacy API Key, not an API token.',
+  'payment_type_credit_card' => 'Credit card',
+  'payment_type_paypal' => 'PayPal',
+  'payment_type_bitcoin' => 'Bitcoin',
+  'knowledge_base' => 'Knowledge Base',
+  'partial' => 'Partial',
+  'partial_remaining' => ':partial of :balance',
+    
   
 );
\ No newline at end of file
diff --git a/resources/lang/nl/texts.php b/resources/lang/nl/texts.php
index 4c4b3e13c117..0c9d11a851b2 100644
--- a/resources/lang/nl/texts.php
+++ b/resources/lang/nl/texts.php
@@ -574,6 +574,20 @@ return array(
   'send_email' => 'Verstuur email',
   'set_password' => 'Stel wachtwoord in',
   'converted' => 'Omgezet',
+
+  'email_approved' => 'Email me when a quote is <b>approved</b>',
+  'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
+  'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
+
+  'gateway_help_42' => 'Note: use a BitPay Legacy API Key, not an API token.',
+  'payment_type_credit_card' => 'Credit card',
+  'payment_type_paypal' => 'PayPal',
+  'payment_type_bitcoin' => 'Bitcoin',
+  'knowledge_base' => 'Knowledge Base',
+  'partial' => 'Partial',
+  'partial_remaining' => ':partial of :balance',
     
 
   
diff --git a/resources/lang/pt_BR/texts.php b/resources/lang/pt_BR/texts.php
index bac1303054a9..ab1709120fb9 100644
--- a/resources/lang/pt_BR/texts.php
+++ b/resources/lang/pt_BR/texts.php
@@ -574,6 +574,20 @@ return array(
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
   'converted' => 'Converted',
+
+  'email_approved' => 'Email me when a quote is <b>approved</b>',
+  'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
+  'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
+
+  'gateway_help_42' => 'Note: use a BitPay Legacy API Key, not an API token.',
+  'payment_type_credit_card' => 'Credit card',
+  'payment_type_paypal' => 'PayPal',
+  'payment_type_bitcoin' => 'Bitcoin',
+  'knowledge_base' => 'Knowledge Base',
+  'partial' => 'Partial',
+  'partial_remaining' => ':partial of :balance',
     
   
 );
diff --git a/resources/lang/sv/texts.php b/resources/lang/sv/texts.php
index 755c5bd5a211..936fc232bfb9 100644
--- a/resources/lang/sv/texts.php
+++ b/resources/lang/sv/texts.php
@@ -577,6 +577,20 @@ return array(
   'send_email' => 'Skicka mail',
   'set_password' => 'Ange lösenord',
   'converted' => 'Konvertera',
+
+  'email_approved' => 'Email me when a quote is <b>approved</b>',
+  'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
+  'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
+
+  'gateway_help_42' => 'Note: use a BitPay Legacy API Key, not an API token.',
+  'payment_type_credit_card' => 'Credit card',
+  'payment_type_paypal' => 'PayPal',
+  'payment_type_bitcoin' => 'Bitcoin',
+  'knowledge_base' => 'Knowledge Base',
+  'partial' => 'Partial',
+  'partial_remaining' => ':partial of :balance',
   
   
 );
diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php
index 8bc3a53b1632..92f55fac213f 100644
--- a/resources/views/accounts/account_gateway.blade.php
+++ b/resources/views/accounts/account_gateway.blade.php
@@ -9,8 +9,9 @@
     {!! Former::legend($title) !!}
         
     @if ($accountGateway)
+        {!! Former::populateField('payment_type_id', $paymentTypeId) !!}
         {!! Former::populateField('gateway_id', $accountGateway->gateway_id) !!}
-        {!! Former::populateField('recommendedGateway_id', $accountGateway->gateway_id) !!}
+        {!! Former::populateField('recommendedGateway_id', $accountGateway->gateway_id) !!}        
         @if ($config)
             @foreach ($accountGateway->fields as $field => $junk)
                 @if (in_array($field, ['solutionType', 'landingPage', 'headerImageUrl', 'brandName']))
@@ -20,13 +21,20 @@
                 @endif
             @endforeach
         @endif
+    @else
+        {!! Former::populateField('gateway_id', GATEWAY_AUTHORIZE_NET) !!}
     @endif
-    
-    
-    {!! Former::select('gateway_id')->label('Select Gateway')->addOption('', '')
+        
+    {!! Former::select('payment_type_id')
+        ->options($paymentTypes)
+        ->addGroupClass('payment-type-option')
+        ->onchange('setPaymentType()') !!}
+
+    {!! Former::select('gateway_id')
         ->dataClass('gateway-dropdown')
-        ->fromQuery($gateways, 'name', 'id')
-        ->onchange('setFieldsShown()'); !!}
+        ->addGroupClass('gateway-option')
+        ->fromQuery($selectGateways, 'name', 'id')
+        ->onchange('setFieldsShown()') !!}
 
     @foreach ($gateways as $gateway)
 
@@ -36,7 +44,7 @@
                 @if (in_array($field, ['solutionType', 'landingPage', 'headerImageUrl', 'brandName']))
                     {{-- do nothing --}}
                 @elseif ($field == 'testMode' || $field == 'developerMode') 
-                    {{-- Former::checkbox($gateway->id.'_'.$field)->label(Utils::toSpaceCase($field))->text('Enable') --}}              
+                    {!! Former::checkbox($gateway->id.'_'.$field)->label(Utils::toSpaceCase($field))->text('Enable')->value('true') !!}
                 @elseif ($field == 'username' || $field == 'password') 
                     {!! Former::text($gateway->id.'_'.$field)->label('API '. ucfirst(Utils::toSpaceCase($field))) !!}
                 @else
@@ -61,8 +69,11 @@
         
     @endforeach
 
-    {!! Former::checkboxes('creditCardTypes[]')->label('Accepted Credit Cards')
-            ->checkboxes($creditCardTypes)->class('creditcard-types')
+    {!! Former::checkboxes('creditCardTypes[]')
+            ->label('Accepted Credit Cards')
+            ->checkboxes($creditCardTypes)
+            ->class('creditcard-types')
+            ->addGroupClass('gateway-option')
     !!}
 
 
@@ -76,8 +87,27 @@
 
     <script type="text/javascript">
 
-    function setFieldsShown() {
-        var val = $('#gateway_id').val();
+    function setPaymentType() {
+        var val = $('#payment_type_id').val();
+        if (val == 'PAYMENT_TYPE_CREDIT_CARD') {
+            $('.gateway-option').show();
+            setFieldsShown();
+        } else {
+            $('.gateway-option').hide();
+
+            if (val == 'PAYMENT_TYPE_PAYPAL') {
+                setFieldsShown({{ GATEWAY_PAYPAL_EXPRESS }});
+            } else {
+                setFieldsShown({{ GATEWAY_BITPAY }});
+            }
+        }        
+    }
+
+    function setFieldsShown(val) {
+        if (!val) {
+            val = $('#gateway_id').val();
+        }
+
         $('.gateway-fields').hide();
         $('#gateway_' + val + '_div').show();
     }
@@ -89,6 +119,13 @@
         }
     }
 
+    $(function() {
+        setPaymentType();
+        @if ($accountGateway)
+            $('.payment-type-option').hide();
+        @endif
+    })
+
     </script>
 
 @stop
\ No newline at end of file
diff --git a/resources/views/accounts/details.blade.php b/resources/views/accounts/details.blade.php
index f1a944b3b05a..0ad1dfeeaff0 100644
--- a/resources/views/accounts/details.blade.php
+++ b/resources/views/accounts/details.blade.php
@@ -66,6 +66,8 @@
 				{!! Former::text('phone') !!}
                 @if (Auth::user()->confirmed)                
                     {!! Former::actions( Button::primary(trans('texts.change_password'))->small()->withAttributes(['onclick'=>'showChangePassword()'])) !!}
+                @elseif (Auth::user()->registered)
+                    {!! Former::actions( Button::primary(trans('texts.resend_confirmation'))->asLinkTo('/resend_confirmation')->small() ) !!}
                 @endif
 			@endif
 
@@ -89,6 +91,8 @@
         {!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!}
 	</center>
 
+    {!! Former::close() !!}
+
 
     <div class="modal fade" id="passwordModal" tabindex="-1" role="dialog" aria-labelledby="passwordModalLabel" aria-hidden="true">
         <div class="modal-dialog">
@@ -102,7 +106,7 @@
                     &nbsp;
 
                     {!! Former::password('current_password')->style('width:300px') !!}
-                    {!! Former::password('new_password')->style('width:300px') !!}
+                    {!! Former::password('newer_password')->style('width:300px')->label(trans('texts.new_password')) !!}
                     {!! Former::password('confirm_password')->style('width:300px') !!}
 
                     &nbsp;
@@ -142,21 +146,17 @@
     </div>
 
 
-	{!! Former::close() !!}
-
 	{!! Form::open(['url' => 'remove_logo', 'class' => 'removeLogoForm']) !!}	
 	{!! Form::close() !!}
 
 
-
-
 	<script type="text/javascript">
 
 		$(function() {
 			$('#country_id').combobox();
 
             $('#passwordModal').on('hidden.bs.modal', function () {                
-                $(['current_password', 'new_password', 'confirm_password']).each(function(i, field) {
+                $(['current_password', 'newer_password', 'confirm_password']).each(function(i, field) {
                     var $input = $('form #'+field);
                     $input.val('');
                     $input.closest('div.form-group').removeClass('has-success');                    
@@ -191,13 +191,13 @@
         function validateChangePassword(showError) 
         {
             var isFormValid = true;
-            $(['current_password', 'new_password', 'confirm_password']).each(function(i, field) {
+            $(['current_password', 'newer_password', 'confirm_password']).each(function(i, field) {
                 var $input = $('form #'+field),
                 val = $.trim($input.val());
                 var isValid = val && val.length >= 6;
 
                 if (isValid && field == 'confirm_password') {
-                    isValid = val == $.trim($('#new_password').val());
+                    isValid = val == $.trim($('#newer_password').val());
                 }
 
                 if (isValid) {
@@ -227,9 +227,9 @@
 
             $.ajax({
               type: 'POST',
-              url: '{{ URL::to('users/change_password') }}',
+              url: '{{ URL::to('/users/change_password') }}',
               data: 'current_password=' + encodeURIComponent($('form #current_password').val()) + 
-              '&new_password=' + encodeURIComponent($('form #new_password').val()) + 
+              '&new_password=' + encodeURIComponent($('form #newer_password').val()) + 
               '&confirm_password=' + encodeURIComponent($('form #confirm_password').val()),
               success: function(result) { 
                 if (result == 'success') {
diff --git a/resources/views/accounts/notifications.blade.php b/resources/views/accounts/notifications.blade.php
index 15f9915d162f..01eae5a70e3e 100644
--- a/resources/views/accounts/notifications.blade.php
+++ b/resources/views/accounts/notifications.blade.php
@@ -8,11 +8,13 @@
 	{{ Former::populateField('notify_sent', intval(Auth::user()->notify_sent)) }}
 	{{ Former::populateField('notify_viewed', intval(Auth::user()->notify_viewed)) }}
 	{{ Former::populateField('notify_paid', intval(Auth::user()->notify_paid)) }}
+    {{ Former::populateField('notify_approved', intval(Auth::user()->notify_approved)) }}
 
 	{!! Former::legend(trans('texts.email_notifications')) !!}
 	{!! Former::checkbox('notify_sent')->label('&nbsp;')->text(trans('texts.email_sent')) !!}
 	{!! Former::checkbox('notify_viewed')->label('&nbsp;')->text(trans('texts.email_viewed')) !!}
-	{!! Former::checkbox('notify_paid')->label('&nbsp;')->text(trans('texts.email_paid')) !!}
+    {!! Former::checkbox('notify_paid')->label('&nbsp;')->text(trans('texts.email_paid')) !!}    
+    {!! Former::checkbox('notify_approved')->label('&nbsp;')->text(trans('texts.email_approved')) !!}
 
 	{!! Former::legend(trans('texts.site_updates')) !!}
 
@@ -37,8 +39,10 @@
   </div></div>
 
 	{!! Former::legend(trans('texts.custom_messages')) !!}
-    {!! Former::textarea('invoice_terms')->label(trans('texts.default_invoice_terms')) !!}
-    {!! Former::textarea('invoice_footer')->label(trans('texts.default_invoice_footer')) !!}
+    {!! Former::textarea('invoice_terms')->label(trans('texts.default_invoice_terms'))
+            ->onchange("$('#invoice_terms').val(wordWrapText($('#invoice_terms').val(), 300))") !!}
+    {!! Former::textarea('invoice_footer')->label(trans('texts.default_invoice_footer'))
+            ->onchange("$('#invoice_footer').val(wordWrapText($('#invoice_footer').val(), 600))") !!}
 	{!! Former::textarea('email_footer')->label(trans('texts.default_email_footer')) !!} 
 
 	{!! Former::actions( 
diff --git a/resources/views/accounts/payments.blade.php b/resources/views/accounts/payments.blade.php
index ce367f98962b..b78fd38e8a4c 100644
--- a/resources/views/accounts/payments.blade.php
+++ b/resources/views/accounts/payments.blade.php
@@ -16,20 +16,20 @@
       {!! Button::success(trans('texts.add_gateway'))
             ->asLinkTo('/gateways/create')
             ->withAttributes(['class' => 'pull-right'])
-            ->appendIcon(Icon::create('plus-sign'))
-            ->large() !!}
+            ->appendIcon(Icon::create('plus-sign')) !!}
   @endif
 
   {!! Datatable::table()
       ->addColumn(
         trans('texts.name'),
+        trans('texts.payment_type_id'),
         trans('texts.action'))
       ->setUrl(url('api/gateways/'))
       ->setOptions('sPaginationType', 'bootstrap')
       ->setOptions('bFilter', false)
       ->setOptions('bAutoWidth', false)
-      ->setOptions('aoColumns', [[ "sWidth"=> "80%" ], ["sWidth"=> "20%"]])
-      ->setOptions('aoColumnDefs', [['bSortable'=>false, 'aTargets'=>[1]]])
+      ->setOptions('aoColumns', [[ "sWidth"=> "50%" ], [ "sWidth"=> "30%" ], ["sWidth"=> "20%"]])
+      ->setOptions('aoColumnDefs', [['bSortable'=>false, 'aTargets'=>[2]]])
       ->render('datatable') !!}
 
   <script>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 9bebd1fb3b3a..a505e43543e6 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -72,6 +72,7 @@
 
             <p class="link">
                 {!! link_to('/forgot', trans('texts.forgot_password')) !!}
+                {!! link_to(NINJA_WEB_URL.'/knowledgebase/', trans('texts.knowledge_base'), ['target' => '_blank', 'class' => 'pull-right']) !!}
             </p>
 
 
@@ -105,6 +106,7 @@
         @if (!Utils::isNinja())
         <p/>
         <center>
+            <!--
             <div id="fb-root"></div>
             <script>(function(d, s, id) {
                 var js, fjs = d.getElementsByTagName(s)[0];
@@ -120,6 +122,13 @@
             <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
 
             <iframe src="https://ghbtns.com/github-btn.html?user=hillelcoren&repo=invoice-ninja&type=star&count=false" frameborder="0" scrolling="0" width="50px" height="20px"></iframe>
+            -->
+
+            <p>&nbsp;</p>
+            <p>&nbsp;</p>
+
+            <iframe allowTransparency="true" frameborder="0" scrolling="no" src="https://bitnami.com/product/invoice-ninja/widget" style="border:none;width:230px; height:100px;"></iframe>
+
         </center>
         @endif
 
diff --git a/resources/views/client.blade.php b/resources/views/client.blade.php
index 499c8a30976f..2dd313456b74 100644
--- a/resources/views/client.blade.php
+++ b/resources/views/client.blade.php
@@ -4,8 +4,8 @@
 
 		{!! Former::legend('Organization') !!}
 		{!! Former::text('name') !!}
-                {!! Former::text('id_number') !!}
-                {!! Former::text('vat_number') !!}
+        {!! Former::text('id_number') !!}
+        {!! Former::text('vat_number') !!}
 		{!! Former::text('work_phone')->label('Phone') !!}
 		{!! Former::textarea('notes') !!}
 
diff --git a/resources/views/clients/edit.blade.php b/resources/views/clients/edit.blade.php
index c667a001c9dd..20012b0223ef 100644
--- a/resources/views/clients/edit.blade.php
+++ b/resources/views/clients/edit.blade.php
@@ -7,11 +7,8 @@
 
 @section('content')
 <div class="row">
-	<!--<h3>{{ $title }} Client</h3>-->
 
-	{!! Former::open($url)->addClass('col-md-12 warn-on-exit')->method($method)->rules(array(
-  		'email' => 'email|required'  		
-	)); !!}
+	{!! Former::open($url)->addClass('col-md-12 warn-on-exit')->method($method) !!}
 
 	@if ($client)
 		{!! Former::populate($client) !!}
diff --git a/resources/views/clients/show.blade.php b/resources/views/clients/show.blade.php
index 7a85b5434d62..ea69903283c0 100644
--- a/resources/views/clients/show.blade.php
+++ b/resources/views/clients/show.blade.php
@@ -11,7 +11,7 @@
 		</div>
 
         @if ($gatewayLink)
-            {!! Button::link($gatewayLink, trans('texts.view_in_stripe'), ['target' => '_blank']) !!}
+            {!! Button::normal(trans('texts.view_in_stripe'))->asLinkTo($gatewayLink)->withAttributes(['target' => '_blank']) !!}
         @endif
 
 		@if ($client->trashed())
diff --git a/resources/views/emails/confirm_action.blade.php b/resources/views/emails/confirm_action.blade.php
new file mode 100644
index 000000000000..059476248406
--- /dev/null
+++ b/resources/views/emails/confirm_action.blade.php
@@ -0,0 +1,21 @@
+<script type="application/ld+json">
+    {
+        "@context":"http://schema.org",
+        "@type":"EmailMessage",
+        "description":"Confirm your Invoice Ninja account",
+        "action":
+        {
+            "@type":"ConfirmAction",
+            "name":"Confirm account",
+            "handler": {
+                "@type": "HttpActionHandler",
+                "url": "{{{ URL::to("user/confirm/{$user->confirmation_code}") }}}"
+            },
+            "publisher": {
+                "@type": "Organization",
+                "name": "Invoice Ninja",
+                "url": "{{{ NINJA_WEB_URL }}}"
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/resources/views/emails/confirm_html.blade.php b/resources/views/emails/confirm_html.blade.php
index 070f2e0b25b7..e2e94d7fda51 100644
--- a/resources/views/emails/confirm_html.blade.php
+++ b/resources/views/emails/confirm_html.blade.php
@@ -1,27 +1,7 @@
 <html>
 <body>
-@if (!$invitationMessage)
-<script type="application/ld+json">
-    {
-        "@context":"http://schema.org",
-        "@type":"EmailMessage",
-        "description":"Confirm your Invoice Ninja account",
-        "action":
-        {
-            "@type":"ConfirmAction",
-            "name":"Confirm account",
-            "handler": {
-                "@type": "HttpActionHandler",
-                "url": "{{{ URL::to("user/confirm/{$user->confirmation_code}") }}}"
-            },
-            "publisher": {
-                "@type": "Organization",
-                "name": "Invoice Ninja",
-                "url": "{{{ NINJA_WEB_URL }}}"
-            }
-        }
-    }
-</script>
+@if (false && !$invitationMessage)
+    @include('emails.confirm_action', ['user' => $user])
 @endif
 
 <h1>{{ trans('texts.confirmation_header') }}</h1>
diff --git a/resources/views/emails/invoice_html.blade.php b/resources/views/emails/invoice_html.blade.php
index d87ce900e2cb..92f5f1a3f9b0 100644
--- a/resources/views/emails/invoice_html.blade.php
+++ b/resources/views/emails/invoice_html.blade.php
@@ -1,6 +1,8 @@
 <html>
 <body>
-    @include('emails.view_action', ['link' => $link, 'entityType' => $entityType])
+    @if (false)
+        @include('emails.view_action', ['link' => $link, 'entityType' => $entityType])
+    @endif
     {!! $body !!}
 </body>
 </html>
\ No newline at end of file
diff --git a/resources/views/emails/invoice_paid_html.blade.php b/resources/views/emails/invoice_paid_html.blade.php
index 7cdd6932b73a..001ab0796e21 100644
--- a/resources/views/emails/invoice_paid_html.blade.php
+++ b/resources/views/emails/invoice_paid_html.blade.php
@@ -4,7 +4,9 @@
   <meta charset="utf-8">
 </head>
 <body>
-  @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
+  @if (false)
+    @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
+  @endif
   {{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>
 
   {{ trans("texts.notification_{$entityType}_paid", ['amount' => $paymentAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }} <p/>
diff --git a/resources/views/emails/invoice_sent_html.blade.php b/resources/views/emails/invoice_sent_html.blade.php
index 8663def2fd1d..5ee266c7d203 100644
--- a/resources/views/emails/invoice_sent_html.blade.php
+++ b/resources/views/emails/invoice_sent_html.blade.php
@@ -4,7 +4,9 @@
   <meta charset="utf-8">
 </head>
 <body>
-  @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
+  @if (false)
+    @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
+  @endif
   {{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>
 
   {{ trans("texts.notification_{$entityType}_sent", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }} <p/>  
diff --git a/resources/views/emails/invoice_viewed_html.blade.php b/resources/views/emails/invoice_viewed_html.blade.php
index 78e0423e4b55..3a0aaa975b7b 100644
--- a/resources/views/emails/invoice_viewed_html.blade.php
+++ b/resources/views/emails/invoice_viewed_html.blade.php
@@ -4,7 +4,9 @@
   <meta charset="utf-8">
 </head>
 <body>
-  @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
+  @if (false)
+    @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
+  @endif
   {{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>
 
   {{ trans("texts.notification_{$entityType}_viewed", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }} <p/>
diff --git a/resources/views/emails/quote_approved_html.blade.php b/resources/views/emails/quote_approved_html.blade.php
new file mode 100644
index 000000000000..a9daf05981d8
--- /dev/null
+++ b/resources/views/emails/quote_approved_html.blade.php
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+</head>
+<body>
+  @if (false)
+    @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
+  @endif
+  {{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>
+
+  {{ trans("texts.notification_{$entityType}_approved", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }} <p/>  
+
+  {{ trans('texts.email_signature') }} <br/>
+  {{ trans('texts.email_from') }} <p/>
+  
+  {{ trans('texts.user_email_footer') }} <p/>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/views/emails/quote_approved_text.blade.php b/resources/views/emails/quote_approved_text.blade.php
new file mode 100644
index 000000000000..826b18e7d58e
--- /dev/null
+++ b/resources/views/emails/quote_approved_text.blade.php
@@ -0,0 +1,8 @@
+{{ trans('texts.email_salutation', ['name' => $userName]) }}
+
+{{ trans("texts.notification_{$entityType}_approved", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }}
+
+{{ trans('texts.email_signature') }}
+{{ trans('texts.email_from') }}
+
+{{ trans('texts.user_email_footer') }}
\ No newline at end of file
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index f8198e2504ae..073700d45d68 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -164,7 +164,7 @@
     </div>
   @elseif (Session::has('news_feed_message'))
     <div class="alert alert-info">
-      {{ Session::get('news_feed_message') }}      
+      {!! Session::get('news_feed_message') !!}      
       <a href="#" onclick="hideMessage()" class="pull-right">{{ trans('texts.hide') }}</a>      
     </div>
   @endif
@@ -363,7 +363,7 @@
     var isFormValid = true;
     $(['first_name','last_name','email','password']).each(function(i, field) {
       var $input = $('form.signUpForm #new_'+field),
-      val = $.trim($input.val());
+      val = $.trim($input.val());      
       var isValid = val && val.length >= (field == 'password' ? 6 : 1);
       if (isValid && field == 'email') {
         isValid = isValidEmailAddress(val);
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 8e167af4c20d..2102a9a06254 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -5,6 +5,15 @@
 
 		<script src="{{ asset('js/pdf_viewer.js') }}" type="text/javascript"></script>
 		<script src="{{ asset('js/compatibility.js') }}" type="text/javascript"></script>
+
+        <style type="text/css">
+            .partial div.checkbox {
+                display: inline;
+            }
+            .partial span.input-group-addon {
+                padding-right: 30px;
+            }
+        </style>        
 @stop
 
 @section('content')
@@ -18,7 +27,6 @@
 
 	{!! Former::open($url)->method($method)->addClass('warn-on-exit')->rules(array(
 		'client' => 'required',
-		'email' => 'required',
 		'product_key' => 'max:20'
 	)) !!}	
 
@@ -51,7 +59,7 @@
 			@endif
 
 			<div data-bind="with: client">
-				<div style="display:none" class="form-group" data-bind="visible: contacts().length > 0 &amp;&amp; contacts()[0].email(), foreach: contacts">
+				<div style="display:none" class="form-group" data-bind="visible: contacts().length > 0 &amp;&amp; (contacts()[0].email() || contacts()[0].first_name()), foreach: contacts">
 					<div class="col-lg-8 col-lg-offset-4">
 						<label class="checkbox" data-bind="attr: {for: $index() + '_check'}" onclick="refreshPDF()">
 							<input type="checkbox" value="1" data-bind="checked: send_invoice, attr: {id: $index() + '_check'}">
@@ -68,6 +76,10 @@
 							->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))->append('<i class="glyphicon glyphicon-calendar" onclick="toggleDatePicker(\'invoice_date\')"></i>') !!}
 				{!! Former::text('due_date')->data_bind("datePicker: due_date, valueUpdate: 'afterkeydown'")
 							->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))->append('<i class="glyphicon glyphicon-calendar" onclick="toggleDatePicker(\'due_date\')"></i>') !!}							
+                
+                {!! Former::text('partial')->data_bind("value: partial, valueUpdate: 'afterkeydown', enable: is_partial")
+                        ->onchange('onPartialChange()')->addGroupClass('partial')->append(Former::checkbox('is_partial')->raw()
+                            ->data_bind('checked: is_partial')->onclick('onPartialEnabled()') . '&nbsp;' . (trans('texts.enable'))) !!}
 			</div>
 			@if ($entityType == ENTITY_INVOICE)
 				<div data-bind="visible: is_recurring" style="display: none">
@@ -83,7 +95,7 @@
 					</div>
 				@else 
 				<div data-bind="visible: invoice_status_id() === 0">
-					{!! Former::checkbox('recurring')->onclick('setEmailEnabled()')->text(trans('texts.enable').' &nbsp;&nbsp; <a href="#" onclick="showLearnMore()"><i class="glyphicon glyphicon-question-sign"></i> '.trans('texts.learn_more').'</a>')->data_bind("checked: is_recurring")
+					{!! Former::checkbox('recurring')->onclick('onRecurringEnabled()')->text(trans('texts.enable').' &nbsp;&nbsp; <a href="#" onclick="showLearnMore()"><i class="glyphicon glyphicon-question-sign"></i> '.trans('texts.learn_more').'</a>')->data_bind("checked: is_recurring")
 						->inlineHelp($invoice && $invoice->last_sent_date ? 'Last invoice sent ' . Utils::dateToString($invoice->last_sent_date) : '') !!}
 				</div>			
 				@endif
@@ -265,7 +277,7 @@
 				<td class="hide-border" colspan="3"/>
 				<td style="display:none" data-bind="visible: $root.invoice_item_taxes.show"/>	        	
 				<td colspan="{{ $account->hide_quantity ? 1 : 2 }}"><b>{{ trans($entityType == ENTITY_INVOICE ? 'texts.balance_due' : 'texts.total') }}</b></td>
-				<td style="text-align: right"><span data-bind="text: totals.total"/></td>
+				<td style="text-align: right"><span data-bind="text: totals.total"></span></td>
 			</tr>
 
 		</tfoot>
@@ -588,7 +600,7 @@
 			});
 		}		
 
-		$('#invoice_footer, #terms, #public_notes, #invoice_number, #invoice_date, #due_date, #po_number, #discount, #currency_id, #invoice_design_id, #recurring, #is_amount_discount').change(function() {
+		$('#invoice_footer, #terms, #public_notes, #invoice_number, #invoice_date, #due_date, #po_number, #discount, #currency_id, #invoice_design_id, #recurring, #is_amount_discount, #partial').change(function() {
 			setTimeout(function() {
 				refreshPDF();
 			}, 1);
@@ -672,11 +684,11 @@
 		invoice.is_quote = {{ $entityType == ENTITY_QUOTE ? 'true' : 'false' }};
 		invoice.contact = _.findWhere(invoice.client.contacts, {send_invoice: true});
 
-        if (!invoice.terms) {
-            invoice.terms = "{{ str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_terms)) }}";
+        if (!invoice.terms) {            
+            invoice.terms = wordWrapText('{{ str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_terms)) }}', 300);
         }
         if (!invoice.invoice_footer) {
-            invoice.invoice_footer = "{{ str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_footer)) }}";
+            invoice.invoice_footer = wordWrapText('{{ str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_footer)) }}', 600);
         }
 
 		@if (file_exists($account->getLogoPath()))
@@ -685,7 +697,7 @@
 			invoice.imageHeight = {{ $account->getLogoHeight() }};
 		@endif
 
-    return invoice;
+        return invoice;
 	}
 
 	function getPDFString(cb) {		
@@ -752,7 +764,7 @@
 		var isValid = false;
 		for (var i=0; i<model.invoice().client().contacts().length; i++) {
 			var contact = model.invoice().client().contacts()[i];
-			if (isValidEmailAddress(contact.email())) {
+			if (isValidEmailAddress(contact.email()) || contact.first_name()) {
 				isValid = true;
 			} else {
 				isValid = false;
@@ -984,10 +996,23 @@
 		self.clientFormComplete = function() {
 			trackUrl('/save_client_form');
 
+            var email = $('#email0').val();
+            var firstName = $('#first_name').val();
+            var lastName = $('#last_name').val();
+            var name = $('#name').val();
+
+            if (name) {
+                //
+            } else if (firstName || lastName) {
+                name = firstName + ' ' + lastName;
+            } else {
+                name = email;
+            }
+
 			var isValid = true;
 			$("input[name='email']").each(function(item, value) {
 				var email = $(value).val();
-				if (!email || !isValidEmailAddress(email)) {
+				if (!name && (!email || !isValidEmailAddress(email))) {
 					isValid = false;					
 				}
 			});
@@ -996,25 +1021,12 @@
 				return;
 			}
 
-			var email = $('#email0').val();
-			var firstName = $('#first_name').val();
-			var lastName = $('#last_name').val();
-			var name = $('#name').val();
-
 			if (self.invoice().client().public_id() == 0) {
 				self.invoice().client().public_id(-1);
 			}
 
 			model.setDueDate();
 
-			if (name) {
-				//
-			} else if (firstName || lastName) {
-				name = firstName + ' ' + lastName;
-			} else {
-				name = email;
-			}
-
 			setComboboxValue($('.client_select'), -1, name);
 
 			//$('.client_select select').combobox('setSelected');
@@ -1078,6 +1090,8 @@
 		self.amount = ko.observable(0);
 		self.balance = ko.observable(0);
 		self.invoice_design_id = ko.observable({{ $account->invoice_design_id }});
+        self.partial = ko.observable(0);            
+        self.is_partial = ko.observable(false);
 
 		self.custom_value1 = ko.observable(0);
 		self.custom_value2 = ko.observable(0);
@@ -1111,7 +1125,7 @@
 			applyComboboxListeners();			
 		}
 
-		if (data) {
+        if (data) {
 			ko.mapping.fromJS(data, self.mapping, self);			
 			self.is_recurring(parseInt(data.is_recurring));
 		} else {
@@ -1181,8 +1195,8 @@
 		self.totals.rawSubtotal = ko.computed(function() {
 		    var total = 0;
 		    for(var p=0; p < self.invoice_items().length; ++p) {
-		    	var item = self.invoice_items()[p];
-	        total += item.totals.rawTotal();
+		       var item = self.invoice_items()[p];
+	           total += item.totals.rawTotal();
 		    }
 		    return total;
 		});
@@ -1237,27 +1251,20 @@
         	}
     	});
 
-		this.totals.rawPaidToDate = ko.computed(function() {
+		self.totals.rawPaidToDate = ko.computed(function() {
 			return accounting.toFixed(self.amount(),2) - accounting.toFixed(self.balance(),2);
 		});
 
-		this.totals.paidToDate = ko.computed(function() {
+		self.totals.paidToDate = ko.computed(function() {
 			var total = self.totals.rawPaidToDate();
 		    return formatMoney(total, self.client().currency_id());
 		});
 
-		this.totals.total = ko.computed(function() {
+		self.totals.rawTotal = ko.computed(function() {
     	    var total = accounting.toFixed(self.totals.rawSubtotal(),2);	    
     	    var discount = self.totals.rawDiscounted();
     	    total -= discount;
 
-    	    /*
-    	    var discount = parseFloat(self.discount());
-    	    if (discount > 0) {
-    	    	total = roundToTwo(total * ((100 - discount)/100));
-    	    }
-    			*/
-
     	    var customValue1 = roundToTwo(self.custom_value1());
     	    var customValue2 = roundToTwo(self.custom_value2());
     	    var customTaxes1 = self.custom_taxes1() == 1;
@@ -1287,9 +1294,13 @@
         		total -= paid;
         	}
 
-    	    return formatMoney(total, self.client().currency_id());
+    	    return total;
       	});
 
+        self.totals.total = ko.computed(function() {
+            return formatMoney(self.is_partial() ? self.partial() : self.totals.rawTotal(), self.client().currency_id());
+        });        
+
       	self.onDragged = function(item) {
       		refreshPDF();
       	}
@@ -1388,11 +1399,13 @@
 			if (self.first_name() || self.last_name()) {
 				str += self.first_name() + ' ' + self.last_name() + '<br/>';
 			}			
-			str += self.email();
+            if (self.email()) {
+                str += self.email() + '<br/>';    
+            }			
 
 			@if (Utils::isConfirmed())
 			if (self.invitation_link()) {
-				str += '<br/><a href="' + self.invitation_link() + '" target="_blank">{{ trans('texts.view_as_recipient') }}</a>';
+				str += '<a href="' + self.invitation_link() + '" target="_blank">{{ trans('texts.view_as_recipient') }}</a>';
 			}
 			@endif
 			
@@ -1526,12 +1539,12 @@
 			var cost = roundToTwo(NINJA.parseFloat(self.cost()));
 			var qty = roundToTwo(NINJA.parseFloat(self.qty()));
 			var taxRate = NINJA.parseFloat(self.tax_rate());
-    	var value = cost * qty;        	
-    	if (taxRate > 0) {
-    		value += value * (taxRate/100);
-    	}    	
-    	return value ? roundToTwo(value) : '';
-  	});		
+        	var value = cost * qty;        	
+        	if (taxRate > 0) {
+        		value += value * (taxRate/100);
+        	}    	
+        	return value ? roundToTwo(value) : 0;
+      	});
 
 		this.totals.total = ko.computed(function() {
 			var total = self.totals.rawTotal();
@@ -1593,10 +1606,30 @@
 		}
 	}
 
-    function setEmailEnabled()
+    function onPartialChange()
+    {
+        var val = NINJA.parseFloat($('#partial').val());
+        val = Math.max(Math.min(val, model.invoice().totals.rawTotal()), 0);
+        $('#partial').val(val);
+    }
+
+    function onPartialEnabled()
+    {
+        model.invoice().partial('');
+        refreshPDF();
+
+        if ($('#is_partial').prop('checked')) {   
+            setTimeout(function() {
+                $('#partial').focus();
+            }, 1);
+        }    
+    }
+
+    function onRecurringEnabled()
     {
         if ($('#recurring').prop('checked')) {
             $('#email_button').attr('disabled', true);
+            model.invoice().partial('');
         } else {
             $('#email_button').removeAttr('disabled');
         }
@@ -1622,12 +1655,12 @@
 	}
 
 	@if ($data)
-		window.model = new ViewModel({{ $data }});				
+		window.model = new ViewModel({{ $data }});
 	@else 
 		window.model = new ViewModel();
 		model.addTaxRate();
 		@foreach ($taxRates as $taxRate)
-			model.addTaxRate({{ $taxRate }});
+			model.addTaxRate({!! $taxRate !!});
 		@endforeach
 		@if ($invoice)
 			var invoice = {!! $invoice !!};
@@ -1635,7 +1668,10 @@
 			if (model.invoice().is_recurring() === '0') {
 				model.invoice().is_recurring(false);
 			}
-			var invitationContactIds = {!! json_encode($invitationContactIds) !!};		
+            if (NINJA.parseFloat(model.invoice().partial())) {
+                model.invoice().is_partial(true);
+            }
+            var invitationContactIds = {!! json_encode($invitationContactIds) !!};		
 			var client = clientMap[invoice.client.public_id];
 			if (client) { // in case it's deleted
 				for (var i=0; i<client.contacts.length; i++) {
@@ -1666,6 +1702,7 @@
 
 	// display blank instead of '0'
 	if (!NINJA.parseFloat(model.invoice().discount())) model.invoice().discount('');
+    if (!NINJA.parseFloat(model.invoice().partial())) model.invoice().partial('');
 	if (!model.invoice().custom_value1()) model.invoice().custom_value1('');
 	if (!model.invoice().custom_value2()) model.invoice().custom_value2('');
 
diff --git a/resources/views/invoices/history.blade.php b/resources/views/invoices/history.blade.php
index 4e4752b3dde1..a00b453306ba 100644
--- a/resources/views/invoices/history.blade.php
+++ b/resources/views/invoices/history.blade.php
@@ -9,9 +9,9 @@
 
   <script>
 
-    var invoiceDesigns = {{ $invoiceDesigns }};
-    var currentInvoice = {{ $invoice }};
-    var versionsJson = {{ $versionsJson }};
+    var invoiceDesigns = {!! $invoiceDesigns !!};
+    var currentInvoice = {!! $invoice !!};
+    var versionsJson = {!! $versionsJson !!};
     
     function getPDFString(cb) {
 
@@ -45,10 +45,10 @@
 
 @section('content')
 
-    {{ Former::open()->addClass('form-inline')->onchange('refreshPDF()') }}
-    {{ Former::select('version')->options($versionsSelect)->label(trans('select_version')) }}
-    {{ Button::success_link(URL::to($invoice->getEntityType() . 's/' . $invoice->public_id . '/edit'), trans('texts.edit_' . $invoice->getEntityType()), array('class' => 'pull-right')) }}    
-    {{ Former::close() }}
+    {!! Former::open()->addClass('form-inline')->onchange('refreshPDF()') !!}
+    {!! Former::select('version')->options($versionsSelect)->label(trans('select_version')) !!}
+    {!! Button::success(trans('texts.edit_' . $invoice->getEntityType()))->asLinkTo('/' . $invoice->getEntityType() . 's/' . $invoice->public_id . '/edit')->withAttributes(array('class' => 'pull-right')) !!}    
+    {!! Former::close() !!}
 
     <br/>&nbsp;<br/>
 
diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php
index 508e4000846a..bbf4a7d4c8a0 100644
--- a/resources/views/invoices/view.blade.php
+++ b/resources/views/invoices/view.blade.php
@@ -24,25 +24,17 @@
         @if ($invoice->is_quote)            
             {!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}&nbsp;&nbsp;
             @if (!$isConverted)
-                {!! Button::success(trans('texts.approve'))->asLinkTo('approve/' . $invitation->invitation_key)->large() !!}
+                {!! Button::success(trans('texts.approve'))->asLinkTo('/approve/' . $invitation->invitation_key)->large() !!}
             @endif
 		@elseif ($invoice->client->account->isGatewayConfigured() && !$invoice->isPaid() && !$invoice->is_recurring)
             {!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}&nbsp;&nbsp;
-            @if ($hasToken)
-                {!! DropdownButton::success_lg(trans('texts.pay_now'), [
-                    ['url' => URL::to("payment/{$invitation->invitation_key}?use_token=true&use_paypal=false"), 'label' => trans('texts.use_card_on_file')],
-                    ['url' => URL::to("payment/{$invitation->invitation_key}?use_paypal=false"), 'label' => trans('texts.edit_payment_details')]
-                ])->addClass('btn-lg') !!}
-            @elseif ($countGateways == 2)
-                {!! DropdownButton::success_lg(trans('texts.pay_now'), [
-                    ['url' => URL::to("payment/{$invitation->invitation_key}?use_paypal=true"), 'label' => trans('texts.pay_with_paypal')],
-                    ['url' => URL::to("payment/{$invitation->invitation_key}?use_paypal=false"), 'label' => trans('texts.pay_with_card')]
-                ])->addClass('btn-lg') !!}
+            @if (count($paymentTypes) > 1)
+                {!! DropdownButton::success(trans('texts.pay_now'))->withContents($paymentTypes)->large() !!}
             @else
-			     {!! Button::success(trans('texts.pay_now'))->asLinkTo(URL::to('payment/' . $invitation->invitation_key))->large() !!}
-            @endif
+                {!! Button::success(trans('texts.pay_now'))->asLinkTo('/payment/' . $invitation->invitation_key)->large() !!}
+            @endif            
 		@else 
-			{!! Button::success('Download PDF')->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}
+			{!! Button::normal('Download PDF')->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}
 		@endif
 		</div>        
 
diff --git a/resources/views/payments/payment.blade.php b/resources/views/payments/payment.blade.php
index f460117fb05f..cb996aa96e47 100644
--- a/resources/views/payments/payment.blade.php
+++ b/resources/views/payments/payment.blade.php
@@ -262,7 +262,7 @@ header h3 em {
                 @if ($client && $account->showTokenCheckbox())        
                     <input id="token_billing" type="checkbox" name="token_billing" {{ $account->selectTokenCheckbox() ? 'CHECKED' : '' }} value="1" style="margin-left:0px; vertical-align:top">
                     <label for="token_billing" class="checkbox" style="display: inline;">{{ trans('texts.token_billing') }}</label>
-                    <span class="help-block" style="font-size:15px">{{ trans('texts.token_billing_secure', ['stripe_link' => link_to('https://stripe.com/', 'Stripe.com', ['target' => '_blank'])]) }}</span>
+                    <span class="help-block" style="font-size:15px">{!! trans('texts.token_billing_secure', ['stripe_link' => link_to('https://stripe.com/', 'Stripe.com', ['target' => '_blank'])]) !!}</span>
                 @endif                    
             </div>  
 
diff --git a/resources/views/public/header.blade.php b/resources/views/public/header.blade.php
index d518b4955cb2..a7db99be275d 100644
--- a/resources/views/public/header.blade.php
+++ b/resources/views/public/header.blade.php
@@ -192,15 +192,15 @@ table.table thead .sorting_desc_disabled:after { content: '' !important }
 
     <div class="container">
       @if (Session::has('warning'))
-      <div class="alert alert-warning">{{ Session::get('warning') }}</div>
+      <div class="alert alert-warning">{!! Session::get('warning') !!}</div>
       @endif
 
       @if (Session::has('message'))
-      <div class="alert alert-info">{{ Session::get('message') }}</div>
+      <div class="alert alert-info">{!! Session::get('message') !!}</div>
       @endif
 
       @if (Session::has('error'))
-      <div class="alert alert-danger">{{ Session::get('error') }}</div>
+      <div class="alert alert-danger">{!! Session::get('error') !!}</div>
       @endif
   </div>