modified:   .gitignore
	modified:   Gemfile
	modified:   Gemfile.lock
	new file:   app/authorizers/application_authorizer.rb
	modified:   app/controllers/admin/categories_controller.rb
	modified:   app/controllers/admin/clients_controller.rb
	modified:   app/controllers/admin/contacts_controller.rb
	modified:   app/controllers/admin/conversations_controller.rb
	modified:   app/controllers/admin/interactions_controller.rb
	modified:   app/controllers/admin/invoices_controller.rb
	modified:   app/controllers/admin/messages_controller.rb
	modified:   app/controllers/admin/notes_controller.rb
	modified:   app/controllers/admin/posts_controller.rb
	modified:   app/controllers/admin/products_controller.rb
	modified:   app/controllers/admin/rate_types_controller.rb
	modified:   app/controllers/admin/services_controller.rb
	modified:   app/controllers/admin/settings_controller.rb
	modified:   app/controllers/admin/sponsors_controller.rb
	modified:   app/controllers/admin/tasks_controller.rb
	modified:   app/controllers/admin/tickets_controller.rb
        modified:   app/controllers/admin_controller.rb
	modified:   app/controllers/application_controller.rb
	deleted:    app/controllers/users_controller.rb
	modified:   app/models/role.rb
	modified:   app/models/user.rb
	modified:   config/database.yml
	new file:   config/initializers/authority.rb
	modified:   config/initializers/devise.rb
	deleted:    config/initializers/environment_variables.rb
	new file:   config/initializers/rolify.rb
	deleted:    config/initializers/the_role.rb
	modified:   config/routes.rb
	deleted:    db/migrate/20140523032727_add_role_id_to_users.rb
	deleted:    db/migrate/20140523032846_create_roles.the_role_engine.rb
	new file:   db/migrate/20140613032346_rolify_create_roles.rb
	modified:   db/schema.rb
	new file:   public/403.html
	new file:   test/fixtures/roles.yml
	new file:   test/models/role_test.rb
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile
	Gemfile.lock
	config/database.yml
	config/initializers/devise.rb

	modified:   .gitignore
	deleted:    Gemfile
	modified:   Gemfile.lock
	new file:   app/authorizers/application_authorizer.rb
	modified:   app/controllers/admin/categories_controller.rb
	modified:   app/controllers/admin/clients_controller.rb
	modified:   app/controllers/admin/contacts_controller.rb
	modified:   app/controllers/admin/conversations_controller.rb
	modified:   app/controllers/admin/interactions_controller.rb
	modified:   app/controllers/admin/invoices_controller.rb
	modified:   app/controllers/admin/messages_controller.rb
	modified:   app/controllers/admin/notes_controller.rb
	modified:   app/controllers/admin/posts_controller.rb
	modified:   app/controllers/admin/products_controller.rb
	modified:   app/controllers/admin/rate_types_controller.rb
	modified:   app/controllers/admin/services_controller.rb
	modified:   app/controllers/admin/settings_controller.rb
	modified:   app/controllers/admin/sponsors_controller.rb
	modified:   app/controllers/admin/tasks_controller.rb
	modified:   app/controllers/admin/tickets_controller.rb
	modified:   app/controllers/admin_controller.rb
	modified:   app/controllers/application_controller.rb
 	deleted:    app/controllers/users_controller.rb
	modified:   app/models/role.rb
	modified:   app/models/user.rb
	modified:   config/database.yml
	new file:   config/initializers/authority.rb
	modified:   config/initializers/devise.rb
	deleted:    config/initializers/environment_variables.rb
	new file:   config/initializers/rolify.rb
	deleted:    config/initializers/the_role.rb
	modified:   config/routes.rb
	deleted:    db/migrate/20140523032727_add_role_id_to_users.rb
	deleted:    db/migrate/20140523032846_create_roles.the_role_engine.rb
	new file:   db/migrate/20140613032346_rolify_create_roles.rb
        modified:   db/schema.rb
	new file:   public/403.html
	new file:   test/fixtures/roles.yml
	new file:   test/models/role_test.rb
	new file:   Gemfile
	deleted:    Gemfile.lock
Fixed
	modified:   config/database.yml
fix
	modified:   app/assets/font/FontAwesome.otf
	modified:   app/assets/font/admin/FontAwesome.otf
	modified:   app/assets/font/admin/fontawesome-webfont.eot
	modified:   app/assets/font/admin/fontawesome-webfont.svg
	modified:   app/assets/font/admin/fontawesome-webfont.ttf
	modified:   app/assets/font/admin/fontawesome-webfont.woff
	modified:   app/assets/font/fontawesome-webfont.eot
	modified:   app/assets/font/fontawesome-webfont.svg
	modified:   app/assets/font/fontawesome-webfont.ttf
	modified:   app/assets/font/fontawesome-webfont.woff
	renamed:    app/assets/stylesheets/admin/pixel-admin.css -> app/assets/stylesheets/admin/pixel-admin.css.erb
	modified:   config/environments/production.rb
	new file:   public/assets/FontAwesome-5c287b52bc18a90543f9fca24e9aada6.otf
        renamed:    app/assets/font/FontAwesome.otf -> public/assets/FontAwesome-f4e144aa00f6e290cf254b2ea68a5760.otf
	new file:   public/assets/admin/1-b5a58fc29895df361695f1007de94f49.jpg
	new file:   public/assets/admin/2-ea6c58a8053908cb383559aa3c1683e5.jpg
	new file:   public/assets/admin/3-94fcfc91143ca4b8fcbb8843ab5e5301.jpg
	new file:   public/assets/admin/4-cda8fe92635f8e6408ac482c102c96ad.jpg
	new file:   public/assets/admin/5-5dd92dacc7c18268b741065757380300.jpg
	new file:   public/assets/admin/FontAwesome-5c287b52bc18a90543f9fca24e9aada6.otf
	renamed:    app/assets/font/admin/FontAwesome.otf -> public/assets/admin/FontAwesome-75900c2f88b61149125a164c388e4dbe.otf
	new file:   public/assets/admin/admin-00c8006695ffb2b4a00340ffc76c9e44.css
	new file:   public/assets/admin/admin-00c8006695ffb2b4a00340ffc76c9e44.css.gz
	new file:   public/assets/admin/admin-296268bf53e08cc038afe130d6f90b9e.css
	new file:   public/assets/admin/admin-296268bf53e08cc038afe130d6f90b9e.css.gz
	new file:   public/assets/admin/admin-466ac26bc138820c07a23e41644d63ee.css
	new file:   public/assets/admin/admin-466ac26bc138820c07a23e41644d63ee.css.gz
	new file:   public/assets/admin/admin-a895318198a338e8221587b665e6fd88.js
	new file:   public/assets/admin/admin-a895318198a338e8221587b665e6fd88.js.gz
	new file:   public/assets/admin/adminflare-55b90a3d9b49d2fdaaced1b0f4fd0835.png
	new file:   public/assets/admin/asphalt-60cbf13a136cdbd1269f7a114d3d6053.png
	new file:   public/assets/admin/avatar-964b9bdc72956bb51aed3fadad4bce30.png
	new file:   public/assets/admin/blank-00e9ef863907a579c27477f4b94cf7ef.png
	new file:   public/assets/admin/blur-17e7df33a426158979c5c636b5a23c72.svg
	new file:   public/assets/admin/body-bg-83bf36036c9854f676f44e007eaba20c.png
	new file:   public/assets/admin/body-bg-ca968c455d5b58c6e92bdbb943ca790f.gif
	new file:   public/assets/admin/bootstrap/glyphicons-halflings-regular-0dad23eb93dac1723b033c0965c1522f.svg
	new file:   public/assets/admin/bootstrap/glyphicons-halflings-regular-8921a93349df81eec3d107b946cadc11.woff
        new file:   public/assets/admin/bootstrap/glyphicons-halflings-regular-dabd247fcf6131fac2d5fb49ef946032.eot
	new file:   public/assets/admin/bootstrap/glyphicons-halflings-regular-f7c7c8f3c0d76e8572c38e5d8ee21a62.ttf
	new file:   public/assets/admin/clean-807e1074d69e7400066ce7aaa0b37e01.png
	new file:   public/assets/admin/default-5fb305eb46d085650bb54dfface7b47d.png
	new file:   public/assets/admin/dust-e6930cd1f660915919e67b4f7fb9c1a9.png
	renamed:    app/assets/font/admin/fontawesome-webfont.svg -> public/assets/admin/fontawesome-webfont-0f6bb74760f60020208520aaffe7178a.svg
	new file:   public/assets/admin/fontawesome-webfont-193779f97a012b987d59a85827509b89.eot
	new file:   public/assets/admin/fontawesome-webfont-8256e2389e155e0b32d94d9afacdf5e6.woff
	renamed:    app/assets/font/admin/fontawesome-webfont.ttf -> public/assets/admin/fontawesome-webfont-90e987e197e36d15cfcaba1cf968abe2.ttf
	new file:   public/assets/admin/fontawesome-webfont-b3884e8c99f97377e242bc01a2aebfd6.ttf
	renamed:    app/assets/font/admin/fontawesome-webfont.woff -> public/assets/admin/fontawesome-webfont-c666813ae8d577f1e04b4faf99e990da.woff
	new file:   public/assets/admin/fontawesome-webfont-d42172918017239238457bdd6f8152bf.svg
	renamed:    app/assets/font/admin/fontawesome-webfont.eot -> public/assets/admin/fontawesome-webfont-f56504f061caa6896d66c73b119e4904.eot
	new file:   public/assets/admin/fresh-a2f7889ac79220460a33b4e7b2cf1848.png
	new file:   public/assets/admin/frost-6677e68be908594b97254ef9173df143.png
	new file:   public/assets/admin/glyphicons-halflings-regular-0dad23eb93dac1723b033c0965c1522f.svg
	new file:   public/assets/admin/glyphicons-halflings-regular-8921a93349df81eec3d107b946cadc11.woff
	new file:   public/assets/admin/glyphicons-halflings-regular-dabd247fcf6131fac2d5fb49ef946032.eot
	new file:   public/assets/admin/glyphicons-halflings-regular-f7c7c8f3c0d76e8572c38e5d8ee21a62.ttf
	new file:   public/assets/admin/ie-navbar-bg-77fe9d4a86cf9640d20a3993794ae81d.png
	new file:   public/assets/admin/main-menu-bg-04b10f21f7fb962e5e62510d720d90fc.png
	new file:   public/assets/admin/main-navbar-bg-f4031da00135ed633819e37dafc9716e.png
	new file:   public/assets/admin/main-navbar-logo-9ffc61b1859bb90471d90ea68d0da40d.png
	new file:   public/assets/admin/menu-bg-351d3f8d5087e3855158e1b12c02dee7.png
	new file:   public/assets/admin/plugins/bootstrap-editable/loading-77d1946284a7d98a8d532e04a1ff8e18.gif
	new file:   public/assets/admin/plugins/jquery.minicolors-47e346b2849ce38e294ec6f5e52cbfea.png
	new file:   public/assets/admin/purple-hills-7acd00317ca65c3319dfbedb22ac96ba.png
	new file:   public/assets/admin/silver-1833003379c7689bff96b4cf74e07f21.png
	new file:   public/assets/admin/white-731e9e6d3a9170edffad7f82ed5c428b.png
	new file:   public/assets/fontawesome-webfont-193779f97a012b987d59a85827509b89.eot
	renamed:    app/assets/font/fontawesome-webfont.eot -> public/assets/fontawesome-webfont-2251b9a1665c81762136a865e84799f5.eot
	renamed:    app/assets/font/fontawesome-webfont.ttf -> public/assets/fontawesome-webfont-6bbddef22818198088dcb78458c003d8.ttf
	new file:   public/assets/fontawesome-webfont-8256e2389e155e0b32d94d9afacdf5e6.woff
	renamed:    app/assets/font/fontawesome-webfont.woff -> public/assets/fontawesome-webfont-afcbe6a06622827abea86ae1d925dd17.woff
	new file:   public/assets/fontawesome-webfont-b3884e8c99f97377e242bc01a2aebfd6.ttf
	renamed:    app/assets/font/fontawesome-webfont.svg -> public/assets/fontawesome-webfont-c111dec5c71683a5d3b1eb1c59213e78.svg
	new file:   public/assets/fontawesome-webfont-d42172918017239238457bdd6f8152bf.svg
	new file:   public/assets/manifest-8e2832a65b59a3e55531a03fcb09092a.json
	new file:   public/assets/medium/missing-08c2e68d5c2bf4533660efaee6810859.png
	new file:   public/assets/original/missing-8509745261b6f4180ccffb445cad1851.png
	new file:   public/assets/original/missing-header-b9fb3335205ea159e95705352d49628d.jpg
	new file:   public/assets/thumb/missing-3b4fff5fb4d23a32c84ce8bdc694056f.png
fix merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/assets/admin/admin-00c8006695ffb2b4a00340ffc76c9e44.css.gz
	public/assets/admin/admin-a895318198a338e8221587b665e6fd88.js.gz

	modified:   app/assets/font/FontAwesome.otf
	modified:   app/assets/font/admin/FontAwesome.otf
	modified:   app/assets/font/admin/fontawesome-webfont.eot
	modified:   app/assets/font/admin/fontawesome-webfont.svg
	modified:   app/assets/font/admin/fontawesome-webfont.ttf
	modified:   app/assets/font/admin/fontawesome-webfont.woff
	modified:   app/assets/font/fontawesome-webfont.eot
	modified:   app/assets/font/fontawesome-webfont.svg
	modified:   app/assets/font/fontawesome-webfont.ttf
	modified:   app/assets/font/fontawesome-webfont.woff
	renamed:    app/assets/stylesheets/admin/pixel-admin.css -> app/assets/stylesheets/admin/pixel-admin.css.erb
	modified:   config/environments/production.rb
	new file:   public/assets/FontAwesome-5c287b52bc18a90543f9fca24e9aada6.otf
	new file:   public/assets/admin/FontAwesome-5c287b52bc18a90543f9fca24e9aada6.otf
	new file:   public/assets/admin/admin-296268bf53e08cc038afe130d6f90b9e.css
	new file:   public/assets/admin/admin-296268bf53e08cc038afe130d6f90b9e.css.gz
	new file:   public/assets/admin/admin-466ac26bc138820c07a23e41644d63ee.css
	new file:   public/assets/admin/admin-466ac26bc138820c07a23e41644d63ee.css.gz
	new file:   public/assets/admin/fontawesome-webfont-193779f97a012b987d59a85827509b89.eot
	new file:   public/assets/admin/fontawesome-webfont-8256e2389e155e0b32d94d9afacdf5e6.woff
	new file:   public/assets/admin/fontawesome-webfont-b3884e8c99f97377e242bc01a2aebfd6.ttf
	new file:   public/assets/admin/fontawesome-webfont-d42172918017239238457bdd6f8152bf.svg
	new file:   public/assets/fontawesome-webfont-193779f97a012b987d59a85827509b89.eot
	new file:   public/assets/fontawesome-webfont-8256e2389e155e0b32d94d9afacdf5e6.woff
	new file:   public/assets/fontawesome-webfont-b3884e8c99f97377e242bc01a2aebfd6.ttf
	new file:   public/assets/fontawesome-webfont-d42172918017239238457bdd6f8152bf.svg
	new file:   public/assets/manifest-8e2832a65b59a3e55531a03fcb09092a.json
	deleted:    public/assets/FontAwesome-5c287b52bc18a90543f9fca24e9aada6.otf
	deleted:    public/assets/FontAwesome-f4e144aa00f6e290cf254b2ea68a5760.otf
	deleted:    public/assets/admin/1-b5a58fc29895df361695f1007de94f49.jpg
	deleted:    public/assets/admin/2-ea6c58a8053908cb383559aa3c1683e5.jpg
	deleted:    public/assets/admin/3-94fcfc91143ca4b8fcbb8843ab5e5301.jpg
        deleted:    public/assets/admin/4-cda8fe92635f8e6408ac482c102c96ad.jpg
	deleted:    public/assets/admin/5-5dd92dacc7c18268b741065757380300.jpg
	deleted:    public/assets/admin/FontAwesome-5c287b52bc18a90543f9fca24e9aada6.otf
	deleted:    public/assets/admin/FontAwesome-75900c2f88b61149125a164c388e4dbe.otf
	deleted:    public/assets/admin/admin-00c8006695ffb2b4a00340ffc76c9e44.css
	deleted:    public/assets/admin/admin-00c8006695ffb2b4a00340ffc76c9e44.css.gz
	deleted:    public/assets/admin/admin-296268bf53e08cc038afe130d6f90b9e.css
	deleted:    public/assets/admin/admin-296268bf53e08cc038afe130d6f90b9e.css.gz
	deleted:    public/assets/admin/admin-466ac26bc138820c07a23e41644d63ee.css
	deleted:    public/assets/admin/admin-466ac26bc138820c07a23e41644d63ee.css.gz
	deleted:    public/assets/admin/admin-a895318198a338e8221587b665e6fd88.js
	deleted:    public/assets/admin/admin-a895318198a338e8221587b665e6fd88.js.gz
	deleted:    public/assets/admin/adminflare-55b90a3d9b49d2fdaaced1b0f4fd0835.png
	deleted:    public/assets/admin/asphalt-60cbf13a136cdbd1269f7a114d3d6053.png
	deleted:    public/assets/admin/avatar-964b9bdc72956bb51aed3fadad4bce30.png
	deleted:    public/assets/admin/blank-00e9ef863907a579c27477f4b94cf7ef.png
	deleted:    public/assets/admin/blur-17e7df33a426158979c5c636b5a23c72.svg
	deleted:    public/assets/admin/body-bg-83bf36036c9854f676f44e007eaba20c.png
	deleted:    public/assets/admin/body-bg-ca968c455d5b58c6e92bdbb943ca790f.gif
	deleted:    public/assets/admin/bootstrap/glyphicons-halflings-regular-0dad23eb93dac1723b033c0965c1522f.svg
	deleted:    public/assets/admin/bootstrap/glyphicons-halflings-regular-8921a93349df81eec3d107b946cadc11.woff
	deleted:    public/assets/admin/bootstrap/glyphicons-halflings-regular-dabd247fcf6131fac2d5fb49ef946032.eot
	deleted:    public/assets/admin/bootstrap/glyphicons-halflings-regular-f7c7c8f3c0d76e8572c38e5d8ee21a62.ttf
	deleted:    public/assets/admin/clean-807e1074d69e7400066ce7aaa0b37e01.png
	deleted:    public/assets/admin/default-5fb305eb46d085650bb54dfface7b47d.png
	deleted:    public/assets/admin/dust-e6930cd1f660915919e67b4f7fb9c1a9.png
	deleted:    public/assets/admin/fontawesome-webfont-0f6bb74760f60020208520aaffe7178a.svg
	deleted:    public/assets/admin/fontawesome-webfont-193779f97a012b987d59a85827509b89.eot
	deleted:    public/assets/admin/fontawesome-webfont-8256e2389e155e0b32d94d9afacdf5e6.woff
	deleted:    public/assets/admin/fontawesome-webfont-90e987e197e36d15cfcaba1cf968abe2.ttf
	deleted:    public/assets/admin/fontawesome-webfont-b3884e8c99f97377e242bc01a2aebfd6.ttf
	deleted:    public/assets/admin/fontawesome-webfont-c666813ae8d577f1e04b4faf99e990da.woff
	deleted:    public/assets/admin/fontawesome-webfont-d42172918017239238457bdd6f8152bf.svg
	deleted:    public/assets/admin/fontawesome-webfont-f56504f061caa6896d66c73b119e4904.eot
	deleted:    public/assets/admin/fresh-a2f7889ac79220460a33b4e7b2cf1848.png
	deleted:    public/assets/admin/frost-6677e68be908594b97254ef9173df143.png
	deleted:    public/assets/admin/glyphicons-halflings-regular-0dad23eb93dac1723b033c0965c1522f.svg
	deleted:    public/assets/admin/glyphicons-halflings-regular-8921a93349df81eec3d107b946cadc11.woff
	deleted:    public/assets/admin/glyphicons-halflings-regular-dabd247fcf6131fac2d5fb49ef946032.eot
	deleted:    public/assets/admin/glyphicons-halflings-regular-f7c7c8f3c0d76e8572c38e5d8ee21a62.ttf
	deleted:    public/assets/admin/ie-navbar-bg-77fe9d4a86cf9640d20a3993794ae81d.png
	deleted:    public/assets/admin/main-menu-bg-04b10f21f7fb962e5e62510d720d90fc.png
	deleted:    public/assets/admin/main-navbar-bg-f4031da00135ed633819e37dafc9716e.png
	deleted:    public/assets/admin/main-navbar-logo-9ffc61b1859bb90471d90ea68d0da40d.png
	deleted:    public/assets/admin/menu-bg-351d3f8d5087e3855158e1b12c02dee7.png
	deleted:    public/assets/admin/plugins/bootstrap-editable/loading-77d1946284a7d98a8d532e04a1ff8e18.gif
	deleted:    public/assets/admin/plugins/jquery.minicolors-47e346b2849ce38e294ec6f5e52cbfea.png
	deleted:    public/assets/admin/purple-hills-7acd00317ca65c3319dfbedb22ac96ba.png#
	deleted:    public/assets/admin/silver-1833003379c7689bff96b4cf74e07f21.png
	deleted:    public/assets/admin/white-731e9e6d3a9170edffad7f82ed5c428b.png
	deleted:    public/assets/fontawesome-webfont-193779f97a012b987d59a85827509b89.eot
	deleted:    public/assets/fontawesome-webfont-2251b9a1665c81762136a865e84799f5.eot
	deleted:    public/assets/fontawesome-webfont-6bbddef22818198088dcb78458c003d8.ttf
	deleted:    public/assets/fontawesome-webfont-8256e2389e155e0b32d94d9afacdf5e6.woff
	deleted:    public/assets/fontawesome-webfont-afcbe6a06622827abea86ae1d925dd17.woff
	deleted:    public/assets/fontawesome-webfont-b3884e8c99f97377e242bc01a2aebfd6.ttf
	deleted:    public/assets/fontawesome-webfont-c111dec5c71683a5d3b1eb1c59213e78.svg
	deleted:    public/assets/fontawesome-webfont-d42172918017239238457bdd6f8152bf.svg
	deleted:    public/assets/manifest-8e2832a65b59a3e55531a03fcb09092a.json
	deleted:    public/assets/medium/missing-08c2e68d5c2bf4533660efaee6810859.png
	deleted:    public/assets/original/missing-8509745261b6f4180ccffb445cad1851.png
	deleted:    public/assets/original/missing-header-b9fb3335205ea159e95705352d49628d.jpg
	deleted:    public/assets/thumb/missing-3b4fff5fb4d23a32c84ce8bdc694056f.png
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/assets/admin/admin-00c8006695ffb2b4a00340ffc76c9e44.css.gz
	public/assets/admin/admin-a895318198a338e8221587b665e6fd88.js.gz

	deleted:    app/assets/stylesheets/font-awesome.css
	modified:   app/views/layouts/_nav.html.erb
	modified:   app/views/welcome/index.html.erb
	deleted:    public/assets/3-846a948183fa8b57ec8851215789a295.jpg
	deleted:    public/assets/3-f0187e18f0ef6c6f1e256044020c4433.jpg
	deleted:    public/assets/4-c972d0d4a8dd99e00237babeb668344f.jpg
	deleted:    public/assets/4-f300d0393df164f97d5d1e64468ad96c.jpg
	deleted:    public/assets/5-95fc093ffc6211c661482187e56211b7.png
	deleted:    public/assets/5-a615a1987e0368a23be0798c03d4f7ee.jpg
	deleted:    public/assets/5-e9240b5f650636bf6322ecf7c781ff42.jpg
	deleted:    public/assets/5-f418f96a9518a168d6030730a3f629e5.png
	deleted:    public/assets/65-65778ab6b16668502d08ea30aba4a72d.jpg
	deleted:    public/assets/65-d97792a44d4fd6a52248d78d0d07ec13.jpg
	deleted:    public/assets/FontAwesome-5c287b52bc18a90543f9fca24e9aada6.otf
	deleted:    public/assets/FontAwesome-87f4075288b0ba585028349df8c609eb.otf
	deleted:    public/assets/FontAwesome-f4e144aa00f6e290cf254b2ea68a5760.otf
	deleted:    public/assets/admin/1-0c9c9ded920b8854aaa9ca72334915c3.jpg
	deleted:    public/assets/admin/1-b5a58fc29895df361695f1007de94f49.jpg
	deleted:    public/assets/admin/2-9f440232e08a4ddbcf0db11a9daa5c70.jpg
        deleted:    public/assets/admin/2-ea6c58a8053908cb383559aa3c1683e5.jpg
	deleted:    public/assets/admin/3-7fec3715dc34eba657781b8b7ada96b8.jpg
	deleted:    public/assets/admin/3-94fcfc91143ca4b8fcbb8843ab5e5301.jpg
	deleted:    public/assets/admin/4-9d468d3bf1d656e43cd78460278b36e8.jpg
	deleted:    public/assets/admin/4-cda8fe92635f8e6408ac482c102c96ad.jpg
	deleted:    public/assets/admin/5-1cfe3bb17721fa7ff22625b2217c9997.jpg
	deleted:    public/assets/admin/5-5dd92dacc7c18268b741065757380300.jpg
	deleted:    public/assets/admin/FontAwesome-5c287b52bc18a90543f9fca24e9aada6.otf
	deleted:    public/assets/admin/FontAwesome-75900c2f88b61149125a164c388e4dbe.otf
	deleted:    public/assets/admin/FontAwesome-f536eb1d4f8664fe219ab99d91ec3aad.otf
	deleted:    public/assets/admin/admin-00c8006695ffb2b4a00340ffc76c9e44.css
	deleted:    public/assets/admin/admin-00c8006695ffb2b4a00340ffc76c9e44.css.gz
	deleted:    public/assets/admin/admin-296268bf53e08cc038afe130d6f90b9e.css
	deleted:    public/assets/admin/admin-296268bf53e08cc038afe130d6f90b9e.css.gz
	deleted:    public/assets/admin/admin-466ac26bc138820c07a23e41644d63ee.css
	deleted:    public/assets/admin/admin-466ac26bc138820c07a23e41644d63ee.css.gz
	deleted:    public/assets/admin/admin-85ec7cb310d5bc53520e52ede3a3cda0.js
	deleted:    public/assets/admin/admin-85ec7cb310d5bc53520e52ede3a3cda0.js.gz
	deleted:    public/assets/admin/admin-a895318198a338e8221587b665e6fd88.js
	deleted:    public/assets/admin/admin-a895318198a338e8221587b665e6fd88.js.gz
	deleted:    public/assets/admin/admin-b09a1f954207d7603146705ad3036911.css
	deleted:    public/assets/admin/admin-b09a1f954207d7603146705ad3036911.css.gz
	deleted:    public/assets/admin/adminflare-10c16e845a8cb07c2e075bc6a79e74fd.png
	deleted:    public/assets/admin/adminflare-55b90a3d9b49d2fdaaced1b0f4fd0835.png
	deleted:    public/assets/admin/asphalt-60cbf13a136cdbd1269f7a114d3d6053.png
	deleted:    public/assets/admin/asphalt-a29b518ce2ac54101571f2321e4407fd.png
	deleted:    public/assets/admin/avatar-82cf9919c7ae72180081ab807405d9c3.png
	deleted:    public/assets/admin/avatar-964b9bdc72956bb51aed3fadad4bce30.png
	deleted:    public/assets/admin/blank-00e9ef863907a579c27477f4b94cf7ef.png
	deleted:    public/assets/admin/blank-59426db9c86930965889df9baee7da4c.png
	deleted:    public/assets/admin/blur-17e7df33a426158979c5c636b5a23c72.svg
	deleted:    public/assets/admin/blur-7f727015d8568f2d2bb0b0c061eef596.svg
	deleted:    public/assets/admin/body-bg-2812bb1344ed37d7770d08d2b79bad2a.gif
	deleted:    public/assets/admin/body-bg-83bf36036c9854f676f44e007eaba20c.png
	deleted:    public/assets/admin/body-bg-ca968c455d5b58c6e92bdbb943ca790f.gif
	deleted:    public/assets/admin/body-bg-f20bf63aa4498b5a3b07fd8e4d5140ed.png
	deleted:    public/assets/admin/bootstrap/glyphicons-halflings-regular-0dad23eb93dac1723b033c0965c1522f.svg
	deleted:    public/assets/admin/bootstrap/glyphicons-halflings-regular-71885ae6096c31f836c09db84ee29f78.eot
	deleted:    public/assets/admin/bootstrap/glyphicons-halflings-regular-8921a93349df81eec3d107b946cadc11.woff
	deleted:    public/assets/admin/bootstrap/glyphicons-halflings-regular-8eddb81c896fbca6024bb234e7890a01.svg
	deleted:    public/assets/admin/bootstrap/glyphicons-halflings-regular-d2f919602b3e9b579cfe2d14c35843d2.ttf
	deleted:    public/assets/admin/bootstrap/glyphicons-halflings-regular-d944263c508c59184b19789f6cbbee9b.woff
	deleted:    public/assets/admin/bootstrap/glyphicons-halflings-regular-dabd247fcf6131fac2d5fb49ef946032.eot#
	deleted:    public/assets/admin/bootstrap/glyphicons-halflings-regular-f7c7c8f3c0d76e8572c38e5d8ee21a62.ttf
	deleted:    public/assets/admin/clean-325913b737711c39d81516250a42993c.png
	deleted:    public/assets/admin/clean-807e1074d69e7400066ce7aaa0b37e01.png
	deleted:    public/assets/admin/default-5fb305eb46d085650bb54dfface7b47d.png
	deleted:    public/assets/admin/default-9aa0a7a0937695d3bae6a53be5e6607c.png
	deleted:    public/assets/admin/dust-770b57d79f4555d84f14b7e66d9f5743.png
	deleted:    public/assets/admin/dust-e6930cd1f660915919e67b4f7fb9c1a9.png
	deleted:    public/assets/admin/fontawesome-webfont-027499bf57aacf4f676ca8f2143254ac.woff
	deleted:    public/assets/admin/fontawesome-webfont-0f6bb74760f60020208520aaffe7178a.svg
	deleted:    public/assets/admin/fontawesome-webfont-193779f97a012b987d59a85827509b89.eot
	deleted:    public/assets/admin/fontawesome-webfont-6c4ffa0ee4685914db7594a702075b51.svg
	deleted:    public/assets/admin/fontawesome-webfont-8256e2389e155e0b32d94d9afacdf5e6.woff
	deleted:    public/assets/admin/fontawesome-webfont-90e987e197e36d15cfcaba1cf968abe2.ttf
	deleted:    public/assets/admin/fontawesome-webfont-af4d29d7b6dd0695052b1f63a1c49862.eot
	deleted:    public/assets/admin/fontawesome-webfont-b3884e8c99f97377e242bc01a2aebfd6.ttf
	deleted:    public/assets/admin/fontawesome-webfont-bb46c1b4dd380d816ae07027571c7cfa.ttf
	deleted:    public/assets/admin/fontawesome-webfont-c666813ae8d577f1e04b4faf99e990da.woff
	deleted:    public/assets/admin/fontawesome-webfont-d42172918017239238457bdd6f8152bf.svg
	deleted:    public/assets/admin/fontawesome-webfont-f56504f061caa6896d66c73b119e4904.eot
	deleted:    public/assets/admin/fresh-23330840d7df64b84333a7d60ac1869e.png
	deleted:    public/assets/admin/fresh-a2f7889ac79220460a33b4e7b2cf1848.png
	deleted:    public/assets/admin/frost-6677e68be908594b97254ef9173df143.png
	deleted:    public/assets/admin/frost-710d7a0d771eb9d124ec80399e27a5c9.png
	deleted:    public/assets/admin/glyphicons-halflings-regular-0dad23eb93dac1723b033c0965c1522f.svg
	deleted:    public/assets/admin/glyphicons-halflings-regular-71885ae6096c31f836c09db84ee29f78.eot
	deleted:    public/assets/admin/glyphicons-halflings-regular-8921a93349df81eec3d107b946cadc11.woff
	deleted:    public/assets/admin/glyphicons-halflings-regular-8eddb81c896fbca6024bb234e7890a01.svg
	deleted:    public/assets/admin/glyphicons-halflings-regular-d2f919602b3e9b579cfe2d14c35843d2.ttf
	deleted:    public/assets/admin/glyphicons-halflings-regular-d944263c508c59184b19789f6cbbee9b.woff
	deleted:    public/assets/admin/glyphicons-halflings-regular-dabd247fcf6131fac2d5fb49ef946032.eot
	deleted:    public/assets/admin/glyphicons-halflings-regular-f7c7c8f3c0d76e8572c38e5d8ee21a62.ttf
	deleted:    public/assets/admin/ie-navbar-bg-77fe9d4a86cf9640d20a3993794ae81d.png
	deleted:    public/assets/admin/ie-navbar-bg-f9743e78f4fffd872ced8bcf8e70bb79.png
	deleted:    public/assets/admin/main-menu-bg-04b10f21f7fb962e5e62510d720d90fc.png
	deleted:    public/assets/admin/main-menu-bg-9fc6686607765eb1f8acfc9191938e4c.png
	deleted:    public/assets/admin/main-navbar-bg-6fe1d5884abf988c278bf7f3973faccf.png
	deleted:    public/assets/admin/main-navbar-bg-f4031da00135ed633819e37dafc9716e.png
	deleted:    public/assets/admin/main-navbar-logo-2461f8e875ce13c3909478d9d82db976.png
	deleted:    public/assets/admin/main-navbar-logo-9ffc61b1859bb90471d90ea68d0da40d.png
	deleted:    public/assets/admin/menu-bg-1c04c7a1a41e75b50300aeb396572a2b.png
	deleted:    public/assets/admin/menu-bg-351d3f8d5087e3855158e1b12c02dee7.png
	deleted:    public/assets/admin/plugins/bootstrap-editable/loading-6047112db0ff4f9f371bbae6573df4d1.gif
	deleted:    public/assets/admin/plugins/bootstrap-editable/loading-77d1946284a7d98a8d532e04a1ff8e18.gif
	deleted:    public/assets/admin/plugins/jquery.minicolors-47e346b2849ce38e294ec6f5e52cbfea.png
	deleted:    public/assets/admin/plugins/jquery.minicolors-de2e59650bb6a00a75b53f62f695727d.png
	deleted:    public/assets/admin/purple-hills-204c59ac0b376a93e1d9074a62e21c4a.png
	deleted:    public/assets/admin/purple-hills-7acd00317ca65c3319dfbedb22ac96ba.png
	deleted:    public/assets/admin/silver-1833003379c7689bff96b4cf74e07f21.png
	deleted:    public/assets/admin/silver-c8801afe94419754b7d02a29598d8657.png
	deleted:    public/assets/admin/white-731e9e6d3a9170edffad7f82ed5c428b.png
	deleted:    public/assets/admin/white-97496ba30ba8ad8fa5344b560993e3f5.png
	deleted:    public/assets/application-1ef50dbd584ece24e6380a814c31455f.js
	deleted:    public/assets/application-1ef50dbd584ece24e6380a814c31455f.js.gz
	deleted:    public/assets/application-df79d214e1b0f9539ec393642f3e09a3.css
	deleted:    public/assets/application-df79d214e1b0f9539ec393642f3e09a3.css.gz
	deleted:    public/assets/application-e7123bb8885996c513c8b3ad6203684d.js
	deleted:    public/assets/application-e7123bb8885996c513c8b3ad6203684d.js.gz
	deleted:    public/assets/application-e9a8c204459be4412f373fd0c503af5e.css
	deleted:    public/assets/application-e9a8c204459be4412f373fd0c503af5e.css.gz
	deleted:    public/assets/at1-6c3af6917ea422469274ce697cc5f92b.jpg
	deleted:    public/assets/at1-73818ff9c8070b9ba606aeb932986f70.jpg
	deleted:    public/assets/at2-1fb1ef70d14a780be1f9f66d8d71ca49.jpg
	deleted:    public/assets/at2-8f26af8b6606304b22f1f07e2b5246f6.jpg
	deleted:    public/assets/at3-bc81b594c05a675bb20f2c6432f16051.jpg
	deleted:    public/assets/at3-f4465576cd7d53826317323f25db0cc5.jpg
	deleted:    public/assets/at4-2eb8facf15d8b485b2d3df4b6184a5dd.jpg
	deleted:    public/assets/at4-8f2f100b00a669c2e38af2895d88b5d6.jpg
	deleted:    public/assets/at5-21c12819cdec99b510e24e863d598569.jpg
	deleted:    public/assets/at5-965adc1da867748048d66b3ec2b9693e.jpg
	deleted:    public/assets/at6-a9bebd681313e67327013fb818b8ab70.jpg
	deleted:    public/assets/at6-cba61b6104b1c6eb7f1b98163d70c467.jpg
	deleted:    public/assets/cap-d2c2f5d3f285634a9a4eb631e7ec3034.jpg
	deleted:    public/assets/cap-d30438ef49499a25ff13d59782553124.jpg
	deleted:    public/assets/cc-4131fd24bf7164629fb27ad8c5903914.jpg
	deleted:    public/assets/cc-6a94dd045046541b06840ab2a3d322fc.jpg
	deleted:    public/assets/ceo-1675f34f51bd0b79b5d6a33e2a6f4afe.jpg
	deleted:    public/assets/ceo-4700c801a31e596252f4f2e25855f07b.jpg
	deleted:    public/assets/developer-a2926a8b54080b2fbdbe6029d2a75524.jpg
	deleted:    public/assets/developer-f14ed29250d8a1b2fed388d8865662ce.jpg
	deleted:    public/assets/f3-8733a341443714890fd4532166a78988.jpg
	deleted:    public/assets/f3-d6cddc13313a114897c162926152219b.jpg
	deleted:    public/assets/favicon-7d6e2473b6dcea257f21f6489312febd.ico
	deleted:    public/assets/favicon-cb8226dd56d8fbf35c1a365e7b233f1b.ico
	deleted:    public/assets/fb-53648b7e63ceb6a86af2230fd45e6352.jpg
	deleted:    public/assets/fb-740a40228382efaaae05fab3e0b38169.jpg
	deleted:    public/assets/fontawesome-webfont-18bbbc0f09fd467a4d62cdd70540100c.woff
	deleted:    public/assets/fontawesome-webfont-193779f97a012b987d59a85827509b89.eot
	deleted:    public/assets/fontawesome-webfont-2251b9a1665c81762136a865e84799f5.eot
	deleted:    public/assets/fontawesome-webfont-4f5b8ba9b92c7f1b9bf59d197e5f469c.eot
	deleted:    public/assets/fontawesome-webfont-6bbddef22818198088dcb78458c003d8.ttf
	deleted:    public/assets/fontawesome-webfont-8256e2389e155e0b32d94d9afacdf5e6.woff
	deleted:    public/assets/fontawesome-webfont-afcbe6a06622827abea86ae1d925dd17.woff
	deleted:    public/assets/fontawesome-webfont-b3884e8c99f97377e242bc01a2aebfd6.ttf
	deleted:    public/assets/fontawesome-webfont-c111dec5c71683a5d3b1eb1c59213e78.svg
	deleted:    public/assets/fontawesome-webfont-d42172918017239238457bdd6f8152bf.svg
	deleted:    public/assets/fontawesome-webfont-d988fe6e2ae2afab8d546bbe53160345.ttf
	deleted:    public/assets/fontawesome-webfont-e693e832183fd7172896362d05c46a61.svg
	deleted:    public/assets/item-33ad20ac666e431bedf3698ba591a737.jpg
	deleted:    public/assets/item-c51a678b27091e8530f3eae2e4677cd5.jpg
	deleted:    public/assets/logo-66760e676f1b993b209b91cac1d5536e.png
	deleted:    public/assets/logo-fae822c52b286f9776c06549eb86361c.png
	deleted:    public/assets/logo_100-a2b805707958398eaec62361bff3bf32.png
	deleted:    public/assets/logo_100-b45360de6428251e2c5cfc4b4c77b532.png
	deleted:    public/assets/logo_75-c2daedd8800ac88b53228a88ddde5b52.png
	deleted:    public/assets/logo_75-c71aed288c06e6c130c85f046bd5ed19.png
	deleted:    public/assets/logo_75_o-4ac75cf96f82c8f9c43751d8c33c19bd.png
	deleted:    public/assets/logo_75_o-8aeb2671d37737124bfbee1c4dfc9d08.png
	deleted:    public/assets/mac-015552251b797c7a0a3764d13517906b.jpg
	deleted:    public/assets/mac-c4343a12d9d0648da8550f6a2395e1d6.jpg
	deleted:    public/assets/manifest-01cd2b465c3d304889c67a6098cc8f20.json
	deleted:    public/assets/manifest-8e2832a65b59a3e55531a03fcb09092a.json
	deleted:    public/assets/medium/missing-08c2e68d5c2bf4533660efaee6810859.png
	deleted:    public/assets/medium/missing-26a604d9246846c0caa46c04fca0ddfe.png
	deleted:    public/assets/network_monitor-7dbc4380ea4b8355f3586f520ce0f81e.jpg
	deleted:    public/assets/network_monitor-a851f433b04f1fe095fc76a90c44f646.jpg
	deleted:    public/assets/no_image-510bf03128c176cf70b5ccff9e7f2f65.png
	deleted:    public/assets/no_image-94d06f43f74ca60a6f2d2b07b694b3d8.png
	deleted:    public/assets/ny-a5b5685d510d1ed5510987e3294677bc.jpg
	deleted:    public/assets/ny-b6aac041c4f263653f7c00be04478668.jpg
	deleted:    public/assets/old-bg-49fc00f12aface5daa4a02858739846e.jpg
	deleted:    public/assets/old-bg-bd28b887d5f214a40c861128a0cf83db.jpg
	deleted:    public/assets/oldth2-5ab0e49680669b87a401534ec9dd37d4.jpg
	deleted:    public/assets/oldth2-966a6da2905983a3a0bce04bbf08782f.jpg
	deleted:    public/assets/original/missing-486ec32a57edb1bab5ae90f1dcf98efa.png
	deleted:    public/assets/original/missing-8509745261b6f4180ccffb445cad1851.png
	deleted:    public/assets/original/missing-header-1db26a0b2f190c15d08988a1e33d4195.jpg
	deleted:    public/assets/original/missing-header-b9fb3335205ea159e95705352d49628d.jpg
	deleted:    public/assets/p1-982c01ea29eba464cd107bd8aa3c05fd.jpg
	deleted:    public/assets/p1-d4507cdc16b2b131081f8761abf8d12f.jpg
	deleted:    public/assets/p10-ae07ac3c5ca1f0759135c621b879b557.jpg
	deleted:    public/assets/p10-db3f41bae66ac247c237a35e4e1fbbcf.jpg
	deleted:    public/assets/p2-811c641178b89e4396650409dcd6a9ee.jpg
	deleted:    public/assets/p2-d5ede963a4755aec8bfda92a0400464a.jpg
	deleted:    public/assets/p3-6a35d2770404ff5802ee94dc6e53c82d.jpg
	deleted:    public/assets/p3-71fd059dd7c56524703b4a6f18f31bbe.jpg
	deleted:    public/assets/p4-47ff6f3f417db8f14471f85ffb2bff09.jpg
	deleted:    public/assets/p4-73278e8f1a7ad70fc0a1d0fd63459827.jpg
	deleted:    public/assets/p5-b502d9b51c0c6d10f64cb8078d3f92c4.jpg
	deleted:    public/assets/p5-f5df4ab24dee957da5af7c9b5d8da73c.jpg
	deleted:    public/assets/p6-7bd3deeefbfc65376d5dfcbc0a4570ec.jpg
	deleted:    public/assets/p6-8b553469e0a22c18c6c4680a621b7048.jpg
	deleted:    public/assets/p7-f2a5f649bf79fa1213a7e90a1686c07b.jpg
	deleted:    public/assets/p7-f3d45c2325cf0780a19501e7727ba73a.jpg
	deleted:    public/assets/p8-144a07a1372e83979357b8caab0fe97d.jpg
	deleted:    public/assets/p8-5c2beb4338cf6699a58891c89fbb9ad6.jpg
	deleted:    public/assets/p9-86f19ed099b9f76a0f28352080bf2688.jpg
	deleted:    public/assets/p9-e7a54faeb68ea83fb2d10e4fa0c1529e.jpg
	deleted:    public/assets/post-7353be08901b2cff8f4de0936ae06f0f.jpg
	deleted:    public/assets/post-a6286bb323f96a46b7bed0acb9350abb.jpg
	deleted:    public/assets/post2-7c69ccac3b81f8d00b0a4424a1593424.jpg
	deleted:    public/assets/post2-a1235d2760ce3e01939998fa122c9858.jpg
	deleted:    public/assets/post3-907f123279fea85d94d0c92576fd1db1.jpg
	deleted:    public/assets/post3-d6b7687d2fedac4f24ceebce76489ea4.jpg
	deleted:    public/assets/post4-50d329c3324490b6ffb6d66739dcca0c.jpg
	deleted:    public/assets/post4-be756ddc32f071cb3d669badedd693d1.jpg
	deleted:    public/assets/post5-65b803afab877d1e10d266a67670de33.jpg
	deleted:    public/assets/post5-f7354b0fd892f6aa29bb6f988fbe4aef.jpg
	deleted:    public/assets/rb-bdfa6260b53782ef968884c12729e1e2.jpg
	deleted:    public/assets/rb-f1aa27c5930cdd8d054fd3751aca8d5f.jpg
	deleted:    public/assets/software-dev-206c1529681a487d5c99088ca326ddc9.jpg
	deleted:    public/assets/software-dev-49f1073070f6aa80c087931afc554844.jpg
	deleted:    public/assets/t1-67fd5868b7bb3fb86c75b2de758bb477.jpg
	deleted:    public/assets/t1-72147c230f35ea856e1fab1b8a54153e.jpg
	deleted:    public/assets/t2-51a3bbdbe499e31790520efd2bc32757.jpg
	deleted:    public/assets/t2-d9deafaf2694de56ed2f5cfe240f0e33.jpg
	deleted:    public/assets/t3-4518bc3f2a922cdfedfee1c1063def50.jpg
	deleted:    public/assets/t3-f42eba0cb32e1b33320c1342d3a9e503.jpg
	deleted:    public/assets/team-6a96303e1236266bf5e9b45d0c8b1e18.jpg
	deleted:    public/assets/team-9e89ad6849d5faa5a82ff7f701e98670.jpg
	deleted:    public/assets/th1-96639cc86e38a87d07c9c6ab6d156826.jpg
	deleted:    public/assets/th1-a9f639beaa08c8ae33550c3f40aff93b.jpg
	deleted:    public/assets/th2-2361ccd4482e2891710a0ee6a2a91874.jpg
	deleted:    public/assets/th2-c3a8f118ea9aac32ed44910a4a87ded3.jpg
	deleted:    public/assets/th3-673f0010d6b0aae126c9baae90c7b8fc.jpg
	deleted:    public/assets/th3-8687a86b9d99e914fa40e0e9d4581f68.jpg
	deleted:    public/assets/thumb/missing-29f0d2f00846c99dc4d0a070cf587a95.png
	deleted:    public/assets/thumb/missing-3b4fff5fb4d23a32c84ce8bdc694056f.png
	deleted:    public/assets/vista-1c06cd2a208fb48b8d50f0c06bdaccc6.png
	deleted:    public/assets/vista-55802c40703a632f62c97b05882e905f.png
	deleted:    public/assets/w1-7ee87aa9dd343dc94253ec4ebe3b64c5.jpg
	deleted:    public/assets/w1-f193ff6169e6c2972e45f113e4f5ae2b.jpg
	deleted:    public/assets/w2-2ab390d55d98a3873ec4199633577e39.jpg
	deleted:    public/assets/w2-676eec1af4ef5c34101e7c9da62b97f8.jpg
	deleted:    public/assets/w3-bed83afb13f52281aca3fa501791d60c.jpg
	deleted:    public/assets/w3-fbd56cb449dd55a7fcb44d41460e79db.jpg
	deleted:    public/assets/w4-086d841a877c50aa32a752d6265730a3.jpg
	deleted:    public/assets/w4-6e07c6342fae91931035df752539f637.jpg
	app/assets/stylesheets/font-awesome.css.erb