upgraded Ember and Bootstrap, merged changes

gui/app/models/doc-search-result.js

@@ -0,0 +1,28 @@
+// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
+//
+// This software (Documize Community Edition) is licensed under
+// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
+//
+// You can operate outside the AGPL restrictions by purchasing
+// Documize Enterprise Edition and obtaining a commercial license
+// by contacting <sales@documize.com>.
+//
+// https://documize.com
+
+import Model from 'ember-data/model';
+import attr from 'ember-data/attr';
+
+export default Model.extend({
+	orgId: attr(),
+	document: attr(),
+	documentId: attr(),
+	documentSlug: attr(),
+	tags: attr(),
+	excerpt: attr(),
+	itemId: attr(),
+	itemType: attr(),
+	space: attr(),
+	spaceId: attr(),
+	spaceSlug: attr(),
+	selected: attr()
+});