diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7a7319a539..4e530c7df7 100755
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
 # Contribution Guidelines
 
-Please submit all issues and pull requests to the [snipe/snipe-it](http://github.com/snipe/snipe-it) repository!
\ No newline at end of file
+Please submit all issues and pull requests to the [snipe/snipe-it](http://github.com/snipe/snipe-it) repository in the develop branch!
\ No newline at end of file
diff --git a/app/database/migrations/2013_11_20_055822_add_soft_delete_on_assets.php b/app/database/migrations/2013_11_20_055822_add_soft_delete_on_assets.php
new file mode 100644
index 0000000000..24c444472f
--- /dev/null
+++ b/app/database/migrations/2013_11_20_055822_add_soft_delete_on_assets.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class AddSoftDeleteOnAssets extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('assets', function($table)
+		{
+			$table->softDeletes();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}
\ No newline at end of file
diff --git a/app/models/Asset.php b/app/models/Asset.php
index 6c5413cb88..58f3af8a35 100644
--- a/app/models/Asset.php
+++ b/app/models/Asset.php
@@ -3,6 +3,7 @@
 class Asset extends Elegant {
 
 	protected $table = 'assets';
+	protected $softDelete = true;
 	protected $rules = array(
 		'name'   => 'required|min:3',
 		'asset_tag'   => 'required|min:3|unique:assets',
diff --git a/app/models/License.php b/app/models/License.php
index fcad687647..ca8f60ee9b 100644
--- a/app/models/License.php
+++ b/app/models/License.php
@@ -9,7 +9,7 @@ class License extends Elegant {
 	 */
 
 	protected $table = 'assets';
-
+	protected $softDelete = true;
 	protected $rules = array(
 			'name'   => 'required|min:3',
 			'serial'   => 'required|min:5',
diff --git a/app/views/backend/assets/index.blade.php b/app/views/backend/assets/index.blade.php
index b33e14b8e2..aa490f45d0 100755
--- a/app/views/backend/assets/index.blade.php
+++ b/app/views/backend/assets/index.blade.php
@@ -8,8 +8,6 @@ Assets ::
 
 {{-- Page content --}}
 @section('content')
-
-
 <div class="page-header">
 	<h3>
 		Assets
@@ -30,12 +28,9 @@ Assets ::
 			<th class="span2">@lang('admin/assets/table.asset_tag')</th>
 			<th class="span2"><span class="line"></span>@lang('admin/assets/table.title')</th>
 			<th class="span2"><span class="line"></span>@lang('admin/assets/table.serial')</th>
-			<th class="span3"><span class="line"></span>@lang('admin/assets/table.checkoutto')</th>
+			<th class="span2"><span class="line"></span>@lang('admin/assets/table.checkoutto')</th>
 			<th class="span2"><span class="line"></span>@lang('admin/assets/table.location')</th>
 			<th class="span1"><span class="line"></span>@lang('admin/assets/table.change')</th>
-			<th class="span2"><span class="line"></span>@lang('admin/assets/table.purchase_date')</th>
-			<!-- <th class="span2"><span class="line"></span>@lang('admin/assets/table.purchase_cost')</th> -->
-			<!-- <th class="span2"><span class="line"></span>@lang('admin/assets/table.book_value')</th> -->
 			<th class="span2"><span class="line"></span>@lang('table.actions')</th>
 		</tr>
 	</thead>
@@ -65,14 +60,9 @@ Assets ::
 				<a href="{{ route('checkout/asset', $asset->id) }}" class="btn-flat success">Checkout</a>
 			@endif
 			</td>
-			<td>{{ $asset->purchase_date }}</td>
-			<!-- <td>${{ number_format($asset->purchase_cost) }}</td> -->
-			<!-- <td>${{ number_format($asset->depreciation()) }}</td> -->
 			<td nowrap="nowrap">
-
 				<a href="{{ route('update/asset', $asset->id) }}" class="btn-flat white">@lang('button.edit')</a>
-				<a href="{{ route('delete/asset', $asset->id) }}" class="btn-flat danger">@lang('button.delete')</a>
-
+				<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/asset', $asset->id) }}" data-content="Are you sure you wish to delete asset {{ $asset->asset_tag }}?" data-title="Delete {{ $asset->asset_tag }}?" onClick="return false;">@lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
@@ -80,6 +70,7 @@ Assets ::
 </table>
 </div>
 
+
 @if ($assets->getTotal() > 10)
 {{ $assets->links() }}
 @endif
diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php
index 111eaf1110..a93ab5a5f4 100755
--- a/app/views/backend/categories/index.blade.php
+++ b/app/views/backend/categories/index.blade.php
@@ -43,7 +43,7 @@ Asset Categories ::
 			</td>
 			<td>
 				<a href="{{ route('update/category', $category->id) }}" class="btn-flat white"> @lang('button.edit')</a>
-				<a href="{{ route('delete/category', $category->id) }}" class="btn-flat danger">@lang('button.delete')</a>
+				<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/category', $category->id) }}" data-content="Are you sure you wish to delete the  {{ $category->name }} category?" data-title="Delete this category?" onClick="return false;">@lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php
index 6a8d03bf48..f4f7cdc846 100755
--- a/app/views/backend/depreciations/index.blade.php
+++ b/app/views/backend/depreciations/index.blade.php
@@ -38,7 +38,7 @@ Asset Depreciations ::
 			<td>{{ $depreciation->months }} @lang('admin/depreciations/table.months') </td>
 			<td>
 				<a href="{{ route('update/depreciations', $depreciation->id) }}" class="btn-flat white">@lang('button.edit')</a>
-				<a href="{{ route('delete/depreciations', $depreciation->id) }}" class="btn-flat danger">@lang('button.delete')</a>
+				<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/depreciations', $depreciation->id) }}" data-content="Are you sure you wish to delete the  {{ $depreciation->name }} depreciation class?" data-title="Delete {{ $depreciation->name }}?" onClick="return false;">@lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/groups/index.blade.php b/app/views/backend/groups/index.blade.php
index 3849090e80..5431627636 100755
--- a/app/views/backend/groups/index.blade.php
+++ b/app/views/backend/groups/index.blade.php
@@ -43,7 +43,7 @@ Group Management ::
 			<td>{{ $group->created_at->diffForHumans() }}</td>
 			<td>
 				<a href="{{ route('update/group', $group->id) }}" class="btn-flat white">@lang('button.edit')</a>
-				<a href="{{ route('delete/group', $group->id) }}" class="btn-flat danger">@lang('button.delete')</a>
+				<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/group', $group->id) }}" data-content="Are you sure you wish to delete the  {{ $group->name }} group?" data-title="Delete {{ $group->name }}?" onClick="return false;">@lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php
index 8a9179b602..c81aecaa4f 100755
--- a/app/views/backend/layouts/default.blade.php
+++ b/app/views/backend/layouts/default.blade.php
@@ -296,10 +296,28 @@
             // jQuery Knobs
             $(".knob").knob();
 
+            // confirm delete modal
+            $('.delete-asset').click(function(evnt) {
+			var href = $(this).attr('href');
+			var message = $(this).attr('data-content');
+            var title = $(this).attr('data-title');
+
+			if (!$('#dataConfirmModal').length) {
+				$('body').append('<div id="dataConfirmModal" class="modal" role="dialog" aria-labelledby="dataConfirmLabel" aria-hidden="true"><div class="modal-header"><button type="button" class="close " data-dismiss="modal" aria-hidden="true">×</button><h3 id="dataConfirmLabel">'+title+'</h3></div><div class="modal-body">'+message+'</div><div class="modal-footer"><button class="btn-flat white" data-dismiss="modal" aria-hidden="true">No</button> <a class="btn-flat danger" id="dataConfirmOK">Yes</a></div></div>');
+			}
+
+			$('#dataConfirmModal').find('.modal-body').text(message);
+			$('#dataConfirmOK').attr('href', href);
+			$('#dataConfirmModal').modal({show:true});
+})
+
 
         });
 
 
+
+
+
     </script>
 
 
diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php
index 7bb590ef7f..49bf776707 100755
--- a/app/views/backend/licenses/index.blade.php
+++ b/app/views/backend/licenses/index.blade.php
@@ -57,7 +57,11 @@ Licenses ::
 			</td>
 			<td>
 				<a href="{{ route('update/license', $license->id) }}" class="btn-flat white"> @lang('button.edit')</a>
-				<a href="{{ route('delete/license', $license->id) }}"  class="btn-flat danger"> @lang('button.delete')</a>
+				<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/license', $license->id) }}" data-content="Are you sure you wish to delete the  {{ $license->name }} license?" data-title="Delete {{ $license->name }}?" onClick="return false;">@lang('button.delete')</a>
+
+
+
+
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php
index 4813fb0574..6a43a6c257 100755
--- a/app/views/backend/locations/index.blade.php
+++ b/app/views/backend/locations/index.blade.php
@@ -42,7 +42,7 @@ Asset Depreciations ::
 			<td>{{ $location->city }}, {{ $location->state }}  {{ $location->country }}  </td>
 			<td>
 				<a href="{{ route('update/location', $location->id) }}" class="btn-flat white"> @lang('button.edit')</a>
-				<a href="{{ route('delete/location', $location->id) }}" class="btn-flat danger">@lang('button.delete')</a>
+				<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/location', $location->id) }}" data-content="Are you sure you wish to delete the  {{ $location->name }} location?" data-title="Delete {{ $location->name }}?" onClick="return false;">@lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php
index 67b0069049..4da51c70bb 100755
--- a/app/views/backend/manufacturers/index.blade.php
+++ b/app/views/backend/manufacturers/index.blade.php
@@ -36,7 +36,7 @@ Asset Manufacturers ::
 			<td>{{ $manufacturer->name }}</td>
 			<td>
 				<a href="{{ route('update/manufacturer', $manufacturer->id) }}" class="btn-flat white">@lang('button.edit')</a>
-				<a href="{{ route('delete/manufacturer', $manufacturer->id) }}" class="btn-flat danger">@lang('button.delete')</a>
+				<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/manufacturer', $manufacturer->id) }}" data-content="Are you sure you wish to delete the  {{ $manufacturer->name }} manufacturer?" data-title="Delete {{ $manufacturer->name }}?" onClick="return false;">@lang('button.delete')</a>
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php
index c75e83546a..57530306d9 100755
--- a/app/views/backend/models/index.blade.php
+++ b/app/views/backend/models/index.blade.php
@@ -28,24 +28,21 @@ Asset Models ::
 			<th class="span3">@lang('admin/models/table.title')</th>
 			<th class="span3"><span class="line"></span>@lang('admin/models/table.modelnumber')</th>
 			<th class="span1"><span class="line"></span>@lang('admin/models/table.numassets')</th>
-			<th class="span1"><span class="line"></span>@lang('admin/models/table.created_at')</th>
+			<th class="span2"><span class="line"></span>@lang('admin/models/table.created_at')</th>
 			<th class="span3"><span class="line"></span>@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
 		@foreach ($models as $model)
 		<tr>
-			<td>{{ $model->name }}
-
-
-
-			</td>
+			<td>{{ $model->name }}</td>
 			<td>{{ $model->modelno }}</td>
 			<td>{{ ($model->assets->count()) }}</td>
 			<td>{{ $model->created_at->diffForHumans() }}</td>
 			<td>
 				<a href="{{ route('update/model', $model->id) }}" class="btn-flat white">@lang('button.edit')</a>
-				<a href="{{ route('delete/model', $model->id) }}" class="btn-flat danger">@lang('button.delete')</a>
+				<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/model', $model->id) }}" data-content="Are you sure you wish to delete the  {{ $model->name }} model?" data-title="Delete {{ $model->name }}?" onClick="return false;">@lang('button.delete')</a>
+
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index 51dfd0400d..9f9d6655b7 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -71,7 +71,8 @@ User Management ::
 				@else
 				<a href="{{ route('update/user', $user->id) }}" class="btn-flat white"><i class="icon-pencil"></i> @lang('button.edit')</a>
 				@if (Sentry::getId() !== $user->id)
-				<a href="{{ route('delete/user', $user->id) }}" class="btn-flat danger"><i class="icon-remove icon-white"></i> @lang('button.delete')</a>
+				<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/user', $user->id) }}" data-content="Are you sure you wish to delete the user {{ $user->fullName() }}?" data-title="Delete {{ $user->first_name }}?" onClick="return false;"><i class="icon-remove icon-white"></i> @lang('button.delete')</a>
+
 				@else
 				<span class="btn-flat danger disabled"><i class="icon-remove icon-white"></i> @lang('button.delete')</span>
 				@endif
diff --git a/app/views/backend/users/view.blade.php b/app/views/backend/users/view.blade.php
index 677a360469..e17e4e810e 100644
--- a/app/views/backend/users/view.blade.php
+++ b/app/views/backend/users/view.blade.php
@@ -89,7 +89,13 @@ View User {{ $user->fullName() }} ::
 									<tr>
 										<td>{{ $log->added_on }}</td>
 										<td>{{ $log->action_type }}</td>
-										<td><a href="{{ route('view/asset', $log->asset_id) }}">{{ $log->assetlog->name }}</a></td>
+										<td>
+										@if (isset($log->assetlog->name))
+										<a href="{{ route('view/asset', $log->asset_id) }}">{{ $log->assetlog->name }}</a>
+										@else
+										missing asset
+										@endif
+										</td>
 										<td>{{ $log->adminlog->fullName() }}</td>
 									</tr>
 									@endforeach