diff --git a/README.md b/README.md
index 2550a6c25..370567157 100644
--- a/README.md
+++ b/README.md
@@ -53,3 +53,7 @@ Please see the documentation on [contributing and developing for Snipe-IT](https
 
 
 Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
+
+### Security
+
+To report a security vulnerability, please email security@snipeitapp.com instead of using the issue tracker. 
diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php
index a9cb4dbbf..fe5ee173e 100644
--- a/app/Models/Ldap.php
+++ b/app/Models/Ldap.php
@@ -277,7 +277,7 @@ class Ldap extends Model
             $global_count += $results['count'];
             $result_set = array_merge($result_set, $results);
 
-            ldap_control_paged_result_response($ldapconn, $search_results, $cookie);
+            @ldap_control_paged_result_response($ldapconn, $search_results, $cookie);
 
         } while ($cookie !== null && $cookie != '');
 
diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php
index 72717f754..439fb4273 100755
--- a/app/Models/Supplier.php
+++ b/app/Models/Supplier.php
@@ -18,7 +18,7 @@ class Supplier extends SnipeModel
         'address'           => 'min:3|max:50',
         'address2'          => 'min:2|max:50',
         'city'              => 'min:3|max:255',
-        'state'             => 'min:0|max:2',
+        'state'             => 'min:0|max:32',
         'country'           => 'min:0|max:2',
         'fax'               => 'min:7|max:20',
         'phone'             => 'min:7|max:20',
diff --git a/config/version.php b/config/version.php
index bb2e1941f..8a04a6713 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 return array (
   'app_version' => 'v3.6.2',
-  'build_version' => '10',
-  'hash_version' => 'g927a12f',
-  'full_hash' => 'v3.6.1-10-g927a12f',
+  'build_version' => '18',
+  'hash_version' => 'g6f1e0d6',
+  'full_hash' => 'v3.6.2-18-g6f1e0d6',
 );
diff --git a/database/migrations/2016_12_07_173720_increase_size_of_state_in_suppliers.php b/database/migrations/2016_12_07_173720_increase_size_of_state_in_suppliers.php
new file mode 100644
index 000000000..1c1468d23
--- /dev/null
+++ b/database/migrations/2016_12_07_173720_increase_size_of_state_in_suppliers.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class IncreaseSizeOfStateInSuppliers extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('suppliers', function ($table) {
+            $table->string('state', 32)->nullable()->default(null)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('suppliers', function ($table) {
+            $table->string('state', 2)->nullable()->default(null)->change();
+        });
+    }
+}
diff --git a/gulpfile.js b/gulpfile.js
index 20389efb9..69741dfad 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,5 +1,5 @@
 var elixir = require('laravel-elixir');
-require('laravel-elixir-codeception');
+require('laravel-elixir-codeception-standalone');
 /*
  |--------------------------------------------------------------------------
  | Elixir Asset Management
@@ -38,7 +38,7 @@ elixir(function(mix) {
     mix.version(['assets/css/app.css','assets/js/all.js']);
 
 
-    mix.codeception();
+    mix.codeception(null, { flags: '--report' });
 
 
 
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..e641044dc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,21 @@
+{
+  "private": true,
+  "scripts": {
+    "prod": "gulp --production",
+    "dev": "gulp watch"
+  },
+  "devDependencies": {
+    "bootstrap-sass": "^3.3.7",
+    "gulp": "^3.9.1",
+    "jquery": "^3.1.0",
+    "laravel-elixir": "^6.0.0-11",
+    "laravel-elixir-vue-2": "^0.2.0",
+    "laravel-elixir-webpack-official": "^1.0.2",
+    "lodash": "^4.16.2",
+    "vue": "^2.0.1",
+    "vue-resource": "^1.0.3"
+  },
+  "dependencies": {
+    "laravel-elixir-codeception": "^0.2.0"
+  }
+}
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 5b15f3bec..39881a0a6 100755
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -4,7 +4,7 @@
 {{-- Page content --}}
 @section('content')
 
-    <form role="form" action="{{ url('/login') }}" method="POST">
+    <form role="form" action="{{ url('/login') }}" method="POST" autocomplete="off">
         <input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
         <div class="container">
@@ -35,7 +35,7 @@
                                             {!! $errors->first('username', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
                                         </div>
                                         <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
-                                            <input class="form-control" placeholder="{{ trans('admin/users/table.password')  }}" name="password" type="password">
+                                            <input class="form-control" placeholder="{{ trans('admin/users/table.password')  }}" name="password" type="password" autocomplete="off">
                                             {!! $errors->first('password', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
                                         </div>
                                         <div class="checkbox">
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index e057edf46..089c50ad6 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -15,7 +15,6 @@
 <!-- Asset Tag -->
 <div class="form-group {{ $errors->has('asset_tag') ? ' has-error' : '' }}">
     <label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }}</label>
-</label>
 <div class="col-md-7 col-sm-12{{  (\App\Helpers\Helper::checkIfRequired($item, 'asset_tag')) ? ' required' : '' }}">
     @if  ($item->id)
     <input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', $item->asset_tag) }}" />
@@ -30,7 +29,6 @@
 <!-- Model -->
 <div class="form-group {{ $errors->has('model_id') ? ' has-error' : '' }}">
     <label for="parent" class="col-md-3 control-label">{{ trans('admin/hardware/form.model') }}</label>
-</label>
 <div class="col-md-7 col-sm-10{{  (\App\Helpers\Helper::checkIfRequired($item, 'model_id')) ? ' required' : '' }}">
     @if (isset($selected_model))
     {{ Form::select('model_id', $model_list , $selected_model->id, array('class'=>'select2 model', 'style'=>'width:100%','id' =>'model_select_id')) }}
@@ -418,4 +416,4 @@ $(function () {
             });
         });
     </script>
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 7d49c734a..0b7e1a09d 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -117,7 +117,7 @@
                   name="username"
                   id="username"
                   value="{{ Input::old('username', $user->username) }}"
-                  autocomplete="false"
+                  autocomplete="off"
                   readonly
                   onfocus="this.removeAttribute('readonly');"
                   {{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}
@@ -146,7 +146,7 @@
                   class="form-control"
                   id="password"
                   value=""
-                  autocomplete="false"
+                  autocomplete="off"
                   readonly
                   onfocus="this.removeAttribute('readonly');"
                   {{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}