Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

# Conflicts:
#	composer.lock
#	resources/views/banking/accounts/index.blade.php
#	resources/views/banking/reconciliations/index.blade.php
#	resources/views/banking/transactions/index.blade.php
#	resources/views/banking/transfers/index.blade.php
#	resources/views/common/items/index.blade.php
#	resources/views/common/reports/index.blade.php
#	resources/views/purchases/bills/index.blade.php
#	resources/views/purchases/payments/index.blade.php
#	resources/views/purchases/vendors/index.blade.php
#	resources/views/sales/customers/index.blade.php
#	resources/views/sales/invoices/index.blade.php
#	resources/views/sales/revenues/index.blade.php

resources/views/settings/invoice/edit.blade.php

@@ -45,7 +45,7 @@
 
                     <div class="input-group">
                         <a href="#" class="btn btn-block btn-outline-primary" @click="onTemplate">
-                            {{ trans('settings.invoice.choose_template') }}
+                            <i class="fas fa-palette"></i>&nbsp; {{ trans('settings.invoice.choose_template') }}
                         </a>
                     </div>
                 </div>