diff --git a/LICENSE b/LICENSE
index 4d1b69fde2e5..07daadbcb3fb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 Attribution Assurance License
-Copyright (c) 2013 by Hillel Coren
+Copyright (c) 2014 by Hillel Coren
 http://www.hillelcoren.com
 
 All Rights Reserved
diff --git a/app/config/app.php b/app/config/app.php
index 37e2e08b078e..5375b22c0b13 100755
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -214,7 +214,7 @@ return array(
 		'Typography'      => 'Bootstrapper\Typography',
 		'Confide'    	    => 'Zizaco\Confide\ConfideFacade',
 		'Former'          => 'Former\Facades\Former',
-		'Datatable'       => 'Chumper\Datatable\Facades\Datatable',
+		'Datatable'       => 'Chumper\Datatable\Facades\DatatableFacade',
 		'Omnipay'         => 'Omnipay\Omnipay',
 		'CreditCard'      => 'Omnipay\Common\CreditCard',
 		'Image'           => 'Intervention\Image\Facades\Image',
diff --git a/app/config/packages/zizaco/confide/config.php b/app/config/packages/zizaco/confide/config.php
index 2e60fdad1c63..e26ae0a94eab 100755
--- a/app/config/packages/zizaco/confide/config.php
+++ b/app/config/packages/zizaco/confide/config.php
@@ -111,7 +111,7 @@ return array(
     | table, otherwise they will not be able to login after the payment.
     |
     */
-    'signup_email'      => true,
-    'signup_confirm'    => true,
+    'signup_email'      => false,
+    'signup_confirm'    => false,
 
 );
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index d9d673f753a7..eae0d6923bfb 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -1,16 +1,19 @@
 <?php
 
 use ninja\repositories\AccountRepository;
+use ninja\mailers\UserMailer as Mailer;
 
 class AccountController extends \BaseController {
 
 	protected $accountRepo;
+	protected $mailer;
 
-	public function __construct(AccountRepository $accountRepo)
+	public function __construct(AccountRepository $accountRepo, Mailer $mailer)
 	{
 		parent::__construct();
 
 		$this->accountRepo = $accountRepo;
+		$this->mailer = $mailer;
 	}	
 
 	public function getStarted()
@@ -571,11 +574,14 @@ class AccountController extends \BaseController {
 		$user->first_name = trim(Input::get('new_first_name'));
 		$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_confirmation = trim(Input::get('new_password'));
 		$user->registered = true;
 		$user->amend();
 
+		$this->mailer->sendConfirmation($user);
+
 		$activities = Activity::scope()->get();
 		foreach ($activities as $activity) 
 		{
diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php
index c6fafe9a8b88..459ad6bd2ef8 100755
--- a/app/controllers/HomeController.php
+++ b/app/controllers/HomeController.php
@@ -29,6 +29,11 @@ class HomeController extends BaseController {
 		return View::make('contact_us');
 	}
 
+	public function showTerms()
+	{
+		return View::make('terms');
+	}
+
 	public function doContactUs()
 	{
 		$email = Input::get('email');
diff --git a/app/ninja/mailers/UserMailer.php b/app/ninja/mailers/UserMailer.php
index d4037be6608a..2ed34b9bb6d1 100755
--- a/app/ninja/mailers/UserMailer.php
+++ b/app/ninja/mailers/UserMailer.php
@@ -8,6 +8,23 @@ use Utils;
 
 class UserMailer extends Mailer {
 
+	public function sendConfirmation(User $user)
+	{
+		if (!$user->email)
+		{
+			return;
+		}
+
+		$view = 'confirm';
+		$subject = 'Invoice Ninja Account Confirmation';
+
+		$data = [
+			'user' => $user
+		];
+
+		$this->sendTo($user->email, CONTACT_EMAIL, $subject, $view, $data);		
+	}
+
 	public function sendNotification(User $user, Invoice $invoice, $type, Payment $payment = null)
 	{
 		if (!$user->email)
diff --git a/app/ninja/repositories/InvoiceRepository.php b/app/ninja/repositories/InvoiceRepository.php
index 73cb2fb4b161..c8327d0311a8 100755
--- a/app/ninja/repositories/InvoiceRepository.php
+++ b/app/ninja/repositories/InvoiceRepository.php
@@ -127,7 +127,7 @@ class InvoiceRepository
 		$invoice->invoice_date = Utils::toSqlDate($data['invoice_date']);
 		$invoice->due_date = Utils::toSqlDate($data['due_date']);					
 
-		$invoice->is_recurring = $data['is_recurring'];
+		$invoice->is_recurring = $data['is_recurring'] ? true : false;
 		$invoice->frequency_id = $data['frequency_id'] ? $data['frequency_id'] : 0;
 		$invoice->start_date = Utils::toSqlDate($data['start_date']);
 		$invoice->end_date = Utils::toSqlDate($data['end_date']);
diff --git a/app/routes.php b/app/routes.php
index 483daaf57af2..329213dec6da 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -57,6 +57,7 @@ Route::get('/send_emails', function() {
 Route::get('/', 'HomeController@showWelcome');
 Route::get('/rocksteady', 'HomeController@showWelcome');
 Route::get('/about', 'HomeController@showAboutUs');
+Route::get('/terms', 'HomeController@showTerms');
 Route::get('/contact', 'HomeController@showContactUs');
 Route::post('/contact', 'HomeController@doContactUs');
 
diff --git a/app/views/about_us.blade.php b/app/views/about_us.blade.php
index 6c1535eb5138..f5efb7fdea2a 100644
--- a/app/views/about_us.blade.php
+++ b/app/views/about_us.blade.php
@@ -9,36 +9,17 @@
 @stop
 
 @section('body')
-<<<<<<< HEAD
- <!--<script>
-        $(document).ready(function () {
-=======
 
 {{ Form::open(array('url' => 'get_started', 'id' => 'startForm')) }}
 {{ Form::hidden('guest_key') }}
 {{ Form::close() }}
 
-<script>
-  $(document).ready(function () {
+ <script>
 
-    
+  $(document).ready(function () {
     if (isStorageSupported()) {
       $('[name="guest_key"]').val(localStorage.getItem('guest_key'));          
     }
-
->>>>>>> upstream/master
-    var $window = $(window);
-    $('section[data-type="background"]').each(function () {
-      var $bgobj = $(this);
-      $(window).scroll(function () {
-        var yPos = -($window.scrollTop() / $bgobj.data('speed'));
-        var coords = '50% ' + yPos + 'px';
-        $bgobj.css({ backgroundPosition: coords });
-      });
-    });
-<<<<<<< HEAD
-</script>-->
-=======
   });
 
   function isStorageSupported() {
@@ -53,75 +34,32 @@
     $('#startForm').submit();
   }
 
-</script>
->>>>>>> upstream/master
-<div class="navbar" style="margin-bottom:0px">
-  <div class="container">
-    <div class="navbar-inner">
-      <a class="brand" href="/"><img src=
-        "images/invoiceninja-logo.png"></a>
-        <ul class="navbar-list">
-          <li>{{ link_to('about', 'About Us' ) }}</li>
-          <li>{{ link_to('contact', 'Contact Us' ) }}</li>
-          <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
-        </ul>
+  </script>
+  <div class="navbar" style="margin-bottom:0px">
+    <div class="container">
+      <div class="navbar-inner">
+        <a class="brand" href="#"><img src=
+          "images/invoiceninja-logo.png"></a>
+          <ul class="navbar-list">
+            <li>{{ link_to('about', 'About Us' ) }}</li>
+            <li>{{ link_to('contact', 'Contact Us' ) }}</li>
+            <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
+          </ul>
+        </div>
       </div>
     </div>
   </div>
-</div>
 
-<section class="hero3" data-speed="2" data-type="background">
-  <div class="container">
-    <div class="caption">
-     <h1>WHY INVOICE NINJA?
-     </h1>
+  <section class="hero3" data-speed="2" data-type="background">
+    <div class="container">
+      <div class="caption">
+       <h1>WHY INVOICE NINJA?
+       </h1>
+     </div>
    </div>
- </div>
-</section>
+ </section>
 
-<<<<<<< HEAD
-    <section class="about center">
-        <div class="container">
-            <div class="row">
-                <div class="col-md-8 col-md-offset-2">
-                        <h2>Open Source Platform</h2>
-                        <p>Free yourself from online invoicing platforms with high monthly fees and limited functionality.  Being open source allows us fast app development, security audits by the open-course community, and we can keep it <span style="color:#2299c0"><strong>FREE!</strong></span></p>
-                </div>
-            </div>
-        </div>
-    </section>
-    
-    <section class="about white-bg">
-        <div class="container">
-            <div class="row">
-                <div class="col-md-5">
-                    <div class="screendump">
-                        <img src="images/about1.jpg">
-                    </div>
-                </div>
-                <div class="col-md-7">
-                        <h2>Live PDF Creation</h2>
-                        <p><strong>Look professional from day #1.</strong> Select one of our beautiful invoice templates to suit your company identity, switch between designs in real time to preview invoices & email them to clients with one click. The live preview PDF function was designed for an efficient and hassle-free experience, and it’s awesome!
-</p>
-                </div>
-            </div>
-        </div>
-    </section>
-    <section class="about">
-        <div class="container">
-            <div class="row">
-                <div class="col-md-7">
-                        <h2>Online Payments</h2>
-                        <p><strong>Authorize.net, Beanstream, PayPal?</strong> InvoiceNinja supports the most popular online payment gateways! If you need help integrating a third party gateway we don’t yet support, please contact us!  We’re happy to help!  If you need assistance of want to learn more about online payment solutions, contact us!</p>
-                </div>
-                <div class="col-md-5">
-                    <div class="screendump">
-                        <img src="images/about2.jpg">
-                    </div>
-                </div>
-            </div>
-=======
-<section class="about center">
+ <section class="about center">
   <div class="container">
     <div class="row">
       <div class="col-md-8 col-md-offset-2">
@@ -137,6 +75,7 @@
     <div class="row">
       <div class="col-md-5">
         <div class="screendump">
+          <img src="images/about1.jpg">
         </div>
       </div>
       <div class="col-md-7">
@@ -156,27 +95,27 @@
       </div>
       <div class="col-md-5">
         <div class="screendump">
->>>>>>> upstream/master
+          <img src="images/about2.jpg">
         </div>
       </div>
     </div>
   </div>
 </section>
-    <!--
-    <section class="about center white-bg">
-        <div class="container">
-            <div class="row">
-                <div class="col-md-8 col-md-offset-2">
-                        <h2>Info about the company/story</h2>
-                        <p>Donec id elit non mi porta gravida at eget metus.
-                        Fusce dapibus, tellus ac cursus commodo, tortor mauris
-                        condimentum nibh, ut fermentum massa justo sit amet
-                        risus. Etiam porta sem malesuada magna mollis euismod.
-                        Donec sed odio dui.</p>
-                </div>
-            </div>
+<!--
+<section class="about center white-bg">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+        <h2>Info about the company/story</h2>
+        <p>Donec id elit non mi porta gravida at eget metus.
+          Fusce dapibus, tellus ac cursus commodo, tortor mauris
+          condimentum nibh, ut fermentum massa justo sit amet
+          risus. Etiam porta sem malesuada magna mollis euismod.
+          Donec sed odio dui.</p>
         </div>
-    </section>
+      </div>
+    </div>
+  </section>
   -->
   <section class="upper-footer">
    <div class="container">
@@ -228,4 +167,4 @@
             </div>
           </footer><script src="{{ asset('/js/retina-1.1.0.min.js') }}" type="text/javascript"></script>
 
-          @stop
+          @stop
\ No newline at end of file
diff --git a/app/views/contact_us.blade.php b/app/views/contact_us.blade.php
index 60f6bea46126..8ccbca818f26 100644
--- a/app/views/contact_us.blade.php
+++ b/app/views/contact_us.blade.php
@@ -16,29 +16,34 @@
 {{ Form::close() }}
 
  <script>
-        $(document).ready(function () {
-      $("#feedbackSubmit").click(function() {
-    //clear any errors
-    contactForm.clearErrors();
- 
-    //do a little client-side validation -- check that each field has a value and e-mail field is in proper format
-    var hasErrors = false;
-    $('.feedbackForm input,textarea').each(function() {
-      if (!$(this).val()) {
-        hasErrors = true;
-        contactForm.addError($(this));
+    $(document).ready(function () {
+
+      if (isStorageSupported()) {
+        $('[name="guest_key"]').val(localStorage.getItem('guest_key'));          
+      }
+
+        $("#feedbackSubmit").click(function() {
+      //clear any errors
+      contactForm.clearErrors();
+   
+      //do a little client-side validation -- check that each field has a value and e-mail field is in proper format
+      var hasErrors = false;
+      $('.feedbackForm input,textarea').each(function() {
+        if (!$(this).val()) {
+          hasErrors = true;
+          contactForm.addError($(this));
+        }
+      });
+      var $email = $('#email');
+      if (!contactForm.isValidEmail($email.val())) {
+        hasErrors = true;
+        contactForm.addError($email);
+      }
+   
+      //if there are any errors return without sending e-mail
+      if (hasErrors) {
+        return false;
       }
-    });
-    var $email = $('#email');
-    if (!contactForm.isValidEmail($email.val())) {
-      hasErrors = true;
-      contactForm.addError($email);
-    }
- 
-    //if there are any errors return without sending e-mail
-    if (hasErrors) {
-      return false;
-    }
  
   }); 
     
@@ -117,8 +122,8 @@ var contactForm = {
                      
                 <div class="row">              
                     <div class="col-md-7">
-                        <h2>Have a question or just want to say hi?</h2>
-                        <p>Fill in the form below and we'll get back to you as soon as possible (within 24 hours). Hope to hear from you.</p>
+                        <h2>Questions, special requests, or just want to say hi?</h2>
+                        <p>Fill in the form below and we'll get back to you as soon as possible. Hope to hear from you!</p>
                                                 
                         {{ Former::open('contact')->addClass('feedbackForm') }}
                             <div class="form-group">
@@ -145,7 +150,7 @@ var contactForm = {
                     <div class="col-md-4 col-md-offset-1 address">
                         <h2>Other ways to reach us</h2>
                         <p><span class="glyphicon glyphicon-send"></span><a href="mailto:contact@invoiceninja.com">contact@invoiceninja.com</a></p>
-                        <p><span class="glyphicon glyphicon-earphone"></span>(800) 763-1948</p>
+                        <p><span class="glyphicon glyphicon-earphone"></span>+1-800-763-1948</p>
                         <p><span class="github"></span><div style="padding-top:10px"> &nbsp;&nbsp;<a href="https://github.com/hillelcoren/invoice-ninja" target="_blank">GitHub Project</a></div></p>
 
                     </div>
diff --git a/app/views/emails/confirm_text.blade.php b/app/views/emails/confirm_text.blade.php
new file mode 100644
index 000000000000..e21261708ecb
--- /dev/null
+++ b/app/views/emails/confirm_text.blade.php
@@ -0,0 +1,6 @@
+{{ Lang::get('confide::confide.email.account_confirmation.subject') }}
+
+{{ Lang::get('confide::confide.email.account_confirmation.body') }}
+{{{ URL::to("user/confirm/{$user->confirmation_code}") }}}
+
+{{ Lang::get('confide::confide.email.account_confirmation.farewell') }}
\ No newline at end of file
diff --git a/app/views/emails/invoice_paid_html.blade.php b/app/views/emails/invoice_paid_html.blade.php
index 655c94f8b0de..86002d20e428 100755
--- a/app/views/emails/invoice_paid_html.blade.php
+++ b/app/views/emails/invoice_paid_html.blade.php
@@ -14,5 +14,9 @@
 
   To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/notifications">click here</a>.
 
+  Regards,
+
+  The InvoiceNinja Team
+  
 </body>
 </html>
\ No newline at end of file
diff --git a/app/views/emails/invoice_paid_text.blade.php b/app/views/emails/invoice_paid_text.blade.php
index c2afac424870..c3f6bce68327 100755
--- a/app/views/emails/invoice_paid_text.blade.php
+++ b/app/views/emails/invoice_paid_text.blade.php
@@ -4,6 +4,6 @@ A payment of {{ $paymentAmount }} was made by client {{ $clientName }} towards i
 
 
 To view your client invoice click the link below:
-{{ $invoiceLink }} <p/>
+{{ $invoiceLink }}
 
-To adjust your email notification settings please visit http://www.invoiceninja.com/company/notifications
\ No newline at end of file
+To adjust your email notification settings please visit http://www.invoiceninja.com/company/notifications
diff --git a/app/views/emails/invoice_sent_html.blade.php b/app/views/emails/invoice_sent_html.blade.php
index d78d0775ec9e..716f92d64f00 100755
--- a/app/views/emails/invoice_sent_html.blade.php
+++ b/app/views/emails/invoice_sent_html.blade.php
@@ -9,6 +9,10 @@
 
   The following client {{ $clientName }} was emailed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}.<p/>
 
+  Regards,
+
+  The InvoiceNinja Team
+
   To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/notifications">click here</a>.<p/>
 
 </body>
diff --git a/app/views/emails/invoice_viewed_html.blade.php b/app/views/emails/invoice_viewed_html.blade.php
index 00088e4bad66..e17cd52eb52e 100755
--- a/app/views/emails/invoice_viewed_html.blade.php
+++ b/app/views/emails/invoice_viewed_html.blade.php
@@ -9,6 +9,10 @@
 
   The following client {{ $clientName }} viewed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}.<p/>
 
+  Regards,
+
+  The InvoiceNinja Team
+
   To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/notifications">click here</a>.<p/>
 
 </body>
diff --git a/app/views/emails/invoice_viewed_text.blade.php b/app/views/emails/invoice_viewed_text.blade.php
index 5d18a110333d..d194c8e1e87f 100755
--- a/app/views/emails/invoice_viewed_text.blade.php
+++ b/app/views/emails/invoice_viewed_text.blade.php
@@ -2,4 +2,8 @@ Dear {{ $userName }},
 
 The following client {{ $clientName }} viewed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount }}.
 
+Regards,
+
+The InvoiceNinja Team
+
 To adjust your email notification settings visit this link http://www.invoiceninja.com/company/notifications
\ No newline at end of file
diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index 76f0215399c2..a09cbbb36e8f 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -233,7 +233,7 @@
 	    	{{ Former::text('new_last_name')->label('Last name') }}
 	      {{ Former::text('new_email')->label('Email') }}	    	
 	      {{ Former::password('new_password')->label('Password') }}        
-        {{ Former::checkbox('terms_checkbox')->label(' ')->text('I agree to the Invoice Ninja <a href="#" target="_blank">Terms of Service</a>') }}
+        {{ Former::checkbox('terms_checkbox')->label(' ')->text('I agree to the Invoice Ninja <a href="'.URL::to('terms').'" target="_blank">Terms of Service</a>') }}
 			  {{ Former::close() }}
 
 			 <center><div id="errorTaken" style="display:none">&nbsp;<br/>The email address is already regiestered</div></center>
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index 5941e7b0ed19..ebb59547eac8 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -416,9 +416,16 @@
 
 	    <div style="background-color: #fff; padding-left: 16px; padding-right: 16px">
 	    	&nbsp;
-	    	<p>Recurring invoices are automatically sent.</p>
-	    	<p>Use :MONTH, :QUARTER or :YEAR for dynamic dates. </p>
-	    	<p>Basic math works as well. ie, :MONTH-1. </p>
+	    	<p>Automatically send clients the same invoices weekly, bi-monthly, monthly, quarterly or annually. </p>
+
+				<p>Use :MONTH, :QUARTER or :YEAR for dynamic dates. Basic math works as well, for example :MONTH-1.</p>
+
+				<p>Examples of dynamic invoice variables:</p>
+				<ul>
+					<li>"Gym membership for the month of :MONTH" => "Gym membership for the month of July"</li>
+					<li>":YEAR+1 yearly subscription" => "2014 Yearly Subscription"</li>
+					<li>"Retainer payment for :QUARTER+1" => "Retainer payment for Q2"</li>
+				</ul>				
 	    	&nbsp;
 		</div>
 
diff --git a/app/views/terms.blade.php b/app/views/terms.blade.php
new file mode 100644
index 000000000000..1e3439714308
--- /dev/null
+++ b/app/views/terms.blade.php
@@ -0,0 +1,210 @@
+@extends('master')
+
+@section('head')    
+<link href="{{ asset('css/bootstrap.splash.css') }}" rel="stylesheet" type="text/css"/> 
+<link href="{{ asset('css/splash.css') }}" rel="stylesheet" type="text/css"/>    
+<link href="{{ asset('images/apple-touch-icon-114x114-precomposed.png') }}" rel="apple-touch-icon-precomposed" sizes="114x114">
+<link href="{{ asset('images/apple-touch-icon-72x72-precomposed.png') }}" rel="apple-touch-icon-precomposed" sizes="72x72">
+<link href="{{ asset('images/apple-touch-icon-57x57-precomposed.png') }}" rel="apple-touch-icon-precomposed">
+@stop
+
+@section('body')
+
+  <div class="navbar" style="margin-bottom:0px">
+    <div class="container">
+      <div class="navbar-inner">
+        <a class="brand" href="#"><img src=
+          "images/invoiceninja-logo.png"></a>
+          <ul class="navbar-list">
+            <li>{{ link_to('about', 'About Us' ) }}</li>
+            <li>{{ link_to('contact', 'Contact Us' ) }}</li>
+            <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <section class="hero3" data-speed="2" data-type="background">
+    <div class="container">
+      <div class="caption">
+       <h1>Terms of Service & Conditions of Use
+       </h1>
+     </div>
+   </div>
+ </section>
+
+  <section class="about center">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+        <p>Invoice Ninja LLC provides this website and services under the following terms of service and conditions of use. By utilizing the invoiceNinja.com website you are agreeing to the following terms of service & conditions of use. You must be of legal age of majority to enter into a binding agreement to use invoiceninja.com. If you do not agree to the below terms & conditions, do not use invoiceninja.com. </p>
+      </div>
+    </div>
+  </div>
+  </section>
+
+
+
+
+ <section class="center">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+        <h2>Definitions</h2>
+        <p>Invoiceninja.com users who access invoiceninja.com services are defined as “User Accounts.” User Account clients who use access invoiceninja.com services to view and/or pay invoices are defined as “Clients.” The wording “data” and “content” are used interchangeably. </p></div>
+    </div>
+  </div>
+  </section>
+
+ <section class="center">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+        <h2>Responsibility</h2>
+        <p>User Accounts must ensure the confidentiality of usernames and passwords used to access their account. User Accounts are responsible for all activity occurring under their account including all laws relating to data, privacy, personal information, international copyright and trademark laws.</p>
+      </div>
+    </div>
+  </div>
+  </section>
+
+ <section class="center">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+        <h2>Data Ownership</h2>
+        <p>The User Accounts owns all data generated in their invoiceninja.com account. Invoiceninja.com will not modify or distribute User Account data. Invoiceninja.com will store and access data solely for the purpose of providing services to User Accounts.</p>
+        <p>User Accounts are responsible for their data. Invoiceninja.com has no responsibility or liability for User Account data or Client experience. User Accounts are responsible for any loss or damage a User Account may cause to their Clients or other people. Although we have no obligation to do so, if deemed legally necessary invoiceninja.com has absolute discretion to remove or edit User Account data without notice or penalty.</p>
+        <p>Invoiceninja.com does not own User Account data, but we do reserve the right to use User Account data as necessary to operate invoiceninja.com and improve User Account services.</p>
+      </div>
+    </div>
+  </div>
+  </section>
+
+
+ <section class="center">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+        <h2>Copyright & Trademarks</h2>
+        <p>User Accounts are responsible that company logos, graphics, and content uploaded to invoiceninja.com do not infringe on international copyright & trademark law.</p>
+      </div>
+    </div>
+  </div>
+  </section>
+
+
+ <section class="center">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+        <h2>Open Source License</h2>
+        <p>Invoiceninja.com is an open source application and invoiceninja.com source code is governed by international attribution assurances licensing: <a href="https://github.com/hillelcoren/invoice-ninja/blob/master/LICENSE" target="_blank">https://github.com/hillelcoren/invoice-ninja/blob/master/LICENSE</a>.</p>
+      </div>
+    </div>
+  </div>
+  </section>
+
+
+ <section class="center">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+        <h2>User Account Limited License </h2>
+        <p>Invoiceninja.com grants User Accounts & Clients a limited license to access the invoiceninja.com services such as User Account creation and all invoiceninja.om services, and Client services such as viewing invoices, downloading invoices, and printing invoices. This limited license may be revoked if deemed legally necessary without notice or penalty.</p>
+      </div>
+    </div>
+  </div>
+  </section>
+
+
+ <section class="center">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+        <h2>Use of Emailing Services</h2>
+        <p>Keep it legal and clean. Any User Account emailing invoices data, hyper-links, or other material that is unlawful, libelous, defamatory, pornographic, harassing, invasive, fraudulent or otherwise objectionable will be deactivated.</p>
+        <p>Content that would constitute criminal offence or create legal liability, violate copyright, trademark, or intellectual property will be deleted or provided to legal authorities.</p>
+      </div>
+    </div>
+  </div>
+  </section>
+
+
+ <section class="center">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+        <h2>Security</h2>
+        <p>Invoiceninja.com does not store or obtain credit card or sensitive financial data in any form. Responsibility for Third-Party Material User Account may utilize hyper-linking to third-party web sites. Invoiceninja.com takes no responsibility for third party content.</p>
+      </div>
+    </div>
+  </div>
+  </section>
+
+
+ <section class="center">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+        <h2>Limited Liability</h2>
+        <p>User Accounts and Clients agree to indemnify, defend, and hold invoiceninja.com, its directors or employees harmless against any and all liability and cost as a result of using invoiceninja.com. User Accounts and Clients shall not assert any claim or allegation of any nature whatsoever against invoiceninja.com, its directors or employees. </p>
+        <p>Invoiceninja.com shall not be liable for damages of any kind, including but not limited to loss of site use, loss of profits or loss of data, tort or otherwise, arising out of or in any way connected with the use of or inability to use invoiceninja.com.</p>
+        <p>You shall defend, indemnify and hold harmless invoiceninja.com from any loss, damages, liabilities, expenses, claims and proceedings arising out of your use of invoiceninja.com.</p>
+      </div>
+    </div>
+  </div>
+  </section>
+
+ <section class="center">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2">
+        <h2>Availability</h2>
+        <p>Invoiceninja.com uses third party hosting that strives to ensure maximum uptime. However, invoiceninja.com cannot guarantee uninterrupted access invoiceninja.com. Invoiceninja.com reserves the right to interrupt access to invoiceninja.com for the sake of forming maintenance, updates, and security requirements.</p>
+      </div>
+    </div>
+  </div>
+  </section>
+
+  <p>&nbsp;</p>
+  <p>&nbsp;</p>
+
+
+<footer>
+  <div class="navbar" style="margin-bottom:0px">
+    <div class="container">
+      <div class="social">
+                    <!--
+                    <a href="http://twitter.com/eas_id"><span class=
+                    "socicon">c</span></a> 
+                  -->
+                  <a href=
+                  "http://facebook.com/invoiceninja" target="_blank"><span class=
+                  "socicon">b</span></a> <a href=
+                  "http://twitter.com/invoiceninja" target="_blank"><span class=
+                  "socicon">a</span></a>
+                  <p>Copyright © 2014 InvoiceNinja. All rights reserved.</p>
+                </div>
+
+                <div class="navbar-inner">
+                  <ul class="navbar-list">
+                    <li>{{ link_to('about', 'About Us' ) }}</li>
+                    <li>{{ link_to('contact', 'Contact Us' ) }}</li>
+                    <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
+                  </ul>
+
+                    <!--
+                    <ul class="navbar-list">
+                        <li><a href="#">For developers</a></li>
+                        <li><a href="#">Jobs</a></li>
+                        <li><a href="#">Terms &amp; Conditions</a></li>
+                        <li><a href="#">Our Blog</a></li>
+                    </ul>
+                  -->
+                </div>
+              </div>
+            </div>
+          </footer><script src="{{ asset('/js/retina-1.1.0.min.js') }}" type="text/javascript"></script>
+
+          @stop
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 3b02729eb5f1..2c6dd513bfec 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
 		"zizaco/confide": "3.1.x",
 		"anahkiasen/former": "dev-master",
 		"barryvdh/laravel-debugbar": "dev-master",
-		"chumper/datatable": "dev-master",
+		"chumper/datatable": "2.x",
 		"omnipay/omnipay": "2.x",
 		"intervention/image": "dev-master",
 		"webpatser/laravel-countries": "dev-master",
diff --git a/composer.lock b/composer.lock
index 078fca440f1d..e1030c95c263 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "3630c03bc1f8da2e4855eb259f430c71",
+    "hash": "b306f3209c9e8e892376f06c452c16d8",
     "packages": [
         {
             "name": "anahkiasen/former",
@@ -107,12 +107,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Anahkiasen/rocketeer.git",
-                "reference": "f25f73671938cf8a29b11c3c8b773e47f78663ff"
+                "reference": "c0ecd5773611c65256fbc7e1dea4e3780a19c743"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Anahkiasen/rocketeer/zipball/f25f73671938cf8a29b11c3c8b773e47f78663ff",
-                "reference": "f25f73671938cf8a29b11c3c8b773e47f78663ff",
+                "url": "https://api.github.com/repos/Anahkiasen/rocketeer/zipball/c0ecd5773611c65256fbc7e1dea4e3780a19c743",
+                "reference": "c0ecd5773611c65256fbc7e1dea4e3780a19c743",
                 "shasum": ""
             },
             "require": {
@@ -143,14 +143,14 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-develop": "1.2-dev"
+                    "dev-develop": "1.3-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Rocketeer\\": [
                         "src/Rocketeer",
-                        "tests/"
+                        "tests"
                     ]
                 }
             },
@@ -170,7 +170,7 @@
                 "laravel",
                 "ssh"
             ],
-            "time": "2014-02-21 18:34:20"
+            "time": "2014-03-10 14:56:07"
         },
         {
             "name": "anahkiasen/underscore-php",
@@ -221,18 +221,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "7ffde7c3627e18760a2713cd0260472436fe488c"
+                "reference": "e94bed1e6276dab47699179dceee694bb6713606"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/7ffde7c3627e18760a2713cd0260472436fe488c",
-                "reference": "7ffde7c3627e18760a2713cd0260472436fe488c",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/e94bed1e6276dab47699179dceee694bb6713606",
+                "reference": "e94bed1e6276dab47699179dceee694bb6713606",
                 "shasum": ""
             },
             "require": {
                 "illuminate/filesystem": "~4.0",
                 "illuminate/support": "~4.0",
-                "maximebf/debugbar": "~1.9",
+                "maximebf/debugbar": "1.9.x",
                 "php": ">=5.3.0",
                 "symfony/finder": "~2.3"
             },
@@ -260,20 +260,20 @@
                 "profiler",
                 "webprofiler"
             ],
-            "time": "2014-02-24 15:47:08"
+            "time": "2014-03-07 14:52:36"
         },
         {
             "name": "chumper/datatable",
-            "version": "dev-master",
+            "version": "2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Chumper/Datatable.git",
-                "reference": "c3aa3f189a8b75efdb049210d39898cc9a8caafe"
+                "reference": "0252085dc04db6e511bf3ac833fd11150d8e6a2b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Chumper/Datatable/zipball/c3aa3f189a8b75efdb049210d39898cc9a8caafe",
-                "reference": "c3aa3f189a8b75efdb049210d39898cc9a8caafe",
+                "url": "https://api.github.com/repos/Chumper/Datatable/zipball/0252085dc04db6e511bf3ac833fd11150d8e6a2b",
+                "reference": "0252085dc04db6e511bf3ac833fd11150d8e6a2b",
                 "shasum": ""
             },
             "require": {
@@ -312,7 +312,7 @@
                 "jquery",
                 "laravel"
             ],
-            "time": "2014-02-23 17:47:19"
+            "time": "2014-03-10 20:12:28"
         },
         {
             "name": "classpreloader/classpreloader",
@@ -367,12 +367,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "57072cb9dbf23dfd7f2806de61e54ccc57cbbdef"
+                "reference": "23d5bf8e5976ac43a8b17450369023a30dcefafa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/57072cb9dbf23dfd7f2806de61e54ccc57cbbdef",
-                "reference": "57072cb9dbf23dfd7f2806de61e54ccc57cbbdef",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/23d5bf8e5976ac43a8b17450369023a30dcefafa",
+                "reference": "23d5bf8e5976ac43a8b17450369023a30dcefafa",
                 "shasum": ""
             },
             "require": {
@@ -387,6 +387,7 @@
                 "symfony/yaml": "~2.3"
             },
             "require-dev": {
+                "codeception/specify": "*",
                 "facebook/php-sdk": "3.*",
                 "videlalvaro/php-amqplib": "*"
             },
@@ -422,7 +423,7 @@
                 "functional testing",
                 "unit testing"
             ],
-            "time": "2014-02-24 23:38:17"
+            "time": "2014-03-07 03:54:31"
         },
         {
             "name": "d11wtq/boris",
@@ -859,12 +860,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "18f50ac4317d82ecfe88b6b1ed46d071478c5022"
+                "reference": "68352b3ffc76bee1979d411eba6f0136fe9b5630"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/18f50ac4317d82ecfe88b6b1ed46d071478c5022",
-                "reference": "18f50ac4317d82ecfe88b6b1ed46d071478c5022",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/68352b3ffc76bee1979d411eba6f0136fe9b5630",
+                "reference": "68352b3ffc76bee1979d411eba6f0136fe9b5630",
                 "shasum": ""
             },
             "require": {
@@ -901,7 +902,7 @@
                 "thumbnail",
                 "watermark"
             ],
-            "time": "2014-02-20 15:58:24"
+            "time": "2014-02-28 10:26:09"
         },
         {
             "name": "ircmaxell/password-compat",
@@ -1136,12 +1137,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "f7935afc541fc15324efc8538c60866e593ee447"
+                "reference": "cdfd959d4bf48404a0c46985da801d46c67c6391"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/f7935afc541fc15324efc8538c60866e593ee447",
-                "reference": "f7935afc541fc15324efc8538c60866e593ee447",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/cdfd959d4bf48404a0c46985da801d46c67c6391",
+                "reference": "cdfd959d4bf48404a0c46985da801d46c67c6391",
                 "shasum": ""
             },
             "require": {
@@ -1204,7 +1205,7 @@
                 "iron-io/iron_mq": "1.5.*",
                 "mockery/mockery": "0.9.*",
                 "pda/pheanstalk": "2.1.*",
-                "phpunit/phpunit": "3.7.*"
+                "phpunit/phpunit": "4.0.*"
             },
             "suggest": {
                 "doctrine/dbal": "Allow renaming columns and dropping SQLite columns."
@@ -1245,7 +1246,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2014-02-25 22:33:32"
+            "time": "2014-03-10 20:05:42"
         },
         {
             "name": "laravelbook/ardent",
@@ -1308,21 +1309,22 @@
         },
         {
             "name": "maximebf/debugbar",
-            "version": "1.9.4",
+            "version": "1.9.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "5bbb3bc78b3e9ee0c4cc8c3619171ea16f0fb51f"
+                "reference": "d076e51b3a28dccbb1b2683c8abb303551e17d27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/5bbb3bc78b3e9ee0c4cc8c3619171ea16f0fb51f",
-                "reference": "5bbb3bc78b3e9ee0c4cc8c3619171ea16f0fb51f",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/d076e51b3a28dccbb1b2683c8abb303551e17d27",
+                "reference": "d076e51b3a28dccbb1b2683c8abb303551e17d27",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0",
-                "psr/log": "~1.0"
+                "psr/log": "~1.0",
+                "raveren/kint": "0.9"
             },
             "require-dev": {
                 "php": ">=5.3.0"
@@ -1354,7 +1356,7 @@
             "keywords": [
                 "debug"
             ],
-            "time": "2014-02-14 16:30:44"
+            "time": "2014-03-04 17:18:45"
         },
         {
             "name": "monolog/monolog",
@@ -1362,12 +1364,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "7085f3e424dfbaba98461a433f6c55fec3229355"
+                "reference": "dc75a998d83ebb285b94b1a6fd96644b457ed33c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/7085f3e424dfbaba98461a433f6c55fec3229355",
-                "reference": "7085f3e424dfbaba98461a433f6c55fec3229355",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/dc75a998d83ebb285b94b1a6fd96644b457ed33c",
+                "reference": "dc75a998d83ebb285b94b1a6fd96644b457ed33c",
                 "shasum": ""
             },
             "require": {
@@ -1375,8 +1377,8 @@
                 "psr/log": "~1.0"
             },
             "require-dev": {
-                "aws/aws-sdk-php": "~2.4.8",
-                "doctrine/couchdb": "dev-master",
+                "aws/aws-sdk-php": "~2.4, >2.4.8",
+                "doctrine/couchdb": "~1.0@dev",
                 "graylog2/gelf-php": "~1.0",
                 "phpunit/phpunit": "~3.7.0",
                 "raven/raven": "~0.5",
@@ -1389,6 +1391,7 @@
                 "ext-mongo": "Allow sending log messages to a MongoDB server",
                 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
                 "raven/raven": "Allow sending log messages to a Sentry server",
+                "rollbar/rollbar": "Allow sending log messages to Rollbar",
                 "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
             },
             "type": "library",
@@ -1421,7 +1424,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2014-02-25 22:48:41"
+            "time": "2014-03-09 20:51:48"
         },
         {
             "name": "nesbot/carbon",
@@ -3113,12 +3116,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/orchestral/testbench.git",
-                "reference": "425d887bc5357dc2929da4887c8a13b3ba67a17e"
+                "reference": "5582dc10637678a0a9f723fa6e2f181f6bc2d786"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/orchestral/testbench/zipball/425d887bc5357dc2929da4887c8a13b3ba67a17e",
-                "reference": "425d887bc5357dc2929da4887c8a13b3ba67a17e",
+                "url": "https://api.github.com/repos/orchestral/testbench/zipball/5582dc10637678a0a9f723fa6e2f181f6bc2d786",
+                "reference": "5582dc10637678a0a9f723fa6e2f181f6bc2d786",
                 "shasum": ""
             },
             "require": {
@@ -3132,8 +3135,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Orchestra\\Testbench": "src/"
+                "psr-4": {
+                    "Orchestra\\Testbench\\": "src/Testbench/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -3152,20 +3155,20 @@
             "keywords": [
                 "laravel"
             ],
-            "time": "2014-02-19 14:52:34"
+            "time": "2014-03-03 04:47:07"
         },
         {
             "name": "patchwork/utf8",
-            "version": "v1.1.18",
+            "version": "v1.1.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nicolas-grekas/Patchwork-UTF8.git",
-                "reference": "66a936cc633fe13378c91f81030d5193be968480"
+                "reference": "aea0de833cba7cf2c25239be71f2787edaee36d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/66a936cc633fe13378c91f81030d5193be968480",
-                "reference": "66a936cc633fe13378c91f81030d5193be968480",
+                "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/aea0de833cba7cf2c25239be71f2787edaee36d5",
+                "reference": "aea0de833cba7cf2c25239be71f2787edaee36d5",
                 "shasum": ""
             },
             "require": {
@@ -3203,7 +3206,7 @@
                 "utf-8",
                 "utf8"
             ],
-            "time": "2014-02-02 17:09:49"
+            "time": "2014-03-01 20:01:07"
         },
         {
             "name": "patricktalmadge/bootstrapper",
@@ -3211,12 +3214,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/patricktalmadge/bootstrapper.git",
-                "reference": "c0cee9c65ea063b0817e0c5f788371bbcbbf7d71"
+                "reference": "53c5e7c0b70210ac34f298d3cf7831b2bfbeb8eb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/patricktalmadge/bootstrapper/zipball/c0cee9c65ea063b0817e0c5f788371bbcbbf7d71",
-                "reference": "c0cee9c65ea063b0817e0c5f788371bbcbbf7d71",
+                "url": "https://api.github.com/repos/patricktalmadge/bootstrapper/zipball/53c5e7c0b70210ac34f298d3cf7831b2bfbeb8eb",
+                "reference": "53c5e7c0b70210ac34f298d3cf7831b2bfbeb8eb",
                 "shasum": ""
             },
             "require": {
@@ -3258,7 +3261,7 @@
                 "bootstrap",
                 "laravel"
             ],
-            "time": "2014-02-24 10:46:34"
+            "time": "2014-03-07 22:01:49"
         },
         {
             "name": "phpseclib/phpseclib",
@@ -3266,12 +3269,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "76c9692908a6c25601df2db373043fcbb335332e"
+                "reference": "5dcc63ef6ca720b1617cff33b445d9b318c9ad03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/76c9692908a6c25601df2db373043fcbb335332e",
-                "reference": "76c9692908a6c25601df2db373043fcbb335332e",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/5dcc63ef6ca720b1617cff33b445d9b318c9ad03",
+                "reference": "5dcc63ef6ca720b1617cff33b445d9b318c9ad03",
                 "shasum": ""
             },
             "require": {
@@ -3296,7 +3299,8 @@
                     "Crypt": "phpseclib/",
                     "File": "phpseclib/",
                     "Math": "phpseclib/",
-                    "Net": "phpseclib/"
+                    "Net": "phpseclib/",
+                    "System": "phpseclib/"
                 },
                 "files": [
                     "phpseclib/Crypt/Random.php"
@@ -3352,26 +3356,26 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2014-02-23 01:03:22"
+            "time": "2014-03-06 11:05:11"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "1.2.x-dev",
+            "version": "1.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "69e55e68481cf708a6db43aff0b504e31402fe27"
+                "reference": "466e7cd2554b4e264c9e3f31216d25ac0e5f3d94"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/69e55e68481cf708a6db43aff0b504e31402fe27",
-                "reference": "69e55e68481cf708a6db43aff0b504e31402fe27",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/466e7cd2554b4e264c9e3f31216d25ac0e5f3d94",
+                "reference": "466e7cd2554b4e264c9e3f31216d25ac0e5f3d94",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
                 "phpunit/php-file-iterator": ">=1.3.0@stable",
-                "phpunit/php-text-template": ">=1.2.0@stable",
+                "phpunit/php-text-template": ">=1.1.1@stable",
                 "phpunit/php-token-stream": ">=1.1.3@stable"
             },
             "require-dev": {
@@ -3413,11 +3417,11 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-02-25 03:34:05"
+            "time": "2013-09-10 08:14:32"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "dev-master",
+            "version": "1.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
@@ -3462,16 +3466,16 @@
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "dev-master",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
+                "reference": "5180896f51c5b3648ac946b05f9ec02be78a0b23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5180896f51c5b3648ac946b05f9ec02be78a0b23",
+                "reference": "5180896f51c5b3648ac946b05f9ec02be78a0b23",
                 "shasum": ""
             },
             "require": {
@@ -3502,11 +3506,11 @@
             "keywords": [
                 "template"
             ],
-            "time": "2014-01-30 17:20:04"
+            "time": "2012-10-31 18:15:28"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "dev-master",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
@@ -3554,12 +3558,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "292f4d5772dad5a12775be69f4a8dd663b20f103"
+                "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/292f4d5772dad5a12775be69f4a8dd663b20f103",
-                "reference": "292f4d5772dad5a12775be69f4a8dd663b20f103",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32",
+                "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32",
                 "shasum": ""
             },
             "require": {
@@ -3596,7 +3600,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2013-10-21 14:03:39"
+            "time": "2014-03-03 05:10:30"
         },
         {
             "name": "phpunit/phpunit",
@@ -3604,12 +3608,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2752cbb9ea5bd84c2811b34b6953f76965ec7a2f"
+                "reference": "4dbc3ab5de25a9ffd07796519f9f7f4aaddc37e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2752cbb9ea5bd84c2811b34b6953f76965ec7a2f",
-                "reference": "2752cbb9ea5bd84c2811b34b6953f76965ec7a2f",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4dbc3ab5de25a9ffd07796519f9f7f4aaddc37e0",
+                "reference": "4dbc3ab5de25a9ffd07796519f9f7f4aaddc37e0",
                 "shasum": ""
             },
             "require": {
@@ -3619,9 +3623,9 @@
                 "ext-spl": "*",
                 "php": ">=5.3.3",
                 "phpunit/php-code-coverage": "~1.2.1",
-                "phpunit/php-file-iterator": ">=1.3.1",
-                "phpunit/php-text-template": ">=1.1.1",
-                "phpunit/php-timer": ">=1.0.4",
+                "phpunit/php-file-iterator": "~1.3.1",
+                "phpunit/php-text-template": "~1.1.1",
+                "phpunit/php-timer": "~1.0.4",
                 "phpunit/phpunit-mock-objects": "~1.2.0",
                 "symfony/yaml": "~2.0"
             },
@@ -3632,7 +3636,7 @@
                 "ext-json": "*",
                 "ext-simplexml": "*",
                 "ext-tokenizer": "*",
-                "phpunit/php-invoker": ">=1.1.0,<1.2.0"
+                "phpunit/php-invoker": "~1.1"
             },
             "bin": [
                 "composer/bin/phpunit"
@@ -3670,7 +3674,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-02-25 03:47:29"
+            "time": "2014-03-05 12:52:24"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -3819,6 +3823,52 @@
             ],
             "time": "2014-01-18 15:33:09"
         },
+        {
+            "name": "raveren/kint",
+            "version": "v0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/raveren/kint.git",
+                "reference": "ada810111ced4e3a926b4040da9b86442e43b613"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/raveren/kint/zipball/ada810111ced4e3a926b4040da9b86442e43b613",
+                "reference": "ada810111ced4e3a926b4040da9b86442e43b613",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Kint.class.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Rokas Šleinius",
+                    "homepage": "https://github.com/raveren"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/raveren/kint/contributors"
+                }
+            ],
+            "description": "Kint - debugging helper for PHP developers",
+            "homepage": "https://github.com/raveren/kint",
+            "keywords": [
+                "debug",
+                "kint",
+                "php"
+            ],
+            "time": "2013-08-12 22:46:16"
+        },
         {
             "name": "stack/builder",
             "version": "dev-master",
@@ -3980,12 +4030,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Console.git",
-                "reference": "43717a2ba9a8695dac525b928134d1b6d620f13a"
+                "reference": "ef20f1f58d7f693ee888353962bd2db336e3bbcb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/43717a2ba9a8695dac525b928134d1b6d620f13a",
-                "reference": "43717a2ba9a8695dac525b928134d1b6d620f13a",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/ef20f1f58d7f693ee888353962bd2db336e3bbcb",
+                "reference": "ef20f1f58d7f693ee888353962bd2db336e3bbcb",
                 "shasum": ""
             },
             "require": {
@@ -4026,7 +4076,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "http://symfony.com",
-            "time": "2014-02-18 15:41:06"
+            "time": "2014-03-01 17:35:04"
         },
         {
             "name": "symfony/css-selector",
@@ -4035,12 +4085,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/CssSelector.git",
-                "reference": "ed1d61b2e23a0fd5dba0b20651258c4633d3e3a7"
+                "reference": "76ce933792a3b4fcb8ea9b017081327c2dc3c65b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/ed1d61b2e23a0fd5dba0b20651258c4633d3e3a7",
-                "reference": "ed1d61b2e23a0fd5dba0b20651258c4633d3e3a7",
+                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/76ce933792a3b4fcb8ea9b017081327c2dc3c65b",
+                "reference": "76ce933792a3b4fcb8ea9b017081327c2dc3c65b",
                 "shasum": ""
             },
             "require": {
@@ -4079,7 +4129,7 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "http://symfony.com",
-            "time": "2014-02-11 13:52:09"
+            "time": "2014-03-01 17:35:04"
         },
         {
             "name": "symfony/debug",
@@ -4088,12 +4138,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Debug.git",
-                "reference": "23b5f4fcad883679d9a6e1cbc568247fe606d8ee"
+                "reference": "412b76458b60a645a9daacdd49f57d704c84c4d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Debug/zipball/23b5f4fcad883679d9a6e1cbc568247fe606d8ee",
-                "reference": "23b5f4fcad883679d9a6e1cbc568247fe606d8ee",
+                "url": "https://api.github.com/repos/symfony/Debug/zipball/412b76458b60a645a9daacdd49f57d704c84c4d4",
+                "reference": "412b76458b60a645a9daacdd49f57d704c84c4d4",
                 "shasum": ""
             },
             "require": {
@@ -4136,7 +4186,7 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "http://symfony.com",
-            "time": "2014-02-11 13:52:09"
+            "time": "2014-03-01 17:35:04"
         },
         {
             "name": "symfony/dom-crawler",
@@ -4145,12 +4195,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/DomCrawler.git",
-                "reference": "f0b3d9f4b4bb8ec4b5fa57e8cb6bd8ff4e972b19"
+                "reference": "4bebef4fd60f15e3fc58f684550beae1f9162f30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/f0b3d9f4b4bb8ec4b5fa57e8cb6bd8ff4e972b19",
-                "reference": "f0b3d9f4b4bb8ec4b5fa57e8cb6bd8ff4e972b19",
+                "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/4bebef4fd60f15e3fc58f684550beae1f9162f30",
+                "reference": "4bebef4fd60f15e3fc58f684550beae1f9162f30",
                 "shasum": ""
             },
             "require": {
@@ -4191,7 +4241,7 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "http://symfony.com",
-            "time": "2014-02-18 15:41:06"
+            "time": "2014-03-01 17:35:04"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -4305,12 +4355,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Finder.git",
-                "reference": "d712f4a26737300b4d7546705a4fb15feeb3e96f"
+                "reference": "ab301c7d21f536c34ab6c2c79dba8d465104c518"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Finder/zipball/d712f4a26737300b4d7546705a4fb15feeb3e96f",
-                "reference": "d712f4a26737300b4d7546705a4fb15feeb3e96f",
+                "url": "https://api.github.com/repos/symfony/Finder/zipball/ab301c7d21f536c34ab6c2c79dba8d465104c518",
+                "reference": "ab301c7d21f536c34ab6c2c79dba8d465104c518",
                 "shasum": ""
             },
             "require": {
@@ -4345,7 +4395,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "http://symfony.com",
-            "time": "2014-02-24 16:20:54"
+            "time": "2014-03-01 17:35:04"
         },
         {
             "name": "symfony/http-foundation",
@@ -4354,12 +4404,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpFoundation.git",
-                "reference": "cdee7c84ba8b2a8aafa1c055f5cb4f640d81c129"
+                "reference": "97052d99f8eea42975ef21e3dba01cb550913157"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/cdee7c84ba8b2a8aafa1c055f5cb4f640d81c129",
-                "reference": "cdee7c84ba8b2a8aafa1c055f5cb4f640d81c129",
+                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/97052d99f8eea42975ef21e3dba01cb550913157",
+                "reference": "97052d99f8eea42975ef21e3dba01cb550913157",
                 "shasum": ""
             },
             "require": {
@@ -4397,7 +4447,7 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "http://symfony.com",
-            "time": "2014-02-11 15:39:28"
+            "time": "2014-03-04 07:36:26"
         },
         {
             "name": "symfony/http-kernel",
@@ -4406,12 +4456,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpKernel.git",
-                "reference": "1e1a8e4f1040d744086e9bdaa979f015789b4af6"
+                "reference": "2b803c45c454751c503a7d4f15fce4aa4a9e4686"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/1e1a8e4f1040d744086e9bdaa979f015789b4af6",
-                "reference": "1e1a8e4f1040d744086e9bdaa979f015789b4af6",
+                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/2b803c45c454751c503a7d4f15fce4aa4a9e4686",
+                "reference": "2b803c45c454751c503a7d4f15fce4aa4a9e4686",
                 "shasum": ""
             },
             "require": {
@@ -4470,7 +4520,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "http://symfony.com",
-            "time": "2014-02-12 21:00:41"
+            "time": "2014-03-04 17:06:29"
         },
         {
             "name": "symfony/process",
@@ -4653,12 +4703,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "e49a47d60348665261f6e279ba383241deb73cab"
+                "reference": "6194137af5f12fbcfc0cb21e269f47542b8beb47"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/e49a47d60348665261f6e279ba383241deb73cab",
-                "reference": "e49a47d60348665261f6e279ba383241deb73cab",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/6194137af5f12fbcfc0cb21e269f47542b8beb47",
+                "reference": "6194137af5f12fbcfc0cb21e269f47542b8beb47",
                 "shasum": ""
             },
             "require": {
@@ -4693,7 +4743,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "http://symfony.com",
-            "time": "2014-02-24 16:21:51"
+            "time": "2014-03-03 12:53:01"
         },
         {
             "name": "webpatser/laravel-countries",
@@ -4701,12 +4751,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/webpatser/laravel-countries.git",
-                "reference": "b38d62c3559011b3f34bb4059bcd52ec54907512"
+                "reference": "0631c1c6211303990561185cea280c9965c1a5a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webpatser/laravel-countries/zipball/b38d62c3559011b3f34bb4059bcd52ec54907512",
-                "reference": "b38d62c3559011b3f34bb4059bcd52ec54907512",
+                "url": "https://api.github.com/repos/webpatser/laravel-countries/zipball/0631c1c6211303990561185cea280c9965c1a5a9",
+                "reference": "0631c1c6211303990561185cea280c9965c1a5a9",
                 "shasum": ""
             },
             "require": {
@@ -4745,7 +4795,7 @@
                 "iso_3166_3",
                 "laravel"
             ],
-            "time": "2014-01-11 14:44:54"
+            "time": "2014-03-02 11:42:11"
         },
         {
             "name": "zizaco/confide",
@@ -4820,7 +4870,6 @@
         "patricktalmadge/bootstrapper": 20,
         "anahkiasen/former": 20,
         "barryvdh/laravel-debugbar": 20,
-        "chumper/datatable": 20,
         "intervention/image": 20,
         "webpatser/laravel-countries": 20,
         "anahkiasen/rocketeer": 20,
diff --git a/public/css/style.css b/public/css/style.css
index 0be98f592656..aeffff8f4c0d 100755
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -220,10 +220,18 @@ border-color: #0b4d78;
 margin-left: 10px !important;
 }
 
+/*alerts*/
+
+.alert {
+padding: 15px;
+border: none;
+border-radius: 3px;
+}
+
 /*new*/
 
 div {
-    word-break: break-all;
+    word-break: break-word;
 }
 
 div.required > label {
diff --git a/public/images/Thumbs.db b/public/images/Thumbs.db
index bd32adc8a64d..1a1453dba105 100644
Binary files a/public/images/Thumbs.db and b/public/images/Thumbs.db differ
diff --git a/public/images/about1@2x.jpg b/public/images/about1@2x.jpg
new file mode 100644
index 000000000000..e03eb5fa91da
Binary files /dev/null and b/public/images/about1@2x.jpg differ
diff --git a/public/images/about2@2x.jpg b/public/images/about2@2x.jpg
new file mode 100644
index 000000000000..cfab2e26f45b
Binary files /dev/null and b/public/images/about2@2x.jpg differ