diff --git a/apps/static/css/plugins/chosen/chosen.css b/apps/static/css/plugins/chosen/chosen.css
index a7e9b5e19..e7a5495cd 100755
--- a/apps/static/css/plugins/chosen/chosen.css
+++ b/apps/static/css/plugins/chosen/chosen.css
@@ -1,429 +1,429 @@
-/*!
-Chosen, a Select Box Enhancer for jQuery and Prototype
-by Patrick Filler for Harvest, http://getharvest.com
-
-Version 1.1.0
-Full source at https://github.com/harvesthq/chosen
-Copyright (c) 2011 Harvest http://getharvest.com
-
-MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
-This file is generated by `grunt build`, do not edit it by hand.
-*/
-
-/* @group Base */
-.chosen-container {
-    position: relative;
-    display: inline-block;
-    vertical-align: middle;
-    font-size: 13px;
-    zoom: 1;
-    *display: inline;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    user-select: none;
-}
-.chosen-container .chosen-drop {
-    position: absolute;
-    top: 100%;
-    left: -9999px;
-    z-index: 1010;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    width: 100%;
-    border: 1px solid #aaa;
-    border-top: 0;
-    background: #fff;
-    box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
-}
-.chosen-container.chosen-with-drop .chosen-drop {
-    left: 0;
-}
-.chosen-container a {
-    cursor: pointer;
-}
-
-/* @end */
-/* @group Single Chosen */
-.chosen-container-single .chosen-single {
-    position: relative;
-    display: block;
-    overflow: hidden;
-    padding: 0 0 0 8px;
-    height: 23px;
-    border: 1px solid #aaa;
-    border-radius: 5px;
-    background-color: #fff;
-    background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));
-    background: -webkit-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-    background: -moz-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-    background: -o-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-    background: linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-    background-clip: padding-box;
-    box-shadow: 0 0 3px white inset, 0 1px 1px rgba(0, 0, 0, 0.1);
-    color: #444;
-    text-decoration: none;
-    white-space: nowrap;
-    line-height: 24px;
-}
-.chosen-container-single .chosen-default {
-    color: #999;
-}
-.chosen-container-single .chosen-single span {
-    display: block;
-    overflow: hidden;
-    margin-right: 26px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-.chosen-container-single .chosen-single-with-deselect span {
-    margin-right: 38px;
-}
-.chosen-container-single .chosen-single abbr {
-    position: absolute;
-    top: 6px;
-    right: 26px;
-    display: block;
-    width: 12px;
-    height: 12px;
-    background: url('chosen-sprite.png') -42px 1px no-repeat;
-    font-size: 1px;
-}
-.chosen-container-single .chosen-single abbr:hover {
-    background-position: -42px -10px;
-}
-.chosen-container-single.chosen-disabled .chosen-single abbr:hover {
-    background-position: -42px -10px;
-}
-.chosen-container-single .chosen-single div {
-    position: absolute;
-    top: 0;
-    right: 0;
-    display: block;
-    width: 18px;
-    height: 100%;
-}
-.chosen-container-single .chosen-single div b {
-    display: block;
-    width: 100%;
-    height: 100%;
-    background: url('chosen-sprite.png') no-repeat 0px 2px;
-}
-.chosen-container-single .chosen-search {
-    position: relative;
-    z-index: 1010;
-    margin: 0;
-    padding: 3px 4px;
-    white-space: nowrap;
-}
-.chosen-container-single .chosen-search input[type="text"] {
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    margin: 1px 0;
-    padding: 4px 20px 4px 5px;
-    width: 100%;
-    height: auto;
-    outline: 0;
-    border: 1px solid #aaa;
-    background: white url('chosen-sprite.png') no-repeat 100% -20px;
-    background: url('chosen-sprite.png') no-repeat 100% -20px;
-    font-size: 1em;
-    font-family: sans-serif;
-    line-height: normal;
-    border-radius: 0;
-}
-.chosen-container-single .chosen-drop {
-    margin-top: -1px;
-    border-radius: 0 0 4px 4px;
-    background-clip: padding-box;
-}
-.chosen-container-single.chosen-container-single-nosearch .chosen-search {
-    position: absolute;
-    left: -9999px;
-}
-
-/* @end */
-/* @group Results */
-.chosen-container .chosen-results {
-    position: relative;
-    overflow-x: hidden;
-    overflow-y: auto;
-    margin: 0 4px 4px 0;
-    padding: 0 0 0 4px;
-    max-height: 240px;
-    -webkit-overflow-scrolling: touch;
-}
-.chosen-container .chosen-results li {
-    display: none;
-    margin: 0;
-    padding: 5px 6px;
-    list-style: none;
-    line-height: 15px;
-    -webkit-touch-callout: none;
-}
-.chosen-container .chosen-results li.active-result {
-    display: list-item;
-    cursor: pointer;
-}
-.chosen-container .chosen-results li.disabled-result {
-    display: list-item;
-    color: #ccc;
-    cursor: default;
-}
-.chosen-container .chosen-results li.highlighted {
-    background-color: #3875d7;
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc));
-    background-image: -webkit-linear-gradient(#3875d7 20%, #2a62bc 90%);
-    background-image: -moz-linear-gradient(#3875d7 20%, #2a62bc 90%);
-    background-image: -o-linear-gradient(#3875d7 20%, #2a62bc 90%);
-    background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
-    color: #fff;
-}
-.chosen-container .chosen-results li.no-results {
-    display: list-item;
-    background: #f4f4f4;
-}
-.chosen-container .chosen-results li.group-result {
-    display: list-item;
-    font-weight: bold;
-    cursor: default;
-}
-.chosen-container .chosen-results li.group-option {
-    padding-left: 15px;
-}
-.chosen-container .chosen-results li em {
-    font-style: normal;
-    text-decoration: underline;
-}
-
-/* @end */
-/* @group Multi Chosen */
-.chosen-container-multi .chosen-choices {
-    -moz-box-sizing: border-box;
-    background-color: #FFFFFF;
-    border: 1px solid #CBD5DD;
-    border-radius: 2px;
-    cursor: text;
-    height: auto !important;
-    margin: 0;
-    min-height: 30px;
-    overflow: hidden;
-    padding: 2px;
-    position: relative;
-    width: 100%;
-}
-.chosen-container-multi .chosen-choices li {
-    float: left;
-    list-style: none;
-}
-.chosen-container-multi .chosen-choices li.search-field {
-    margin: 0;
-    padding: 0;
-    white-space: nowrap;
-}
-.chosen-container-multi .chosen-choices li.search-field input[type="text"] {
-    margin: 1px 0;
-    padding: 5px;
-    height: 25px;
-    outline: 0;
-    border: 0 !important;
-    background: transparent !important;
-    box-shadow: none;
-    color: #666;
-    font-size: 100%;
-    font-family: sans-serif;
-    line-height: normal;
-    border-radius: 0;
-}
-.chosen-container-multi .chosen-choices li.search-field .default {
-    color: #999;
-}
-.chosen-container-multi .chosen-choices li.search-choice {
-    position: relative;
-    margin: 3px 0 3px 5px;
-    padding: 3px 20px 3px 5px;
-    border: 1px solid #aaa;
-    border-radius: 3px;
-    background-color: #e4e4e4;
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
-    background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    background-clip: padding-box;
-    box-shadow: 0 0 2px white inset, 0 1px 0 rgba(0, 0, 0, 0.05);
-    color: #333;
-    line-height: 13px;
-    cursor: default;
-}
-.chosen-container-multi .chosen-choices li.search-choice .search-choice-close {
-    position: absolute;
-    top: 4px;
-    right: 3px;
-    display: block;
-    width: 12px;
-    height: 12px;
-    background: url('chosen-sprite.png') -42px 1px no-repeat;
-    font-size: 1px;
-}
-.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover {
-    background-position: -42px -10px;
-}
-.chosen-container-multi .chosen-choices li.search-choice-disabled {
-    padding-right: 5px;
-    border: 1px solid #ccc;
-    background-color: #e4e4e4;
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
-    background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    color: #666;
-}
-.chosen-container-multi .chosen-choices li.search-choice-focus {
-    background: #d4d4d4;
-}
-.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close {
-    background-position: -42px -10px;
-}
-.chosen-container-multi .chosen-results {
-    margin: 0;
-    padding: 0;
-}
-.chosen-container-multi .chosen-drop .result-selected {
-    display: list-item;
-    color: #ccc;
-    cursor: default;
-}
-
-/* @end */
-/* @group Active  */
-.chosen-container-active .chosen-single {
-    border: 1px solid #5897fb;
-    box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-}
-.chosen-container-active.chosen-with-drop .chosen-single {
-    border: 1px solid #aaa;
-    -moz-border-radius-bottomright: 0;
-    border-bottom-right-radius: 0;
-    -moz-border-radius-bottomleft: 0;
-    border-bottom-left-radius: 0;
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #eeeeee), color-stop(80%, #ffffff));
-    background-image: -webkit-linear-gradient(#eeeeee 20%, #ffffff 80%);
-    background-image: -moz-linear-gradient(#eeeeee 20%, #ffffff 80%);
-    background-image: -o-linear-gradient(#eeeeee 20%, #ffffff 80%);
-    background-image: linear-gradient(#eeeeee 20%, #ffffff 80%);
-    box-shadow: 0 1px 0 #fff inset;
-}
-.chosen-container-active.chosen-with-drop .chosen-single div {
-    border-left: none;
-    background: transparent;
-}
-.chosen-container-active.chosen-with-drop .chosen-single div b {
-    background-position: -18px 2px;
-}
-.chosen-container-active .chosen-choices {
-    border: 1px solid #5897fb;
-    box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-}
-.chosen-container-active .chosen-choices li.search-field input[type="text"] {
-    color: #111 !important;
-}
-
-/* @end */
-/* @group Disabled Support */
-.chosen-disabled {
-    opacity: 0.5 !important;
-    cursor: default;
-}
-.chosen-disabled .chosen-single {
-    cursor: default;
-}
-.chosen-disabled .chosen-choices .search-choice .search-choice-close {
-    cursor: default;
-}
-
-/* @end */
-/* @group Right to Left */
-.chosen-rtl {
-    text-align: right;
-}
-.chosen-rtl .chosen-single {
-    overflow: visible;
-    padding: 0 8px 0 0;
-}
-.chosen-rtl .chosen-single span {
-    margin-right: 0;
-    margin-left: 26px;
-    direction: rtl;
-}
-.chosen-rtl .chosen-single-with-deselect span {
-    margin-left: 38px;
-}
-.chosen-rtl .chosen-single div {
-    right: auto;
-    left: 3px;
-}
-.chosen-rtl .chosen-single abbr {
-    right: auto;
-    left: 26px;
-}
-.chosen-rtl .chosen-choices li {
-    float: right;
-}
-.chosen-rtl .chosen-choices li.search-field input[type="text"] {
-    direction: rtl;
-}
-.chosen-rtl .chosen-choices li.search-choice {
-    margin: 3px 5px 3px 0;
-    padding: 3px 5px 3px 19px;
-}
-.chosen-rtl .chosen-choices li.search-choice .search-choice-close {
-    right: auto;
-    left: 4px;
-}
-.chosen-rtl.chosen-container-single-nosearch .chosen-search,
-.chosen-rtl .chosen-drop {
-    left: 9999px;
-}
-.chosen-rtl.chosen-container-single .chosen-results {
-    margin: 0 0 4px 4px;
-    padding: 0 4px 0 0;
-}
-.chosen-rtl .chosen-results li.group-option {
-    padding-right: 15px;
-    padding-left: 0;
-}
-.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div {
-    border-right: none;
-}
-.chosen-rtl .chosen-search input[type="text"] {
-    padding: 4px 5px 4px 20px;
-    background: white url('chosen-sprite.png') no-repeat -30px -20px;
-    background: url('chosen-sprite.png') no-repeat -30px -20px;
-    direction: rtl;
-}
-.chosen-rtl.chosen-container-single .chosen-single div b {
-    background-position: 6px 2px;
-}
-.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b {
-    background-position: -12px 2px;
-}
-
-/* @end */
-/* @group Retina compatibility */
-@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) {
-    .chosen-rtl .chosen-search input[type="text"],
-    .chosen-container-single .chosen-single abbr,
-    .chosen-container-single .chosen-single div b,
-    .chosen-container-single .chosen-search input[type="text"],
-    .chosen-container-multi .chosen-choices .search-choice .search-choice-close,
-    .chosen-container .chosen-results-scroll-down span,
-    .chosen-container .chosen-results-scroll-up span {
-        background-image: url('chosen-sprite@2x.png') !important;
-        background-size: 52px 37px !important;
-        background-repeat: no-repeat !important;
-    }
-}
-/* @end */
+/*!
+Chosen, a Select Box Enhancer for jQuery and Prototype
+by Patrick Filler for Harvest, http://getharvest.com
+
+Version 1.1.0
+Full source at https://github.com/harvesthq/chosen
+Copyright (c) 2011 Harvest http://getharvest.com
+
+MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
+This file is generated by `grunt build`, do not edit it by hand.
+*/
+
+/* @group Base */
+.chosen-container {
+    position: relative;
+    display: inline-block;
+    vertical-align: middle;
+    font-size: 13px;
+    zoom: 1;
+    *display: inline;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    user-select: none;
+}
+.chosen-container .chosen-drop {
+    position: absolute;
+    top: 100%;
+    left: -9999px;
+    z-index: 1010;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    width: 100%;
+    border: 1px solid #aaa;
+    border-top: 0;
+    background: #fff;
+    box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
+}
+.chosen-container.chosen-with-drop .chosen-drop {
+    left: 0;
+}
+.chosen-container a {
+    cursor: pointer;
+}
+
+/* @end */
+/* @group Single Chosen */
+.chosen-container-single .chosen-single {
+    position: relative;
+    display: block;
+    overflow: hidden;
+    padding: 0 0 0 8px;
+    height: 23px;
+    border: 1px solid #aaa;
+    border-radius: 5px;
+    background-color: #fff;
+    background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));
+    background: -webkit-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+    background: -moz-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+    background: -o-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+    background: linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+    background-clip: padding-box;
+    box-shadow: 0 0 3px white inset, 0 1px 1px rgba(0, 0, 0, 0.1);
+    color: #444;
+    text-decoration: none;
+    white-space: nowrap;
+    line-height: 24px;
+}
+.chosen-container-single .chosen-default {
+    color: #999;
+}
+.chosen-container-single .chosen-single span {
+    display: block;
+    overflow: hidden;
+    margin-right: 26px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+.chosen-container-single .chosen-single-with-deselect span {
+    margin-right: 38px;
+}
+.chosen-container-single .chosen-single abbr {
+    position: absolute;
+    top: 6px;
+    right: 26px;
+    display: block;
+    width: 12px;
+    height: 12px;
+    background: url('chosen-sprite.png') -42px 1px no-repeat;
+    font-size: 1px;
+}
+.chosen-container-single .chosen-single abbr:hover {
+    background-position: -42px -10px;
+}
+.chosen-container-single.chosen-disabled .chosen-single abbr:hover {
+    background-position: -42px -10px;
+}
+.chosen-container-single .chosen-single div {
+    position: absolute;
+    top: 0;
+    right: 0;
+    display: block;
+    width: 18px;
+    height: 100%;
+}
+.chosen-container-single .chosen-single div b {
+    display: block;
+    width: 100%;
+    height: 100%;
+    background: url('chosen-sprite.png') no-repeat 0px 2px;
+}
+.chosen-container-single .chosen-search {
+    position: relative;
+    z-index: 1010;
+    margin: 0;
+    padding: 3px 4px;
+    white-space: nowrap;
+}
+.chosen-container-single .chosen-search input[type="text"] {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    margin: 1px 0;
+    padding: 4px 20px 4px 5px;
+    width: 100%;
+    height: auto;
+    outline: 0;
+    border: 1px solid #aaa;
+    background: white url('chosen-sprite.png') no-repeat 100% -20px;
+    background: url('chosen-sprite.png') no-repeat 100% -20px;
+    font-size: 1em;
+    font-family: sans-serif;
+    line-height: normal;
+    border-radius: 0;
+}
+.chosen-container-single .chosen-drop {
+    margin-top: -1px;
+    border-radius: 0 0 4px 4px;
+    background-clip: padding-box;
+}
+.chosen-container-single.chosen-container-single-nosearch .chosen-search {
+    position: absolute;
+    left: -9999px;
+}
+
+/* @end */
+/* @group Results */
+.chosen-container .chosen-results {
+    position: relative;
+    overflow-x: hidden;
+    overflow-y: auto;
+    margin: 0 4px 4px 0;
+    padding: 0 0 0 4px;
+    max-height: 240px;
+    -webkit-overflow-scrolling: touch;
+}
+.chosen-container .chosen-results li {
+    display: none;
+    margin: 0;
+    padding: 5px 6px;
+    list-style: none;
+    line-height: 15px;
+    -webkit-touch-callout: none;
+}
+.chosen-container .chosen-results li.active-result {
+    display: list-item;
+    cursor: pointer;
+}
+.chosen-container .chosen-results li.disabled-result {
+    display: list-item;
+    color: #ccc;
+    cursor: default;
+}
+.chosen-container .chosen-results li.highlighted {
+    background-color: #3875d7;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc));
+    background-image: -webkit-linear-gradient(#3875d7 20%, #2a62bc 90%);
+    background-image: -moz-linear-gradient(#3875d7 20%, #2a62bc 90%);
+    background-image: -o-linear-gradient(#3875d7 20%, #2a62bc 90%);
+    background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
+    color: #fff;
+}
+.chosen-container .chosen-results li.no-results {
+    display: list-item;
+    background: #f4f4f4;
+}
+.chosen-container .chosen-results li.group-result {
+    display: list-item;
+    font-weight: bold;
+    cursor: default;
+}
+.chosen-container .chosen-results li.group-option {
+    padding-left: 15px;
+}
+.chosen-container .chosen-results li em {
+    font-style: normal;
+    text-decoration: underline;
+}
+
+/* @end */
+/* @group Multi Chosen */
+.chosen-container-multi .chosen-choices {
+    -moz-box-sizing: border-box;
+    background-color: #FFFFFF;
+    border: 1px solid #CBD5DD;
+    border-radius: 2px;
+    cursor: text;
+    height: auto !important;
+    margin: 0;
+    min-height: 30px;
+    overflow: hidden;
+    padding: 2px;
+    position: relative;
+    width: 100%;
+}
+.chosen-container-multi .chosen-choices li {
+    float: left;
+    list-style: none;
+}
+.chosen-container-multi .chosen-choices li.search-field {
+    margin: 0;
+    padding: 0;
+    white-space: nowrap;
+}
+.chosen-container-multi .chosen-choices li.search-field input[type="text"] {
+    margin: 1px 0;
+    padding: 5px;
+    height: 25px;
+    outline: 0;
+    border: 0 !important;
+    background: transparent !important;
+    box-shadow: none;
+    color: #666;
+    font-size: 100%;
+    font-family: sans-serif;
+    line-height: normal;
+    border-radius: 0;
+}
+.chosen-container-multi .chosen-choices li.search-field .default {
+    color: #999;
+}
+.chosen-container-multi .chosen-choices li.search-choice {
+    position: relative;
+    margin: 3px 0 3px 5px;
+    padding: 3px 20px 3px 5px;
+    border: 1px solid #aaa;
+    border-radius: 3px;
+    background-color: #e4e4e4;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+    background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-clip: padding-box;
+    box-shadow: 0 0 2px white inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+    color: #333;
+    line-height: 13px;
+    cursor: default;
+}
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close {
+    position: absolute;
+    top: 4px;
+    right: 3px;
+    display: block;
+    width: 12px;
+    height: 12px;
+    background: url('chosen-sprite.png') -42px 1px no-repeat;
+    font-size: 1px;
+}
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover {
+    background-position: -42px -10px;
+}
+.chosen-container-multi .chosen-choices li.search-choice-disabled {
+    padding-right: 5px;
+    border: 1px solid #ccc;
+    background-color: #e4e4e4;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+    background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+    color: #666;
+}
+.chosen-container-multi .chosen-choices li.search-choice-focus {
+    background: #d4d4d4;
+}
+.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close {
+    background-position: -42px -10px;
+}
+.chosen-container-multi .chosen-results {
+    margin: 0;
+    padding: 0;
+}
+.chosen-container-multi .chosen-drop .result-selected {
+    display: list-item;
+    color: #ccc;
+    cursor: default;
+}
+
+/* @end */
+/* @group Active  */
+.chosen-container-active .chosen-single {
+    border: 1px solid #5897fb;
+    box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+}
+.chosen-container-active.chosen-with-drop .chosen-single {
+    border: 1px solid #aaa;
+    -moz-border-radius-bottomright: 0;
+    border-bottom-right-radius: 0;
+    -moz-border-radius-bottomleft: 0;
+    border-bottom-left-radius: 0;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #eeeeee), color-stop(80%, #ffffff));
+    background-image: -webkit-linear-gradient(#eeeeee 20%, #ffffff 80%);
+    background-image: -moz-linear-gradient(#eeeeee 20%, #ffffff 80%);
+    background-image: -o-linear-gradient(#eeeeee 20%, #ffffff 80%);
+    background-image: linear-gradient(#eeeeee 20%, #ffffff 80%);
+    box-shadow: 0 1px 0 #fff inset;
+}
+.chosen-container-active.chosen-with-drop .chosen-single div {
+    border-left: none;
+    background: transparent;
+}
+.chosen-container-active.chosen-with-drop .chosen-single div b {
+    background-position: -18px 2px;
+}
+.chosen-container-active .chosen-choices {
+    border: 1px solid #5897fb;
+    box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+}
+.chosen-container-active .chosen-choices li.search-field input[type="text"] {
+    color: #111 !important;
+}
+
+/* @end */
+/* @group Disabled Support */
+.chosen-disabled {
+    opacity: 0.5 !important;
+    cursor: default;
+}
+.chosen-disabled .chosen-single {
+    cursor: default;
+}
+.chosen-disabled .chosen-choices .search-choice .search-choice-close {
+    cursor: default;
+}
+
+/* @end */
+/* @group Right to Left */
+.chosen-rtl {
+    text-align: right;
+}
+.chosen-rtl .chosen-single {
+    overflow: visible;
+    padding: 0 8px 0 0;
+}
+.chosen-rtl .chosen-single span {
+    margin-right: 0;
+    margin-left: 26px;
+    direction: rtl;
+}
+.chosen-rtl .chosen-single-with-deselect span {
+    margin-left: 38px;
+}
+.chosen-rtl .chosen-single div {
+    right: auto;
+    left: 3px;
+}
+.chosen-rtl .chosen-single abbr {
+    right: auto;
+    left: 26px;
+}
+.chosen-rtl .chosen-choices li {
+    float: right;
+}
+.chosen-rtl .chosen-choices li.search-field input[type="text"] {
+    direction: rtl;
+}
+.chosen-rtl .chosen-choices li.search-choice {
+    margin: 3px 5px 3px 0;
+    padding: 3px 5px 3px 19px;
+}
+.chosen-rtl .chosen-choices li.search-choice .search-choice-close {
+    right: auto;
+    left: 4px;
+}
+.chosen-rtl.chosen-container-single-nosearch .chosen-search,
+.chosen-rtl .chosen-drop {
+    left: 9999px;
+}
+.chosen-rtl.chosen-container-single .chosen-results {
+    margin: 0 0 4px 4px;
+    padding: 0 4px 0 0;
+}
+.chosen-rtl .chosen-results li.group-option {
+    padding-right: 15px;
+    padding-left: 0;
+}
+.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div {
+    border-right: none;
+}
+.chosen-rtl .chosen-search input[type="text"] {
+    padding: 4px 5px 4px 20px;
+    background: white url('chosen-sprite.png') no-repeat -30px -20px;
+    background: url('chosen-sprite.png') no-repeat -30px -20px;
+    direction: rtl;
+}
+.chosen-rtl.chosen-container-single .chosen-single div b {
+    background-position: 6px 2px;
+}
+.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b {
+    background-position: -12px 2px;
+}
+
+/* @end */
+/* @group Retina compatibility */
+@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) {
+    .chosen-rtl .chosen-search input[type="text"],
+    .chosen-container-single .chosen-single abbr,
+    .chosen-container-single .chosen-single div b,
+    .chosen-container-single .chosen-search input[type="text"],
+    .chosen-container-multi .chosen-choices .search-choice .search-choice-close,
+    .chosen-container .chosen-results-scroll-down span,
+    .chosen-container .chosen-results-scroll-up span {
+        background-image: url('chosen-sprite@2x.png') !important;
+        background-size: 52px 37px !important;
+        background-repeat: no-repeat !important;
+    }
+}
+/* @end */
diff --git a/apps/static/css/style.css b/apps/static/css/style.css
index 0d3adb5d5..015805a87 100644
--- a/apps/static/css/style.css
+++ b/apps/static/css/style.css
@@ -4600,4 +4600,6 @@ body.skin-3 {
   border-width: 1px
 }
 
-
+th a {
+  color: #676a6c;
+}
diff --git a/apps/templates/_nav.html b/apps/templates/_nav.html
index 41a81b173..0aea5acfa 100644
--- a/apps/templates/_nav.html
+++ b/apps/templates/_nav.html
@@ -9,7 +9,7 @@
     </a>
     <ul class="nav nav-second-level">
         <li class="group"><a href="{% url 'users:user-list' %}">用户列表</a></li>
-        <li class="user"><a href="#">用户组列表</a></li>
+        <li class="user"><a href="{% url 'users:usergroup-list' %}">用户组列表</a></li>
     </ul>
 </li>
 <li id="">
diff --git a/apps/users/forms.py b/apps/users/forms.py
index 01521980c..85bfdd0b5 100644
--- a/apps/users/forms.py
+++ b/apps/users/forms.py
@@ -26,3 +26,10 @@ class UserUpdateForm(ModelForm):
             'phone', 'enable_2FA', 'role', 'date_expired', 'comment',
         ]
 
+
+class UserGroupForm(ModelForm):
+    class Meta:
+        model = UserGroup
+        fields = [
+            'name', 'comment',
+        ]
diff --git a/apps/users/models.py b/apps/users/models.py
index 089fde22b..0da7da312 100644
--- a/apps/users/models.py
+++ b/apps/users/models.py
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 import datetime
-
+from django.utils import timezone
 from django.db import models
 from django.contrib.auth.models import AbstractUser, Permission
 from django.contrib.auth.models import Group as AbstractGroup
@@ -55,6 +55,24 @@ class UserGroup(models.Model):
             group = cls(name='所有人', comment='所有人默认都在用户组', created_by='System')
             group.save()
 
+    @classmethod
+    def generate_fake(cls, count=100):
+        from random import seed, randint, choice
+        import forgery_py
+        from django.db import IntegrityError
+
+        seed()
+        for i in range(count):
+            group = cls(name=forgery_py.name.full_name(),
+                        comment=forgery_py.lorem_ipsum.sentence(),
+                        created_by=choice(User.objects.all()).username
+                    )
+            try:
+                group.save()
+            except IntegrityError:
+                print('Error continue')
+                continue
+
 
 class User(AbstractUser):
     username = models.CharField(max_length=20, unique=True, verbose_name='用户名', help_text='* required')
@@ -71,7 +89,37 @@ class User(AbstractUser):
     public_key = models.CharField(max_length=1000, blank=True, verbose_name='公钥')
     comment = models.TextField(max_length=200, blank=True, verbose_name='描述')
     created_by = models.CharField(max_length=30, default='')
-    date_expired = models.DateTimeField(default=datetime.datetime.max, verbose_name='有效期')
+    date_expired = models.DateTimeField(default=timezone.now()+timezone.timedelta(days=365*70), verbose_name='有效期')
 
     class Meta:
         db_table = 'user'
+
+    @classmethod
+    def generate_fake(cls, count=100):
+        from random import seed, randint, choice
+        import forgery_py
+        from django.contrib.auth.hashers import make_password
+        from django.db import IntegrityError
+
+        seed()
+        for i in range(count):
+            user = cls(username=forgery_py.internet.user_name(True),
+                       email=forgery_py.internet.email_address(),
+                       name=forgery_py.name.full_name(),
+                       password=make_password(forgery_py.lorem_ipsum.word()),
+                       role=choice(Role.objects.all()),
+                       wechat=forgery_py.internet.user_name(True),
+                       comment=forgery_py.lorem_ipsum.sentence(),
+                       created_by=choice(cls.objects.all()).username,
+                    )
+            try:
+                user.save()
+            except IntegrityError:
+                print('Error continue')
+                continue
+            user.groups.add(choice(UserGroup.objects.all()))
+            user.save()
+
+
+
+
diff --git a/apps/users/templates/users/usergroup_add.html b/apps/users/templates/users/usergroup_add.html
new file mode 100644
index 000000000..ca60cfe91
--- /dev/null
+++ b/apps/users/templates/users/usergroup_add.html
@@ -0,0 +1,75 @@
+{% extends 'base.html' %}
+{% load static %}
+{% load bootstrap %}
+{% block custom_head_css_js %}
+    <link href="{% static "css/plugins/chosen/chosen.css" %}" rel="stylesheet">
+    <script src="{% static "js/plugins/chosen/chosen.jquery.min.js" %}"></script>
+{% endblock %}
+
+{% block content %}
+    <div class="wrapper wrapper-content animated fadeInRight">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="ibox float-e-margins">
+                    <div class="ibox-title">
+                        <h5>填写用户组信息</h5>
+                        <div class="ibox-tools">
+                            <a class="collapse-link">
+                                <i class="fa fa-chevron-up"></i>
+                            </a>
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                                <i class="fa fa-wrench"></i>
+                            </a>
+                            <a class="close-link">
+                                <i class="fa fa-times"></i>
+                            </a>
+                        </div>
+                    </div>
+                    <div class="ibox-content">
+                        <form method="post" id="userForm" class="form-horizontal" action="" >
+                            {% csrf_token %}
+                            {{ form.name|bootstrap_horizontal }}
+
+                            <div class="form-group">
+                                <label for="users" class="col-sm-2 control-label">用户</label>
+                                <div class="col-sm-8">
+                                    <select name="users" id="users" data-placeholder="选择用户" class="chosen-select form-control m-b" multiple  tabindex="2">
+                                        {% for user in users %}
+                                            <option value="{{ user.id }}">{{ user.name }}</option>
+                                        {% endfor %}
+                                    </select>
+                                    <span class="help-block m-b-none">用户和用户组必选一个</span>
+                                </div>
+                            </div>
+
+                            {{ form.comment|bootstrap_horizontal }}
+
+                            <div class="form-group">
+                                <div class="col-sm-4 col-sm-offset-2">
+                                    <button class="btn btn-white" type="reset">取消</button>
+                                    <button id="submit_button" class="btn btn-primary" type="submit">确认保存</button>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+{% block custom_foot_js %}
+    <script>
+        $(document).ready(function () {
+            var config = {
+                '.chosen-select'           : {},
+                '.chosen-select-deselect'  : {allow_single_deselect:true},
+                '.chosen-select-no-single' : {disable_search_threshold:10},
+                '.chosen-select-no-results': {no_results_text:'Oops, nothing found!'},
+                '.chosen-select-width'     : {width:"95%"}
+            };
+            for (var selector in config) {
+                $(selector).chosen(config[selector]);
+            }
+        })
+    </script>
+{% endblock %}
\ No newline at end of file
diff --git a/apps/users/templates/users/usergroup_list.html b/apps/users/templates/users/usergroup_list.html
new file mode 100644
index 000000000..ab488d4cb
--- /dev/null
+++ b/apps/users/templates/users/usergroup_list.html
@@ -0,0 +1,81 @@
+{% extends 'base.html' %}
+{% load common_tags %}
+{% block content %}
+<div class="wrapper wrapper-content animated fadeInRight">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-title">
+                    <h5> 查看用户组 </h5>
+                    <div class="ibox-tools">
+                        <a class="collapise-link">
+                            <i class="fa fa-chevron-up"></i>
+                        </a>
+                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                            <i class="fa fa-wrench"></i>
+                        </a>
+                        <a class="close-link">
+                            <i class="fa fa-times"></i>
+                        </a>
+                    </div>
+                </div>
+
+                <div class="ibox-content">
+                    <div class="">
+                        <a href="{% url 'users:usergroup-add' %}" class="btn btn-sm btn-primary "> 添加用户组 </a>
+                        <a id="del_btn" class="btn btn-sm btn-danger "> 删除所选 </a>
+                        <form id="search_form" method="get" action="{% url 'users:user-list' %}" class="pull-right mail-search">
+                            <div class="input-group">
+                                <input type="text" class="form-control input-sm" name="keyword" placeholder="名称" value="{{ keyword }}">
+                                <div class="input-group-btn">
+                                    <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
+                                        搜索
+                                    </button>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+
+                    <table class="table table-striped table-bordered table-hover " id="editable" >
+                        <thead>
+                            <tr>
+                                <th class="text-center">
+                                    <input type="checkbox" id="check_all" onclick="checkAll('check_all', 'checked')">
+                                </th>
+                                <th class="text-center"><a href="{% url 'users:usergroup-list' %}?sort=name">名称</a></th>
+                                <th class="text-center">用户数量</th>
+                                <th class="text-center">资产数量</th>
+                                <th class="text-center">描述</th>
+                                <th class="text-center"></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        {% for usergroup in usergroup_list %}
+                            <tr class="gradeX">
+                                <td class="text-center">
+                                    <input type="checkbox" name="checked" value="{{ usergroup.id }}">
+                                </td>
+                                <td class="text-center">
+                                    <a href="{% url 'users:usergroup-detail' pk=usergroup.id %}">
+                                        {{ usergroup.name }}
+                                    </a>
+                                </td>
+                                <td class="text-center">{{ usergroup.user_set.all|length }}</td>
+                                <td class="text-center">数量</td>
+                                <th class="text-center">{{ usergroup.comment|truncatewords:8 }}</th>
+                                <td class="text-center">
+                                    <a href="{% url 'users:usergroup-edit' pk=usergroup.id %}?id={{ user.id }}" class="btn btn-xs btn-info">编辑</a>
+                                    <a href="{% url 'users:usergroup-delete' pk=usergroup.id %}?id={{ user.id }}" class="btn btn-xs btn-danger del">删除</a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                    {% include '_pagination.html' %}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{% endblock %}
diff --git a/apps/users/urls.py b/apps/users/urls.py
index 333703451..0993d6fe4 100644
--- a/apps/users/urls.py
+++ b/apps/users/urls.py
@@ -1,13 +1,19 @@
 from django.conf.urls import url
 
 from .views import UserListView, UserAddView, UserUpdateView, UserDeleteView, UserDetailView
+from .views import UserGroupListView, UserGroupAddView, UserGroupUpdateView, UserGroupDeleteView, UserGroupDetailView
 
 app_name = 'users'
 
 urlpatterns = [
-    url(r'^$', UserListView.as_view(), name='user-list'),
-    url(r'^(?P<pk>[0-9]+)/$', UserDetailView.as_view(), name='user-detail'),
-    url(r'^add/$', UserAddView.as_view(), name='user-add'),
-    url(r'^(?P<pk>[0-9]+)/edit/$', UserUpdateView.as_view(), name='user-edit'),
-    url(r'^(?P<pk>[0-9]+)/delete/$', UserDeleteView.as_view(), name='user-delete'),
+    url(r'^user/$', UserListView.as_view(), name='user-list'),
+    url(r'^user/(?P<pk>[0-9]+)/$', UserDetailView.as_view(), name='user-detail'),
+    url(r'^user/add/$', UserAddView.as_view(), name='user-add'),
+    url(r'^user/(?P<pk>[0-9]+)/edit/$', UserUpdateView.as_view(), name='user-edit'),
+    url(r'^user/(?P<pk>[0-9]+)/delete/$', UserDeleteView.as_view(), name='user-delete'),
+    url(r'^usergroup/$', UserGroupListView.as_view(), name='usergroup-list'),
+    url(r'^usergroup/(?P<pk>[0-9]+)/$', UserGroupDetailView.as_view(), name='usergroup-detail'),
+    url(r'^usergroup/add/$', UserGroupAddView.as_view(), name='usergroup-add'),
+    url(r'^usergroup/(?P<pk>[0-9]+)/edit/$', UserGroupUpdateView.as_view(), name='usergroup-edit'),
+    url(r'^usergroup/(?P<pk>[0-9]+)/delete/$', UserGroupDeleteView.as_view(), name='usergroup-delete'),
 ]
diff --git a/apps/users/views.py b/apps/users/views.py
index 32143395d..f2a16ef4b 100644
--- a/apps/users/views.py
+++ b/apps/users/views.py
@@ -1,5 +1,6 @@
 # ~*~ coding: utf-8 ~*~
 
+from django.shortcuts import get_object_or_404
 from django.urls import reverse_lazy
 from django.db.models import Q
 from django.views.generic.list import ListView
@@ -7,7 +8,7 @@ from django.views.generic.edit import CreateView, DeleteView, UpdateView
 from django.views.generic.detail import DetailView
 
 from .models import User, UserGroup, Role
-from .forms import UserAddForm, UserUpdateForm
+from .forms import UserAddForm, UserUpdateForm, UserGroupForm
 
 
 class UserListView(ListView):
@@ -71,12 +72,6 @@ class UserUpdateView(UpdateView):
             user.set_password(password)
         return super(UserUpdateView, self).form_valid(form)
 
-    def form_invalid(self, form):
-        print(self.request.FILES)
-        print(form['avatar'].value())
-        print(form.errors)
-        return super(UserUpdateView, self).form_invalid(form)
-
 
 class UserDeleteView(DeleteView):
     model = User
@@ -94,3 +89,61 @@ class UserDetailView(DetailView):
         groups = [group for group in UserGroup.objects.iterator() if group not in self.object.groups.iterator()]
         context.update({'path1': '用户管理', 'path2': '用户详情', 'title': '用户详情', 'groups': groups})
         return context
+
+
+class UserGroupListView(ListView):
+    model = UserGroup
+    paginate_by = 20
+    context_object_name = 'usergroup_list'
+    template_name = 'users/usergroup_list.html'
+    ordering = '-date_added'
+
+    def get_queryset(self):
+        self.queryset = super(UserGroupListView, self).get_queryset()
+        self.keyword = keyword = self.request.GET.get('keyword', '')
+        self.sort = sort = self.request.GET.get('sort')
+        if keyword:
+            self.queryset = self.queryset.filter(name__icontains=keyword)
+
+        if sort:
+            self.queryset = self.queryset.order_by(sort)
+        return self.queryset
+
+    def get_context_data(self, **kwargs):
+        context = super(UserGroupListView, self).get_context_data(**kwargs)
+        context.update({'path1': '用户管理', 'path2': '用户组列表', 'title': '用户组列表', 'keyword': self.keyword})
+        return context
+
+
+class UserGroupAddView(CreateView):
+    model = UserGroup
+    form_class = UserGroupForm
+    template_name = 'users/usergroup_add.html'
+    success_url = reverse_lazy('users:usergroup-list')
+
+    def get_context_data(self, **kwargs):
+        context = super(UserGroupAddView, self).get_context_data(**kwargs)
+        users = User.objects.all()
+        context.update({'path1': '用户管理', 'path2': '用户组添加', 'title': '用户组添加', 'users': users})
+        return context
+
+    def form_valid(self, form):
+        usergroup = form.save()
+        users_id_list = self.request.POST.getlist('users', [])
+        users = [get_object_or_404(User, id=user_id) for user_id in users_id_list]
+        usergroup.created_by = self.request.user.username or 'Admin'
+        usergroup.user_set.add(*tuple(users))
+        usergroup.save()
+        return super(UserGroupAddView, self).form_valid(form)
+
+
+class UserGroupUpdateView(UpdateView):
+    pass
+
+
+class UserGroupDetailView(DetailView):
+    pass
+
+
+class UserGroupDeleteView(DeleteView):
+    pass