Merge https://github.com/codedge/invoiceninja into codedge-#904-Unify-js-no-public-js

Conflicts:
	app/Http/Controllers/AccountController.php
	resources/lang/en/texts.php

.codeclimate.yml

@@ -0,0 +1,36 @@
+engines:
+  csslint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+      - javascript
+      - python
+      - php
+  eslint:
+    enabled: false
+  fixme:
+    enabled: true
+  phpmd:
+    enabled: true
+ratings:
+  paths:
+  - "**.css"
+  - "**.inc"
+  - "**.js"
+  - "**.jsx"
+  - "**.module"
+  - "**.php"
+  - "**.py"
+  - "**.rb"
+exclude_paths:
+- "bootstrap/cache"
+- "resources/"
+- "storage/"
+- "tests/"
+- "**.md"
+- "**.min.js"
+- "**.min.php"
+- "**.min.css"

README.md

@@ -4,7 +4,7 @@
 
 # Invoice Ninja
 
-[![Build Status](https://travis-ci.org/invoiceninja/invoiceninja.svg?branch=develop)](https://travis-ci.org/invoiceninja/invoiceninja)
+[![Build Status](https://travis-ci.org/invoiceninja/invoiceninja.svg?branch=master)](https://travis-ci.org/invoiceninja/invoiceninja)
 [![Join the chat at https://gitter.im/hillelcoren/invoice-ninja](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hillelcoren/invoice-ninja?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ## [Hosted](https://www.invoiceninja.com) | [Self-hosted](https://invoiceninja.org)

app/Http/Controllers/AccountController.php

@@ -1461,7 +1461,6 @@ class AccountController extends BaseController
             return trans('texts.create_invoice_for_sample');
         }
 
-        /** @var \App\Models\Account $account */
         $account = Auth::user()->account;
         $invitation = $invoice->invitations->first();
 

app/Http/Controllers/DocumentController.php

@@ -95,6 +95,10 @@ class DocumentController extends BaseController
 
     public function postUpload(CreateDocumentRequest $request)
     {
+        if (!Utils::hasFeature(FEATURE_DOCUMENTS)) {
+            return;
+        }
+
         $result = $this->documentRepo->upload($request->all(), $doc_array);
 
         if(is_string($result)){

resources/lang/en/texts.php

@@ -2028,6 +2028,7 @@ $LANG = array(
     'apply_taxes' => 'Apply taxes',
     'min_to_max_users' => ':min to :max users',
     'max_users_reached' => 'The maximum number of users has been reached.',
+    'dwolla' => 'Dwolla',
     'buy_now_buttons' => 'Buy Now Buttons',
     'landing_page' => 'Landing Page',
     'payment_type' => 'Payment Type',