diff --git a/.gitignore b/.gitignore
index c1315449fe..d9cb306538 100755
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ app/config/local/session.php
 app/storage/dumps/*
 tests/_support/_generated/*
 tests/_data/scenarios
+public/uploads/assets/*
diff --git a/app/commands/AppCommand.php b/app/commands/AppCommand.php
index 362054a4aa..5f50499bb4 100755
--- a/app/commands/AppCommand.php
+++ b/app/commands/AppCommand.php
@@ -222,12 +222,23 @@ class AppCommand extends Command
     {
         do {
             // Ask the user to input the user password
-            $password = $this->ask('Please enter your user password (at least 8 characters): ');
+            $password = $this->secret('Please enter your user password (at least 8 characters): ');
+            $password1 = $this->secret('Please confirm your user password: ');
 
             // Check if password is valid
-            if ($password == '') {
+            if ($password == '' || $password1 == '') {
                 // Return an error message
                 $this->error('Password is invalid. Please try again.');
+                $password = '';
+                $password1 = '';
+            }
+            else{
+                // Verify the user password
+                if ($password != $password1){
+                    $this->error('Password do not match. Please try again.');
+                    $password = '';
+                    $password1 = '';
+                }
             }
 
             // Store the password
@@ -235,19 +246,19 @@ class AppCommand extends Command
         } while( ! $password);
     }
 
-	/**
-	 * Asks the user to create dummy data
-	 *
-	 * @return void
-	 * @todo   Use the Laravel Validator
-	 */
-	protected function askUserDummyData()
-	{
-		// Ask the user to input the user password
-		$dummydata = $this->ask('Do you want to seed your database with dummy data? Y/n (default is yes): ');
+    /**
+     * Asks the user to create dummy data
+     *
+     * @return void
+     * @todo   Use the Laravel Validator
+     */
+    protected function askUserDummyData()
+    {
+        // Ask the user to input the user password
+        $dummydata = $this->ask('Do you want to seed your database with dummy data? y/N (default is no): ');
 
-		$this->dummyData = ( strstr($dummydata, 'Y' ) || empty($dummydata) ) ? true : false;
-	}
+        $this->dummyData = ( strstr($dummydata, 'N' ) || empty($dummydata) ) ? true : false;
+    }
 
     /**
      * Runs all the necessary Sentry commands.
diff --git a/app/config/version.php b/app/config/version.php
index 0bad2deb6c..eca2bd13a9 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-394',
-  'hash_version' => 'v2.0-394-g14ba5a3',
+  'app_version' => 'v2.0.5-pre',
+  'hash_version' => 'v2.0.5-pre-52-gbbe0189',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AccessoriesController.php b/app/controllers/admin/AccessoriesController.php
index 589300647f..4a5a2ef1ff 100755
--- a/app/controllers/admin/AccessoriesController.php
+++ b/app/controllers/admin/AccessoriesController.php
@@ -541,7 +541,7 @@ class AccessoriesController extends AdminController
 
             $rows[] = array(
                 'name'          => link_to('admin/accessories/'.$accessory->id.'/view', $accessory->name),
-                'category'      => $accessory->category->name,
+                'category'      => link_to('admin/settings/categories/'.$accessory->category->id.'/view', $accessory->category->name),
                 'qty'           => $accessory->qty,
                 'order_number'  => $accessory->order_number,
                 'purchase_date' => $accessory->purchase_date,
diff --git a/app/controllers/admin/AssetMaintenancesController.php b/app/controllers/admin/AssetMaintenancesController.php
index c7431df7c7..7959bad096 100644
--- a/app/controllers/admin/AssetMaintenancesController.php
+++ b/app/controllers/admin/AssetMaintenancesController.php
@@ -83,7 +83,7 @@
 
          foreach($maintenances as $maintenance) {
 
-             $actions = '<a href="'.route('update/location', $maintenance->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/statuslabel', $maintenance->id).'" data-content="'.Lang::get('admin/asset_maintenances/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($maintenance->title).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+             $actions = '<nobr><a href="'.route('update/asset_maintenance', $maintenance->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/statuslabel', $maintenance->id).'" data-content="'.Lang::get('admin/asset_maintenances/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($maintenance->title).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></nobr>';
 
             if (($maintenance->cost) && ($maintenance->asset->assetloc) &&  ($maintenance->asset->assetloc->currency!='')) {
                 $maintenance_cost = $maintenance->asset->assetloc->currency.$maintenance->cost;
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 1fd98b3df6..940c64b316 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -2,6 +2,7 @@
 
 use AdminController;
 use Input;
+use Image;
 use Lang;
 use Asset;
 use Supplier;
@@ -30,6 +31,7 @@ use Paginator;
 use Manufacturer; //for embedded-create
 use Artisan;
 use Symfony\Component\Console\Output\BufferedOutput;
+use Symfony\Component\HttpFoundation\JsonResponse;
 
 
 class AssetsController extends AdminController
@@ -173,6 +175,19 @@ class AssetsController extends AdminController
             $asset->physical            		= '1';
             $asset->depreciate          		= '0';
 
+	    // Create the image (if one was chosen.)
+            if (Input::file('image')) {
+                $image = Input::file('image');
+                $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/assets/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $asset->image = $file_name;
+
+            }
+
             // Was the asset created?
             if($asset->save()) {
 
@@ -185,7 +200,6 @@ class AssetsController extends AdminController
 					$logaction->note = e(Input::get('note'));
 					$log = $logaction->logaction('checkout');
 				}
-
                 // Redirect to the asset listing page
                 return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.create.success'));
             }
@@ -315,6 +329,20 @@ class AssetsController extends AdminController
             $asset->notes        = e(Input::get('notes'));
             $asset->physical     = '1';
 
+	    // Update the image
+            if (Input::file('image')) {
+                $image = Input::file('image');
+		  $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/assets/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $asset->image = $file_name;
+            }
+
+
+
             // Was the asset updated?
             if($asset->save()) {
                 // Redirect to the new asset page
@@ -1163,7 +1191,8 @@ class AssetsController extends AdminController
       'notes',
       'expected_checkin',
       'order_number',
-      'location'
+      'location',
+      'image',
     ];
 
     $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
@@ -1215,6 +1244,7 @@ class AssetsController extends AdminController
         $rows[] = array(
             'checkbox'      =>'<div class="text-center"><input type="checkbox" name="edit_asset['.$asset->id.']" class="one_required"></div>',
             'id'        => $asset->id,
+            'image' => ($asset->image!='') ? '<img src="'.Config::get('app.url').'/uploads/assets/'.$asset->image.'" height=50 width=50>' : (($asset->model->image!='') ? '<img src="'.Config::get('app.url').'/uploads/models/'.$asset->model->image.'" height=40 width=50>' : ''),
             'name'          => '<a title="'.$asset->name.'" href="hardware/'.$asset->id.'/view">'.$asset->name.'</a>',
             'asset_tag'     => '<a title="'.$asset->asset_tag.'" href="hardware/'.$asset->id.'/view">'.$asset->asset_tag.'</a>',
             'serial'        => $asset->serial,
diff --git a/app/controllers/admin/CategoriesController.php b/app/controllers/admin/CategoriesController.php
index 0ffeb6e9b3..f77edc22a6 100755
--- a/app/controllers/admin/CategoriesController.php
+++ b/app/controllers/admin/CategoriesController.php
@@ -299,6 +299,8 @@ class CategoriesController extends AdminController
       foreach ($category_assets as $asset) {
 
         $actions = '';
+        $inout='';
+        
         if ($asset->deleted_at=='') {
             $actions = '<div style=" white-space: nowrap;"><a href="'.route('clone/hardware', $asset->id).'" class="btn btn-info btn-sm" title="Clone asset"><i class="fa fa-files-o"></i></a> <a href="'.route('update/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/hardware', $asset->id).'" data-content="'.Lang::get('admin/hardware/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($asset->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
         } elseif ($asset->deleted_at!='') {
diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index 249fd39b72..12799f28f7 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -43,12 +43,12 @@ class UsersController extends AdminController {
     protected $validationRules = array(
         'first_name' => 'required|alpha_space|min:2',
         'last_name' => 'required|alpha_space|min:2',
-        'username' => 'required|min:2|unique:users,username',
+        'location_id' => 'numeric',
+        'username' => 'required|min:2|unique:users,username, ',
         'email' => 'email|unique:users,email',
         'password' => 'required|min:6',
         'password_confirm' => 'required|min:6|same:password',
         'company_id' => 'required|integer',
-        'location_id' => 'numeric',
     );
 
     /**
@@ -493,8 +493,8 @@ class UsersController extends AdminController {
         if ((!Input::has('edit_user')) || (count(Input::has('edit_user')) == 0)) {
             return Redirect::back()->with('error', 'No users selected');
         } else {
-            $statuslabel_list = array('' => Lang::get('general.select_statuslabel')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
-            $user_raw_array = Input::get('edit_user');
+            $statuslabel_list = statusLabelList();
+            $user_raw_array = array_keys(Input::get('edit_user'));
             $users = User::whereIn('id', $user_raw_array)->with('groups')->get();
             return View::make('backend/users/confirm-bulk-delete', compact('users', 'statuslabel_list'));
         }
diff --git a/app/database/migrations/2015_11_05_183749_image.php b/app/database/migrations/2015_11_05_183749_image.php
new file mode 100644
index 0000000000..8d5749a43a
--- /dev/null
+++ b/app/database/migrations/2015_11_05_183749_image.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class Image extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('assets', function(Blueprint $table)
+		{
+			$table->text('image')->after('notes')->nullable()->default(NULL);
+			//
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+  public function down()
+   {
+       Schema::table('assets', function ($table) {
+           $table->dropColumn('image');
+       });
+   }
+
+}
diff --git a/app/helpers.php b/app/helpers.php
index 4c1fece3ed..a643c5f830 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -39,7 +39,7 @@ function suppliersList() {
 }
 
 function statusLabelList() {
-    $statuslabel_list = Statuslabel::orderBy('name', 'asc')
+    $statuslabel_list = array('' => Lang::get('general.select_statuslabel')) + Statuslabel::orderBy('name', 'asc')
     ->lists('name', 'id');
     return $statuslabel_list;
 }
diff --git a/app/lang/en/admin/hardware/table.php b/app/lang/en/admin/hardware/table.php
index 62dbc28ce1..e8baa09d5a 100755
--- a/app/lang/en/admin/hardware/table.php
+++ b/app/lang/en/admin/hardware/table.php
@@ -18,6 +18,7 @@ return array(
     'serial'   		=> 'Serial',
     'status'   		=> 'Status',
     'title'      	=> 'Asset ',
+    'image'		=> 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance'
 
 );
diff --git a/app/lang/en/general.php b/app/lang/en/general.php
index 9d4613a7a0..4bea5e05e6 100755
--- a/app/lang/en/general.php
+++ b/app/lang/en/general.php
@@ -142,4 +142,5 @@
     'years'					=> 'years',
     'yes' 					=> 'Yes',
     'zip'  					=> 'Zip',
+    'noimage'					=> 'No image uploaded or image not found.',
     ];
diff --git a/app/views/backend/accessories/index.blade.php b/app/views/backend/accessories/index.blade.php
index 6b83ced8fb..2ef3cbf9f2 100755
--- a/app/views/backend/accessories/index.blade.php
+++ b/app/views/backend/accessories/index.blade.php
@@ -72,6 +72,7 @@
         sidePagination: 'server',
         sortable: true,
         cookie: true,
+        cookieExpire: '2y',
         mobileResponsive: true,
         showExport: true,
         showColumns: true,
diff --git a/app/views/backend/accessories/view.blade.php b/app/views/backend/accessories/view.blade.php
index 62191f2ef5..a8f0809fb0 100644
--- a/app/views/backend/accessories/view.blade.php
+++ b/app/views/backend/accessories/view.blade.php
@@ -27,8 +27,14 @@
 <div class="user-profile">
     <div class="row profile">
         <div class="col-md-9 bio">
-            @if ($accessory->users->count() > 0)
-                <table name="accessory_users" id="table" data-url="{{route('api.accessories.view', $accessory->id)}}">
+              <table
+              name="accessory_users"
+              id="table"
+              data-url="{{ route('api.accessories.view', $accessory->id) }}"
+              data-cookie="true"
+              data-click-to-select="true"
+              data-cookie-id-table="accessoryUsersTable">
+
                     <thead>
                         <tr>
                             <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="name">{{Lang::get('general.user')}}</th>
@@ -36,14 +42,6 @@
                         </tr>
                     </thead>
                 </table>
-            @else
-                <div class="col-md-9">
-                    <div class="alert alert-info alert-block">
-                        <i class="fa fa-info-circle"></i>
-                        @lang('general.no_results')
-                    </div>
-                </div>
-            @endif
         </div>
 
 <!-- side address column -->
diff --git a/app/views/backend/asset_maintenances/index.blade.php b/app/views/backend/asset_maintenances/index.blade.php
index 53caad3bec..6f1b52b077 100644
--- a/app/views/backend/asset_maintenances/index.blade.php
+++ b/app/views/backend/asset_maintenances/index.blade.php
@@ -64,6 +64,7 @@
       sidePagination: 'server',
       sortable: true,
       cookie: true,
+      cookieExpire: '2y',
       mobileResponsive: true,
       showExport: true,
       showColumns: true,
diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php
index 9757256735..e1c60d6210 100755
--- a/app/views/backend/categories/index.blade.php
+++ b/app/views/backend/categories/index.blade.php
@@ -69,6 +69,7 @@
         sidePagination: 'server',
         sortable: true,
         cookie: true,
+        cookieExpire: '2y',
         mobileResponsive: true,
         showExport: true,
         showColumns: true,
diff --git a/app/views/backend/consumables/index.blade.php b/app/views/backend/consumables/index.blade.php
index a99c091a70..ab4688f7df 100644
--- a/app/views/backend/consumables/index.blade.php
+++ b/app/views/backend/consumables/index.blade.php
@@ -70,6 +70,7 @@
         sidePagination: 'server',
         sortable: true,
         cookie: true,
+        cookieExpire: '2y',
         mobileResponsive: true,
         showExport: true,
         showColumns: true,
diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php
index d036fa25ba..1ccfc505aa 100755
--- a/app/views/backend/depreciations/index.blade.php
+++ b/app/views/backend/depreciations/index.blade.php
@@ -67,6 +67,7 @@ $('#table').bootstrapTable({
     sidePagination: 'server',
     sortable: true,
     cookie: true,
+    cookieExpire: '2y',
     mobileResponsive: true,
     showExport: true,
     showColumns: true,
diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php
index 018468c6a6..ff9cc06a2e 100755
--- a/app/views/backend/hardware/edit.blade.php
+++ b/app/views/backend/hardware/edit.blade.php
@@ -113,9 +113,9 @@
             <div class="col-md-12 column">
 
 			 @if ($asset->id)
-				 <form class="form-horizontal" method="post" action="{{ route('update/hardware',$asset->id) }}" autocomplete="off" role="form">
+				 <form class="form-horizontal" method="post" action="{{ route('update/hardware',$asset->id) }}" autocomplete="off" role="form" enctype="multipart/form-data" >
 			 @else
-				 <form class="form-horizontal" method="post" action="{{ route('savenew/hardware') }}" autocomplete="off" role="form">
+				 <form class="form-horizontal" method="post" action="{{ route('savenew/hardware') }}" autocomplete="off" role="form" enctype="multipart/form-data">
 			 @endif
 
             <!-- CSRF Token -->
@@ -312,11 +312,33 @@
 		  	</div>
 
 
+            <!-- Image -->
+            @if ($asset->image)
+                <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
+                    <label class="col-md-2 control-label" for="image_delete">@lang('general.image_delete')</label>
+                    <div class="col-md-5">
+                        {{ Form::checkbox('image_delete') }}
+                        <img src="/uploads/assets/{{{ $asset->image }}}" />
+                        {{ $errors->first('image_delete', '<br><span class="alert-msg">:message</span>') }}
+                    </div>
+                </div>
+            @endif
+
+            <div class="form-group {{ $errors->has('image') ? 'has-error' : '' }}">
+                <label class="col-md-2 control-label" for="image">@lang('general.image_upload')</label>
+                <div class="col-md-5">
+                    {{ Form::file('image') }}
+                    {{ $errors->first('image', '<br><span class="alert-msg">:message</span>') }}
+                </div>
+            </div>
+
+
+
             <!-- Form actions -->
                 <div class="form-group">
                 <label class="col-md-2 control-label"></label>
                     <div class="col-md-7 col-sm-12">
-                        <a class="btn btn-link" href="{{ URL::previous() }}">@lang('button.cancel')</a>
+                        <a class="btn btn-link" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">@lang('button.cancel')</a>
                         <button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> @lang('general.save')</button>
                     </div>
                 </div>
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index fe8655fc80..570f9438bf 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -68,6 +68,7 @@
                 <th data-class="hidden-xs" data-switchable="false" data-searchable="false" data-sortable="false" data-field="checkbox"><div class="text-center"><input type="checkbox" id="checkAll" style="padding-left: 0px;"></div></th>
                 <th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>
                 <th data-field="companyName" data-sortable="false" data-switchable="true">@lang('general.company')</th>
+                <th data-sortable="true" data-field="image"  data-visible="false">@lang('admin/hardware/table.image')</th>
                 <th data-sortable="true" data-field="name"  data-visible="false">@lang('admin/hardware/form.name')</th>
                 <th data-sortable="true" data-field="asset_tag">@lang('admin/hardware/table.asset_tag')</th>
                 <th data-sortable="true" data-field="serial">@lang('admin/hardware/table.serial')</th>
@@ -120,6 +121,7 @@
         sidePagination: 'server',
         sortable: true,
         cookie: true,
+        cookieExpire: '2y',
         mobileResponsive: true,
         showExport: true,
         showColumns: true,
diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php
index c95637bc12..065c69b239 100755
--- a/app/views/backend/hardware/view.blade.php
+++ b/app/views/backend/hardware/view.blade.php
@@ -38,8 +38,6 @@
                 <li role="presentation"><a href="{{ route('clone/hardware', $asset->id) }}">@lang('admin/hardware/general.clone')</a></li>
             </ul>
         </div>
-
-
     </div>
 </div>
 </div>
@@ -47,7 +45,6 @@
 <div class="user-profile">
 <div class="row profile">
 <div class="col-md-9 bio">
-
 		@if ($asset->model->deleted_at!='')
             <div class="alert alert-warning alert-block">
 				<i class="fa fa-warning"></i>
@@ -98,7 +95,7 @@
 
         @if ($asset->purchase_cost)
             <div class="col-md-12" style="padding-bottom: 5px;"><strong>@lang('admin/hardware/form.cost'):</strong>
-              
+
             @if (($asset->id) && ($asset->userloc))
                   {{{ $asset->userloc->currency }}}
             @elseif (($asset->id) && ($asset->assetloc))
@@ -151,6 +148,7 @@
         @endif
 
 
+
         @if ($asset->model->eol)
             <div class="col-md-12" style="padding-bottom: 5px;">
             <strong>@lang('admin/hardware/form.eol_rate'): </strong>
@@ -185,10 +183,11 @@
 
 
 <div class="col-md-12">
+
   		<!-- Licenses assets table -->
         <h6>Software Assigned </h6>
-		<br>
-		<!-- checked out assets table -->
+
+
 		@if (count($asset->licenses) > 0)
 		<table class="table table-hover">
 			<thead>
@@ -302,8 +301,6 @@
                          @else
                               {{{ $file->filename }}}
                          @endif
-
-
                     </td>
                     <td>
                         @if ($file->filename)
@@ -415,6 +412,17 @@
             </ul>
             @endif
 
+		<!-- Is there an asset or model image to show? -->
+
+        @if ($asset->image)
+          <img src="{{ Config::get('app.url') }}/uploads/assets/{{{ $asset->image }}}" class="assetimg">
+        @else
+          @if ($asset->model->image!='')
+            <img src="{{ Config::get('app.url') }}/uploads/models/{{{ $asset->model->image }}}" class="assetimg">
+          @endif
+        @endif
+
+		<!-- checked out assets table -->
 
             @if (($asset->assigneduser) && ($asset->assigned_to > 0) && ($asset->deleted_at==''))
                 <h6><br>@lang('admin/hardware/form.checkedout_to')</h6>
@@ -422,6 +430,8 @@
 
                     <li><img src="{{{ $asset->assigneduser->gravatar() }}}" class="img-circle" style="width: 100px; margin-right: 20px;" /><br /><br /></li>
                     <li><a href="{{ route('view/user', $asset->assigned_to) }}">{{ $asset->assigneduser->fullName() }}</a></li>
+		<br>
+
 
 
                     @if (isset($asset->userloc))
diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php
index f127a13129..5445a19b4a 100755
--- a/app/views/backend/locations/index.blade.php
+++ b/app/views/backend/locations/index.blade.php
@@ -66,6 +66,7 @@ Locations ::
         sidePagination: 'server',
         sortable: true,
         cookie: true,
+        cookieExpire: '2y',
         mobileResponsive: true,
         showExport: true,
         showColumns: true,
diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php
index 61d26bb783..4bc40d5b4d 100755
--- a/app/views/backend/manufacturers/index.blade.php
+++ b/app/views/backend/manufacturers/index.blade.php
@@ -80,6 +80,7 @@
         sidePagination: 'server',
         sortable: true,
         cookie: true,
+        cookieExpire: '2y',
         mobileResponsive: true,
         showExport: true,
         showColumns: true,
diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php
index d4d753730a..7a0410106b 100755
--- a/app/views/backend/models/index.blade.php
+++ b/app/views/backend/models/index.blade.php
@@ -65,6 +65,8 @@
         sortable: true,
         mobileResponsive: true,
         showExport: true,
+        cookie: true,
+        cookieExpire: '2y',
         showColumns: true,
         maintainSelected: true,
         paginationFirstText: "@lang('general.first')",
diff --git a/app/views/backend/suppliers/index.blade.php b/app/views/backend/suppliers/index.blade.php
index c4b406676f..89c2ff5cd5 100755
--- a/app/views/backend/suppliers/index.blade.php
+++ b/app/views/backend/suppliers/index.blade.php
@@ -63,6 +63,7 @@
         sidePagination: 'server',
         sortable: true,
         cookie: true,
+        cookieExpire: '2y',
         mobileResponsive: true,
         showExport: true,
         showColumns: true,
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index 674670f699..54b913735e 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -114,6 +114,7 @@
         sidePagination: 'server',
         sortable: true,
         cookie: true,
+        cookieExpire: '2y',
         mobileResponsive: true,
         showExport: true,
         showColumns: true,
diff --git a/install.sh b/install.sh
index 1deeac96e6..148343fb86 100755
--- a/install.sh
+++ b/install.sh
@@ -1,9 +1,9 @@
-#!/bin/bash -e
+#!/bin/bash
 
 ######################################################
-# 	    Snipe-It Install Script    	             #
-#	   Script created by Mike Tucker             #
-#	     mtucker6784@gmail.com                   #
+#           Snipe-It Install Script                  #
+#          Script created by Mike Tucker             #
+#            mtucker6784@gmail.com                   #
 # This script is just to help streamline the         #
 # install process for Debian and CentOS              #
 # based distributions. I assume you will be          #
@@ -14,59 +14,106 @@
 # credit where it's due. Thanks!                     #
 ######################################################
 
+# ensure running as root
+if [ "$(id -u)" != "0" ]; then
+  exec sudo "$0" "$@"
+fi
 #First things first, let's set some variables and find our distro.
 clear
+
+name="snipeit"
 si="Snipe-IT"
 hostname="$(hostname)"
-hosts=/etc/hosts
-distro="$(cat /proc/version)"
-file=master.zip
-dir=/var/www/snipe-it-master
-
+fqdn="$(hostname --fqdn)"
 ans=default
+hosts=/etc/hosts
+file=master.zip
+tmp=/tmp/$name
+
+rm -rf $tmp/
+mkdir $tmp
+
+function isinstalled {
+  if yum list installed "$@" >/dev/null 2>&1; then
+    true
+  else
+    false
+  fi
+}
+
+
+#  Lets find what distro we are using and what version
+distro="$(cat /proc/version)"
+if grep -q centos <<<$distro; then
+	for f in $(find /etc -type f -maxdepth 1 \( ! -wholename /etc/os-release ! -wholename /etc/lsb-release -wholename /etc/\*release -o -wholename /etc/\*version \) 2> /dev/null);
+	do
+		distro="${f:5:${#f}-13}"
+	done;
+	if [ "$distro" = "centos" ] || [ "$distro" = "redhat" ]; then
+		distro+="$(rpm -q --qf "%{VERSION}" $(rpm -q --whatprovides redhat-release))"
+	fi
+fi
+
+echo "
+	   _____       _                  __________
+	  / ___/____  (_)___  ___        /  _/_  __/
+	  \__ \/ __ \/ / __ \/ _ \______ / /  / /   
+	 ___/ / / / / / /_/ /  __/_____// /  / /    
+	/____/_/ /_/_/ .___/\___/     /___/ /_/     
+	            /_/                             
+"
+
+echo ""
+echo ""
+echo "  Welcome to Snipe-IT Inventory Installer for Centos and Debian!"
+echo ""
+
 case $distro in
         *Ubuntu*|*Debian*)
-                echo "Ubuntu/Debian detected. Carry forth."
-                distro=u
+                echo "  The installer has detected Ubuntu/Debian as the OS."
+                distro=debian
                 ;;
-        *centos*)
-                echo "CentOS detected. Carry forth."
-                distro=c
+        *centos6*|*redhat6*)
+                echo "  The installer has detected $distro as the OS."
+                distro=centos6
+                ;;
+        *centos7*|*redhat7*)
+                echo "  The installer has detected $distro as the OS."
+                distro=centos7
                 ;;
         *)
-                echo "Not sure of this OS. Exiting for safety."
-		exit
+                echo "  The installer was unable to determine your OS. Exiting for safety."
+                exit
                 ;;
 esac
 
 #Get your FQDN.
-echo ""
-echo "$si install script - Installing $ans"
-echo "Q. What is the FQDN of your server? (example: www.yourserver.com)"
+
+echo -n "  Q. What is the FQDN of your server? ($fqdn): "
 read fqdn
+if [ -z "$fqdn" ]; then
+        fqdn="$(hostname --fqdn)"
+fi
+echo "     Setting to $fqdn"
 echo ""
 
 #Do you want to set your own passwords, or have me generate random ones?
-ans=default
 until [[ $ans == "yes" ]] || [[ $ans == "no" ]]; do
-echo "Q. Do you want me to automatically create the MySQL root & user passwords? (y/n)"
+echo -n "  Q. Do you want me to automatically create the snipe database user password? (y/n) "
 read setpw
 
 case $setpw in
         [yY] | [yY][Ee][Ss] )
-                mysqlrootpw="$(echo `< /dev/urandom tr -dc _A-Za-z-0-9 | head -c8`)"
-                mysqluserpw="$(echo `< /dev/urandom tr -dc _A-Za-z-0-9 | head -c8`)"
-                echo "I'm putting this into /root/mysqlpasswords ... PLEASE REMOVE that file after you have recorded the passwords somewhere safe!"
+                mysqluserpw="$(echo `< /dev/urandom tr -dc _A-Za-z-0-9 | head -c16`)"
                 ans="yes"
                 ;;
         [nN] | [n|N][O|o] )
-		echo "Q. What do you want your root PW to be?"
-                read mysqlrootpw
-                echo "Q. What do you want your snipeit user PW to be?"
-                read mysqluserpw
+                echo -n  "  Q. What do you want your snipeit user password to be?"
+                read -s mysqluserpw
+                echo ""
 				ans="no"
                 ;;
-        *) echo "Invalid answer. Please type y or n"
+        *) 		echo "  Invalid answer. Please type y or n"
                 ;;
 esac
 done
@@ -74,216 +121,393 @@ done
 #Snipe says we need a new 32bit key, so let's create one randomly and inject it into the file
 random32="$(echo `< /dev/urandom tr -dc _A-Za-z-0-9 | head -c32`)"
 
-#createstuff.sql will be injected to the database during install. mysqlpasswords.txt is a file that will contain the root and snipeit user passwords.
+#db_setup.sql will be injected to the database during install. 
 #Again, this file should be removed, which will be a prompt at the end of the script.
-createstufffile=/root/createstuff.sql
-passwordfile=/root/mysqlpasswords.txt
-
-echo >> $createstufffile "CREATE DATABASE snipeit;"
-echo >> $createstufffile "GRANT ALL PRIVILEGES ON snipeit.* TO snipeit@localhost IDENTIFIED BY '$mysqluserpw';"
-echo >> $passwordfile "MySQL Passwords..."
-echo >> $passwordfile "Root: $mysqlrootpw"
-echo >> $passwordfile "User (snipeit): $mysqluserpw"
-echo >> $passwordfile "32 bit random string: $random32"
-echo "MySQL ROOT password: $mysqlrootpw"
-echo "MySQL USER (snipeit) password: $mysqluserpw"
-echo "32 bit random string: $random32"
-echo "These passwords have been exported to /root/mysqlpasswords.txt...I recommend You delete this file for security purposes"
+dbsetup=$tmp/db_setup.sql
+echo >> $dbsetup "CREATE DATABASE snipeit;"
+echo >> $dbsetup "GRANT ALL PRIVILEGES ON snipeit.* TO snipeit@localhost IDENTIFIED BY '$mysqluserpw';"
 
 #Let us make it so only root can read the file. Again, this isn't best practice, so please remove these after the install.
-chown root:root $passwordfile $creatstufffile
-chmod 700 $passwordfile $createstufffile
+chown root:root $dbsetup
+chmod 700 $dbsetup
 
-if [[ $distro == "u" ]]; then
-#Update/upgrade Debian/Ubuntu repositories, get the latest version of git.
-	apachefile=/etc/apache2/sites-available/$fqdn.conf
-	sudo apt-get update ; sudo apt-get -y upgrade ;	sudo apt-get install -y git unzip
+## TODO: Progress tracker on each step
 
-	wget https://github.com/snipe/snipe-it/archive/$file
-	sudo unzip $file -d /var/www/
+case $distro in
+	debian)
+		#####################################  Install for Debian/ubuntu  ##############################################
 
-	#We already established MySQL root & user PWs, so we dont need to be prompted. Let's go ahead and install Apache, PHP and MySQL.
-	sudo DEBIAN_FRONTEND=noninteractive apt-get install -y lamp-server^
-	sudo apt-get install -y php5 php5-mcrypt php5-curl php5-mysql php5-gd
+		webdir=/var/www
 
-	#Create MySQL accounts
-	echo "Create MySQL accounts"
-	sudo mysqladmin -u root password $mysqlrootpw
-	sudo mysql -u root -p$mysqlrootpw < /root/createstuff.sql
+		#Update/upgrade Debian/Ubuntu repositories, get the latest version of git.
+		echo ""
+		echo "##  Updaing ubuntu"
+		echo ""
+		apachefile=/etc/apache2/sites-available/$name.conf
+		sudo apt-get update > /dev/null
+		sudo apt-get -y upgrade > /dev/null
 
-	#Enable mcrypt and rewrite
-	sudo php5enmod mcrypt
-	sudo a2enmod rewrite
-	sudo ls -al /etc/apache2/mods-enabled/rewrite.load
+		echo "##  Install packages."
+		sudo apt-get install -y git unzip php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap > /dev/null
+		#We already established MySQL root & user PWs, so we dont need to be prompted. Let's go ahead and install Apache, PHP and MySQL.
+		echo "##  Settup LAMP."
+		sudo DEBIAN_FRONTEND=noninteractive apt-get install -y lamp-server^ > /dev/null
 
-	#Create a new virtual host for Apache.
-	echo >> $apachefile ""
-	echo >> $apachefile ""
-	echo >> $apachefile "<VirtualHost *:80>"
-	echo >> $apachefile "ServerAdmin webmaster@localhost"
-	echo >> $apachefile "    <Directory $dir/public>"
-	echo >> $apachefile "        Require all granted"
-	echo >> $apachefile "        AllowOverride All"
-	echo >> $apachefile "   </Directory>"
-	echo >> $apachefile "    DocumentRoot $dir/public"
-	echo >> $apachefile "    ServerName $fqdn"
-	echo >> $apachefile "        ErrorLog "\${APACHE_LOG_DIR}"/error.log"
-	echo >> $apachefile "        CustomLog "\${APACHE_LOG_DIR}"/access.log combined"
-	echo >> $apachefile "</VirtualHost>"
-	echo >> $hosts "127.0.0.1 $hostname $fqdn"
-	a2ensite $fqdn.conf
+		#  Get files and extract to web dir
+		echo ""
+		echo "##  Download snipeit and extract to web directory."
+		wget -P $tmp/ https://github.com/snipe/snipe-it/archive/$file &> /dev/null
+		unzip -qo $tmp/$file -d $tmp/
+		cp -R $tmp/snipe-it-master $webdir/$name
 
-	#Change permissions on directories
-	sudo chmod -R 755 $dir/app/storage
-	sudo chmod -R 755 $dir/app/private_uploads
-	sudo chmod -R 755 $dir/public/uploads
-	sudo chown -R www-data:www-data /var/www/
-	echo "Finished permission changes."
+		##  TODO make sure apache is set to start on boot and go ahead and start it
 
-	#Modify the Snipe-It files necessary for a production environment.
-	replace "'www.yourserver.com'" "'$hostname'" -- $dir/bootstrap/start.php
-	cp $dir/app/config/production/database.example.php $dir/app/config/production/database.php
-	replace "'snipeit_laravel'," "'snipeit'," -- $dir/app/config/production/database.php
-	replace "'travis'," "'snipeit'," -- $dir/app/config/production/database.php
-	replace "            'password'  => ''," "            'password'  => '$mysqluserpw'," -- $dir/app/config/production/database.php
-	replace "'http://production.yourserver.com'," "'http://$fqdn'," -- $dir/app/config/production/database.php
-	cp $dir/app/config/production/app.example.php $dir/app/config/production/app.php
-	replace "'http://production.yourserver.com'," "'http://$fqdn'," -- $dir/app/config/production/app.php
-	replace "'Change_this_key_or_snipe_will_get_ya'," "'$random32'," -- $dir/app/config/production/app.php
-	replace "'false'," "true," -- $dir/app/config/production/app.php
-	cp $dir/app/config/production/mail.example.php $dir/app/config/production/mail.php
+		#Enable mcrypt and rewrite
+		echo "##  Enabled mcrypt and rewrite"
+		sudo php5enmod mcrypt > /dev/null
+		sudo a2enmod rewrite > /dev/null
+		sudo ls -al /etc/apache2/mods-enabled/rewrite.load > /dev/null
 
-	#Install / configure composer
-	curl -sS https://getcomposer.org/installer | php
-	mv composer.phar /usr/local/bin/composer
-	cd $dir/
-	composer install --no-dev --prefer-source
-	php artisan app:install --env=production
+		#Create a new virtual host for Apache.
+		echo "##  Create Virtual host for apache."
+		echo >> $apachefile ""
+		echo >> $apachefile ""
+		echo >> $apachefile "<VirtualHost *:80>"
+		echo >> $apachefile "ServerAdmin webmaster@localhost"
+		echo >> $apachefile "    <Directory $webdir/$name/public>"
+		echo >> $apachefile "        Require all granted"
+		echo >> $apachefile "        AllowOverride All"
+		echo >> $apachefile "   </Directory>"
+		echo >> $apachefile "    DocumentRoot $webdir/$name/public"
+		echo >> $apachefile "    ServerName $fqdn"
+		echo >> $apachefile "        ErrorLog /var/log/apache2/snipeIT.error.log"
+		echo >> $apachefile "        CustomLog /var/log/apache2/access.log combined"
+		echo >> $apachefile "</VirtualHost>"
 
-	service apache2 restart
-else
+		echo "##  Setup hosts file."
+		echo >> $hosts "127.0.0.1 $hostname $fqdn"
+		a2ensite $name.conf > /dev/null
 
-	#Make directories so we can create a new apache vhost
-	sudo mkdir /etc/httpd/
-	sudo mkdir /etc/httpd/sites-available/
-	sudo mkdir /etc/httpd/sites-enabled/
-	apachefile=/etc/httpd/sites-available/$fqdn.conf
-	apachefileen=/etc/httpd/sites-enabled/$fqdn.conf
-	apachecfg=/etc/httpd/conf/httpd.conf
+		#Modify the Snipe-It files necessary for a production environment.
+		echo "##  Modify the Snipe-It files necessary for a production environment."
+		echo "	Setting up Timezone."
+		tzone=$(cat /etc/timezone);
+		sed -i "s,UTC,$tzone,g" $webdir/$name/app/config/app.php
 
-	#Allow us to get the mysql engine
-	sudo rpm -Uvh http://dev.mysql.com/get/mysql-community-release-el7-5.noarch.rpm
-	sudo yum -y install httpd mysql-server wget git unzip
+		echo "	Setting up bootstrap file."
+		sed -i "s,www.yourserver.com,$hostname,g" $webdir/$name/bootstrap/start.php
 
-	wget https://github.com/snipe/snipe-it/archive/$file
-	sudo unzip $file -d /var/www/
+		echo "	Setting up database file."
+		cp $webdir/$name/app/config/production/database.example.php $webdir/$name/app/config/production/database.php
+		sed -i "s,snipeit_laravel,snipeit,g" $webdir/$name/app/config/production/database.php
+		sed -i "s,travis,snipeit,g" $webdir/$name/app/config/production/database.php
+		sed -i "s,password'  => '',password'  => '$mysqluserpw',g" $webdir/$name/app/config/production/database.php
 
-	sudo /sbin/service mysqld start
+		echo "	Setting up app file."
+		cp $webdir/$name/app/config/production/app.example.php $webdir/$name/app/config/production/app.php
+		sed -i "s,production.yourserver.com,$fqdn,g" $webdir/$name/app/config/production/app.php
+		sed -i "s,Change_this_key_or_snipe_will_get_ya,$random32,g" $webdir/$name/app/config/production/app.php
+		sed -i "s,false,true,g" $webdir/$name/app/config/production/app.php
 
-	#Create MySQL accounts
-	echo "Create MySQL accounts"
-	sudo mysqladmin -u root password $mysqlrootpw
-	echo ""
-	echo "***Your Current ROOT password is---> $mysqlrootpw"
-	echo "***Use $mysqlrootpw at the following prompt for root login***"
-	sudo /usr/bin/mysql_secure_installation
+		echo "	Setting up mail file."
+		cp $webdir/$name/app/config/production/mail.example.php $webdir/$name/app/config/production/mail.php
 
-	#Install PHP stuff.
-	sudo yum -y install php php-mysql php-bcmath.x86_64 php-cli.x86_64 php-common.x86_64 php-embedded.x86_64 php-gd.x86_64 php-mbstring
-	wget http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
-	rpm -ivh epel-release-7-5.noarch.rpm
-	yum install -y --enablerepo="epel" php-mcrypt
+		##  TODO make sure mysql is set to start on boot and go ahead and start it
 
-	#Create the new virtual host in Apache.
-	echo >> $apachefile ""
-	echo >> $apachefile ""
-	echo >> $apachefile "<VirtualHost *:80>"
-	echo >> $apachefile "ServerAdmin webmaster@localhost"
-	echo >> $apachefile "    <Directory $dir/public>"
-	echo >> $apachefile "        Require all granted"
-	echo >> $apachefile "        AllowOverride All"
-	echo >> $apachefile "        Options +Indexes"
-	echo >> $apachefile "   </Directory>"
-	echo >> $apachefile "    DocumentRoot $dir/public"
-	echo >> $apachefile "    ServerName $fqdn"
-	echo >> $apachefile "        ErrorLog /var/log/httpd/snipe.error.log"
-	echo >> $apachefile "        CustomLog /var/log/access.log combined"
-	echo >> $apachefile "</VirtualHost>"
-	echo >> $hosts "127.0.0.1 $hostname $fqdn"
-	sudo ln -s $apachefile $apachefileen
+		#Change permissions on directories
+		echo "##  Set permissionson web directory."
+		sudo chmod -R 755 $webdir/$name/app/storage
+		sudo chmod -R 755 $webdir/$name/app/private_uploads
+		sudo chmod -R 755 $webdir/$name/public/uploads
+		sudo chown -R www-data:www-data /var/www/
+		# echo "##  Finished permission changes."
 
-	#Enable rewrite and vhost
-	echo >> $apachecfg "LoadModule rewrite_module modules/mod_rewrite.so"
-	echo >> $apachecfg "IncludeOptional sites-enabled/*.conf"
+		echo "##  Input your MySQL/MariaDB root password: "
+		sudo mysql -u root < $dbsetup
 
-	#Change permissions on directories
-	sudo chmod -R 755 $dir/app/storage
-	sudo chmod -R 755 $dir/app/private_uploads
-	sudo chmod -R 755 $dir/public/uploads
-	sudo chown -R apache:apache /var/www/
+		echo "##  Secure Mysql"
 
-	service httpd restart
+		# Have user set own root password when securing install
+		# and just set the snipeit database user at the beginning
+		/usr/bin/mysql_secure_installation 
 
-	#Modify the Snipe-It files necessary for a production environment.
-	replace "'www.yourserver.com'" "'$hostname'" -- $dir/bootstrap/start.php
-	cp $dir/app/config/production/database.example.php $dir/app/config/production/database.php
-	replace "'snipeit_laravel'," "'snipeit'," -- $dir/app/config/production/database.php
-	replace "'travis'," "'snipeit'," -- $dir/app/config/production/database.php
-	replace "            'password'  => ''," "            'password'  => '$mysqluserpw'," -- $dir/app/config/production/database.php
-	replace "'http://production.yourserver.com'," "'http://$fqdn'," -- $dir/app/config/production/database.php
-	cp $dir/app/config/production/app.example.php $dir/app/config/production/app.php
-	replace "'http://production.yourserver.com'," "'http://$fqdn'," -- $dir/app/config/production/app.php
-	replace "'Change_this_key_or_snipe_will_get_ya'," "'$random32'," -- $dir/app/config/production/app.php
-	cp $dir/app/config/production/mail.example.php $dir/app/config/production/mail.php
+		#Install / configure composer
+		echo "##  Install and configure composer"
+		curl -sS https://getcomposer.org/installer | php
+		mv composer.phar /usr/local/bin/composer
+		cd $webdir/$name/
+		composer install --no-dev --prefer-source
+		php artisan app:install --env=production
 
-	#Install / configure composer
-	cd $dir
-	sudo mysql -u root -p$mysqlrootpw < /root/createstuff.sql
-	curl -sS https://getcomposer.org/installer | php
-	php composer.phar install --no-dev --prefer-source
-	php artisan app:install --env=production
-
-	#Add SELinux and firewall exception/rules. You'll have to allow 443 if you want ssl connectivity.
-	chcon -R -h -t httpd_sys_script_rw_t $dir/
-	firewall-cmd --zone=public --add-port=80/tcp --permanent
-	firewall-cmd --reload
-
-	service httpd restart
-fi
-
-echo ""; echo ""; echo ""
-echo "***I have no idea about your mail environment, so if you want email capability, open up the following***"
-echo "nano -w $dir/app/config/production/mail.php"
-echo "And edit the attributes appropriately."
-sleep 1
-
-echo "";echo "";echo ""
-ans=default
-until [[ $ans == "yes" ]] || [[ $ans == "no" ]]; do
-echo "Q. Shall I delete the password files I created? (Remember to record the passwords before deleting) (y/n)"
-read setpw
-case $setpw in
-
-      [yY] | [yY][Ee][Ss] )
-                rm $createstufffile
-				rm $passwordfile
-                echo "$createstufffile and $passwordfile files have been removed."
-				ans=yes
+		echo "##  restart apache."
+		service apache2 restart
 		;;
-        [nN] | [n|N][O|o] )
-                echo "Ok, I won't remove the file. Please for the love of security, record the passwords and delete this file regardless."
-				echo "$si cannot be held responsible if this file is compromised!"
-				echo "From Snipe: I cannot encourage or even facilitate poor security practices, and still sleep the few, frantic hours I sleep at night."
-				ans=no
+	centos6 )
+		#####################################  Install for Centos/Redhat 6  ##############################################
+
+		webdir=/var/www/html
+
+##TODO make sure the repo doesnt exhist isnt already in there
+
+		#Allow us to get the mysql engine
+		echo ""
+		echo "##  Add IUS and mariaDB repos.";
+		mariadbRepo=/etc/yum.repos.d/MariaDB.repo
+		touch $mariadbRepo
+		echo >> $mariadbRepo "[mariadb]"
+		echo >> $mariadbRepo "name = MariaDB"
+		echo >> $mariadbRepo "baseurl = http://yum.mariadb.org/10.0/centos6-amd64"
+		echo >> $mariadbRepo "gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
+		echo >> $mariadbRepo "gpgcheck=1"
+		echo >> $mariadbRepo "enable=1"
+
+		yum -y install wget > /dev/null
+		wget -P $tmp/ https://centos6.iuscommunity.org/ius-release.rpm &> /dev/null
+		rpm -Uvh $tmp/ius-release*.rpm > /dev/null
+
+		#Install PHP and other needed stuff.
+		echo "##  Install PHP and other needed stuff";
+		PACKAGES="epel-release httpd MariaDB-server git unzip php56u php56u-mysqlnd php56u-bcmath php56u-cli php56u-common php56u-embedded php56u-gd php56u-mbstring php56u-mcrypt php56u-ldap"
+		
+		for p in $PACKAGES;do
+			if isinstalled $p;then
+				echo " ##" $p "Installed"
+			else
+				echo -n " ##" $p "Installing... "
+				yum -y install $p > /dev/null
+				echo "";
+			fi
+		done;
+
+        echo ""
+		echo "##  Download Snipe-IT from github and put it in the web directory.";
+
+		wget -P $tmp/ https://github.com/snipe/snipe-it/archive/$file &> /dev/null
+		unzip -qo $tmp/$file -d $tmp/
+		cp -R $tmp/snipe-it-master $webdir/$name
+
+		# Make mariaDB start on boot and restart the daemon
+		echo "##  Start the mariaDB server.";
+		chkconfig mysql on
+		/sbin/service mysql start
+		
+		echo "##  Input your MySQL/MariaDB root password: "
+		mysql -u root < $dbsetup
+
+		echo "##  Start securing mariaDB server.";
+		/usr/bin/mysql_secure_installation 
+
+##TODO make sure the apachefile doesnt exhist isnt already in there
+		#Create the new virtual host in Apache and enable rewrite
+		echo "##  Create the new virtual host in Apache.";
+		apachefile=/etc/httpd/conf.d/$name.conf
+
+		echo >> $apachefile ""
+		echo >> $apachefile ""
+		echo >> $apachefile "LoadModule rewrite_module modules/mod_rewrite.so"
+		echo >> $apachefile ""
+		echo >> $apachefile "<VirtualHost *:80>"
+		echo >> $apachefile "ServerAdmin webmaster@localhost"
+		echo >> $apachefile "    <Directory $webdir/$name/public>"
+		echo >> $apachefile "        Allow From All"
+		echo >> $apachefile "        AllowOverride All"
+		echo >> $apachefile "        Options +Indexes"
+		echo >> $apachefile "   </Directory>"
+		echo >> $apachefile "    DocumentRoot $webdir/$name/public"
+		echo >> $apachefile "    ServerName $fqdn"
+		echo >> $apachefile "        ErrorLog /var/log/httpd/snipeIT.error.log"
+		echo >> $apachefile "        CustomLog /var/log/access.log combined"
+		echo >> $apachefile "</VirtualHost>"
+		
+##TODO make sure hosts file doesnt already contain this info
+		echo "##  Setup hosts file.";
+		echo >> $hosts "127.0.0.1 $hostname $fqdn"
+
+		# Make apache start on boot and restart the daemon
+		echo "##  Start the apache server.";
+		chkconfig httpd on
+		/sbin/service httpd start
+
+		#Modify the Snipe-It files necessary for a production environment.
+		echo "##  Modify the Snipe-It files necessary for a production environment."
+		echo "	Setting up Timezone."
+		tzone=$(grep ZONE /etc/sysconfig/clock | tr -d '"' | sed 's/ZONE=//g');
+		sed -i "s,UTC,$tzone,g" $webdir/$name/app/config/app.php
+
+		echo "	Setting up bootstrap file."
+		sed -i "s,www.yourserver.com,$hostname,g" $webdir/$name/bootstrap/start.php
+
+		echo "	Setting up database file."
+		cp $webdir/$name/app/config/production/database.example.php $webdir/$name/app/config/production/database.php
+		sed -i "s,snipeit_laravel,snipeit,g" $webdir/$name/app/config/production/database.php
+		sed -i "s,travis,snipeit,g" $webdir/$name/app/config/production/database.php
+		sed -i "s,password'  => '',password'  => '$mysqluserpw',g" $webdir/$name/app/config/production/database.php
+
+		echo "	Setting up app file."
+		cp $webdir/$name/app/config/production/app.example.php $webdir/$name/app/config/production/app.php
+		sed -i "s,production.yourserver.com,$fqdn,g" $webdir/$name/app/config/production/app.php
+		sed -i "s,Change_this_key_or_snipe_will_get_ya,$random32,g" $webdir/$name/app/config/production/app.php
+		sed -i "s,false,true,g" $webdir/$name/app/config/production/app.php
+
+		echo "	Setting up mail file."
+		cp $webdir/$name/app/config/production/mail.example.php $webdir/$name/app/config/production/mail.php
+
+		# Change permissions on directories
+		sudo chmod -R 755 $webdir/$name/app/storage
+		sudo chmod -R 755 $webdir/$name/app/private_uploads
+		sudo chmod -R 755 $webdir/$name/public/uploads
+		sudo chown -R apache:apache $webdir/$name
+
+		#Install / configure composer
+		echo "##  Configure composer"
+		cd $webdir/$name
+		curl -sS https://getcomposer.org/installer | php
+		php composer.phar install --no-dev --prefer-source
+
+		echo "##  Install Snipe-IT"
+		php artisan app:install --env=production
+
+#TODO detect if SELinux and firewall are enabled to decide what to do
+		#Add SELinux and firewall exception/rules. Youll have to allow 443 if you want ssl connectivity.
+		# chcon -R -h -t httpd_sys_script_rw_t $webdir/$name/
+		# firewall-cmd --zone=public --add-port=80/tcp --permanent
+		# firewall-cmd --reload
+
+		service httpd restart
 		;;
-        *)
-		echo "Please select a valid option"
+	centos7 )
+		#####################################  Install for Centos/Redhat 7  ##############################################
+
+		webdir=/var/www/html
+
+		#Allow us to get the mysql engine
+		echo ""
+		echo "##  Add IUS and mariaDB repos.";
+		yum -y install wget > /dev/null
+		wget -P $tmp/ https://centos7.iuscommunity.org/ius-release.rpm &> /dev/null
+		rpm -Uvh $tmp/ius-release*.rpm > /dev/null
+
+		#Install PHP and other needed stuff.
+		echo "##  Install PHP and other needed stuff";
+		PACKAGES="epel-release httpd mariadb-server git unzip php56u php56u-mysqlnd php56u-bcmath php56u-cli php56u-common php56u-embedded php56u-gd php56u-mbstring php56u-mcrypt php56u-ldap"
+		
+		for p in $PACKAGES;do
+			if isinstalled $p;then
+				echo " ##" $p "Installed"
+			else
+				echo -n " ##" $p "Installing... "
+				yum -y install $p > /dev/null
+			echo "";
+			fi
+		done;
+
+        echo ""
+		echo "##  Download Snipe-IT from github and put it in the web directory.";
+
+		wget -P $tmp/ https://github.com/snipe/snipe-it/archive/$file &> /dev/null
+		unzip -qo $tmp/$file -d $tmp/
+		cp -R $tmp/snipe-it-master $webdir/$name
+
+		# Make mariaDB start on boot and restart the daemon
+		echo "##  Start the mariaDB server.";
+		systemctl enable mariadb.service
+		systemctl start mariadb.service
+
+		echo "##  Input your MySQL/MariaDB root password "
+		mysql -u root < $dbsetup
+
+		echo "##  Start securing mariaDB server.";
+		echo "";
+		echo "";
+		/usr/bin/mysql_secure_installation 
+
+
+##TODO make sure the apachefile doesnt exhist isnt already in there
+		#Create the new virtual host in Apache and enable rewrite
+		apachefile=/etc/httpd/conf.d/$name.conf
+
+		echo "##  Create the new virtual host in Apache.";
+		echo >> $apachefile ""
+		echo >> $apachefile ""
+		echo >> $apachefile "LoadModule rewrite_module modules/mod_rewrite.so"
+		echo >> $apachefile ""
+		echo >> $apachefile "<VirtualHost *:80>"
+		echo >> $apachefile "ServerAdmin webmaster@localhost"
+		echo >> $apachefile "    <Directory $webdir/$name/public>"
+		echo >> $apachefile "        Allow From All"
+		echo >> $apachefile "        AllowOverride All"
+		echo >> $apachefile "        Options +Indexes"
+		echo >> $apachefile "   </Directory>"
+		echo >> $apachefile "    DocumentRoot $webdir/$name/public"
+		echo >> $apachefile "    ServerName $fqdn"
+		echo >> $apachefile "        ErrorLog /var/log/httpd/snipeIT.error.log"
+		echo >> $apachefile "        CustomLog /var/log/access.log combined"
+		echo >> $apachefile "</VirtualHost>"
+
+##TODO make sure this isnt already in there
+		echo "##  Setup hosts file.";
+		echo >> $hosts "127.0.0.1 $hostname $fqdn"
+
+
+		echo "##  Start the apache server.";
+		# Make apache start on boot and restart the daemon
+		systemctl enable httpd.service
+		systemctl restart httpd.service
+
+		#Modify the Snipe-It files necessary for a production environment.
+		echo "##  Modify the Snipe-It files necessary for a production environment."
+		echo "	Setting up Timezone."
+		tzone=$(grep ZONE /etc/sysconfig/clock | tr -d '"' | sed 's/ZONE=//g');
+		sed -i "s,UTC,$tzone,g" $webdir/$name/app/config/app.php
+
+		echo "	Setting up bootstrap file."
+		sed -i "s,www.yourserver.com,$hostname,g" $webdir/$name/bootstrap/start.php
+
+		echo "	Setting up database file."
+		cp $webdir/$name/app/config/production/database.example.php $webdir/$name/app/config/production/database.php
+		sed -i "s,snipeit_laravel,snipeit,g" $webdir/$name/app/config/production/database.php
+		sed -i "s,travis,snipeit,g" $webdir/$name/app/config/production/database.php
+		sed -i "s,password'  => '',password'  => '$mysqluserpw',g" $webdir/$name/app/config/production/database.php
+
+		echo "	Setting up app file."
+		cp $webdir/$name/app/config/production/app.example.php $webdir/$name/app/config/production/app.php
+		sed -i "s,production.yourserver.com,$fqdn,g" $webdir/$name/app/config/production/app.php
+		sed -i "s,Change_this_key_or_snipe_will_get_ya,$random32,g" $webdir/$name/app/config/production/app.php
+		sed -i "s,false,true,g" $webdir/$name/app/config/production/app.php
+
+		echo "	Setting up mail file."
+		cp $webdir/$name/app/config/production/mail.example.php $webdir/$name/app/config/production/mail.php
+
+		# Change permissions on directories
+		sudo chmod -R 755 $webdir/$name/app/storage
+		sudo chmod -R 755 $webdir/$name/app/private_uploads
+		sudo chmod -R 755 $webdir/$name/public/uploads
+		sudo chown -R apache:apache $webdir/$name
+
+		#Install / configure composer
+		cd $webdir/$name
+
+		curl -sS https://getcomposer.org/installer | php
+		php composer.phar install --no-dev --prefer-source
+		php artisan app:install --env=production
+
+#TODO detect if SELinux and firewall are enabled to decide what to do
+		#Add SELinux and firewall exception/rules. Youll have to allow 443 if you want ssl connectivity.
+		# chcon -R -h -t httpd_sys_script_rw_t $webdir/$name/
+		# firewall-cmd --zone=public --add-port=80/tcp --permanent
+		# firewall-cmd --reload
+
+		systemctl restart httpd.service
 		;;
 esac
-done
 
-echo ""; echo ""
-echo "***If you want mail capabilities, open $dir/app/config/production/mail.php and fill out the attributes***"
-echo ""; echo ""
-echo "***$si should now be installed. open up http://$fqdn in a web browser to verify.***"
+echo ""
+echo "  ***If you want mail capabilities, open $webdir/$name/app/config/production/mail.php and fill out the attributes***"
+echo ""
+echo "  ***Open http://$fqdn to login to Snipe-IT.***"
+echo ""
+echo ""
+echo "##  Cleaning up..."
+rm -rf $tmp/
+echo "##  Done!"
 sleep 1
diff --git a/public/assets/css/compiled/layout.css b/public/assets/css/compiled/layout.css
index 70c43e79d4..7f56548093 100644
--- a/public/assets/css/compiled/layout.css
+++ b/public/assets/css/compiled/layout.css
@@ -9,3 +9,8 @@ To remove this comment, please support us and upgrade to SiteFlow Pro.
 div.checker {
     display: inline;
 }
+
+.assetimg {
+  max-width: 250px;
+  max-height: 250px;
+}
diff --git a/public/uploads/assets/.gitkeep b/public/uploads/assets/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2