From a741e2512b1d830d506fee1575b6b64ee33c8073 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@MacBook-Pro-de-Nicolas-2.local>
Date: Tue, 9 Dec 2014 00:24:43 +0100
Subject: [PATCH] site progressif

---
 app/assets/images/admin/default_image.png     |  Bin 6483 -> 28345 bytes
 app/assets/javascripts/admin.coffee           |  411 +
 app/assets/javascripts/admin.js               |   34 -
 app/assets/javascripts/admin/redactor.js      | 4210 ---------
 app/assets/javascripts/bootstrap.js           |   13 +
 app/assets/javascripts/bootstrap/affix.js     |  137 +
 app/assets/javascripts/bootstrap/alert.js     |   88 +
 app/assets/javascripts/bootstrap/button.js    |  107 +
 app/assets/javascripts/bootstrap/carousel.js  |  205 +
 app/assets/javascripts/bootstrap/collapse.js  |  170 +
 .../javascripts/bootstrap/datetimepicker.js   | 3652 ++++++++
 app/assets/javascripts/bootstrap/dropdown.js  |  147 +
 app/assets/javascripts/bootstrap/modal.js     |  243 +
 app/assets/javascripts/bootstrap/popover.js   |  110 +
 app/assets/javascripts/bootstrap/scrollspy.js |  153 +
 app/assets/javascripts/bootstrap/tab.js       |  125 +
 app/assets/javascripts/bootstrap/tooltip.js   |  399 +
 .../javascripts/bootstrap/transition.js       |   48 +
 app/assets/javascripts/connexion.coffee       |   15 +-
 app/assets/javascripts/event_form.coffee      |   17 +
 app/assets/javascripts/image_files.js         |  191 +
 app/assets/javascripts/jquery.bxslider.js     | 1343 +++
 app/assets/javascripts/jquery.easing.1.3.js   |  205 +
 app/assets/javascripts/manager.js             |  174 +
 app/assets/javascripts/nested_fields.coffee   |   11 +
 app/assets/javascripts/pane_hover.js          |   55 +
 app/assets/javascripts/public.js.coffee       |  333 +-
 app/assets/javascripts/redactor.js            | 8009 ++++++++---------
 .../javascripts/redactor_plugins/fontcolor.js |   73 +
 .../redactor_plugins/fontfamily.js            |   32 +
 .../javascripts/redactor_plugins/fontsize.js  |   75 +
 .../javascripts/vendor/bootstrap-slider.js    |  388 +
 .../javascripts/vendor/jquery-sortable.js     |  598 ++
 .../javascripts/vendor/jquery.event.drag.js   |  402 +
 .../vendor/jquery.fileupload-process.js       |  164 +
 .../vendor/jquery.fileupload-ui.js            |  638 ++
 .../javascripts/vendor/jquery.fileupload.js   | 1315 +++
 .../vendor/jquery.iframe-transport.js         |  205 +
 .../javascripts/vendor/jquery.ui.widget.js    |  530 ++
 app/assets/javascripts/vendor/select2.min.js  | 3137 +++++++
 app/assets/javascripts/vendor/tmpl.min.js     |    1 +
 app/assets/stylesheets/admin.css.scss         |   15 +-
 .../admin/framework/accordion.less            |   34 -
 .../stylesheets/admin/framework/alerts.less   |   79 -
 .../admin/framework/bootstrap.less            |   67 -
 .../admin/framework/breadcrumbs.less          |   24 -
 .../admin/framework/button-groups.less        |  229 -
 .../stylesheets/admin/framework/buttons.less  |  228 -
 .../stylesheets/admin/framework/carousel.less |  158 -
 .../stylesheets/admin/framework/close.less    |   32 -
 .../stylesheets/admin/framework/code.less     |   61 -
 .../admin/framework/component-animations.less |   22 -
 .../admin/framework/dropdowns.less            |  248 -
 .../stylesheets/admin/framework/forms.less    |  695 --
 .../stylesheets/admin/framework/formt.less    |  310 -
 .../stylesheets/admin/framework/grid.less     |   21 -
 .../admin/framework/hero-unit.less            |   25 -
 .../admin/framework/labels-badges.less        |   84 -
 .../stylesheets/admin/framework/layouts.less  |   16 -
 .../stylesheets/admin/framework/media.less    |   55 -
 .../stylesheets/admin/framework/mixins.less   |  702 --
 .../stylesheets/admin/framework/modals.less   |   95 -
 .../stylesheets/admin/framework/navbar.less   |  497 -
 .../stylesheets/admin/framework/navs.less     |  409 -
 .../stylesheets/admin/framework/pager.less    |   43 -
 .../admin/framework/pagination.less           |  123 -
 .../stylesheets/admin/framework/popovers.less |  133 -
 .../admin/framework/progress-bars.less        |  122 -
 .../stylesheets/admin/framework/reset.less    |  216 -
 .../framework/responsive-1200px-min.less      |   28 -
 .../admin/framework/responsive-767px-max.less |  193 -
 .../framework/responsive-768px-979px.less     |   19 -
 .../admin/framework/responsive-navbar.less    |  189 -
 .../admin/framework/responsive-utilities.less |   59 -
 .../admin/framework/responsive.less           |   48 -
 .../admin/framework/scaffolding.less          |   53 -
 .../stylesheets/admin/framework/slider.less   |  104 -
 .../stylesheets/admin/framework/sprites.less  |  197 -
 .../stylesheets/admin/framework/tables.less   |  244 -
 .../admin/framework/thumbnails.less           |   53 -
 .../stylesheets/admin/framework/tooltip.less  |   70 -
 .../stylesheets/admin/framework/type.less     |  247 -
 .../admin/framework/utilities.less            |   30 -
 .../admin/framework/variables.less            |  301 -
 .../stylesheets/admin/framework/wells.less    |   29 -
 app/assets/stylesheets/admin/lesshat.less     | 2200 -----
 app/assets/stylesheets/admin/pane_hover.less  |   58 -
 app/assets/stylesheets/jquery.bxslider.css    |  213 +
 .../old.fontawesome/bordered-pulled.less      |   16 -
 .../stylesheets/old.fontawesome/core.less     |   12 -
 .../old.fontawesome/fixed-width.less          |    6 -
 .../old.fontawesome/font-awesome.less         |   17 -
 .../stylesheets/old.fontawesome/icons.less    |  412 -
 .../stylesheets/old.fontawesome/larger.less   |   13 -
 .../stylesheets/old.fontawesome/list.less     |   19 -
 .../stylesheets/old.fontawesome/mixins.less   |   20 -
 .../stylesheets/old.fontawesome/path.less     |   14 -
 .../old.fontawesome/rotated-flipped.less      |    9 -
 .../stylesheets/old.fontawesome/spinning.less |   30 -
 .../stylesheets/old.fontawesome/stacked.less  |   20 -
 .../old.fontawesome/variables.less            |  381 -
 app/assets/stylesheets/pane_hover.scss        |    2 +-
 app/assets/stylesheets/public.scss            |  559 ++
 app/assets/stylesheets/redactor.css           |  185 +-
 .../admin/admin_auths_controller.rb           |   38 +
 app/controllers/admin/admins_controller.rb    |  160 +-
 app/controllers/admin/albums_controller.rb    |   43 +
 app/controllers/admin/articles_controller.rb  |  124 +
 app/controllers/admin/blocks_controller.rb    |   28 +
 .../admin/categories_controller.rb            |  170 +
 app/controllers/admin/cibles_controller.rb    |   24 +
 app/controllers/admin/comments_controller.rb  |   52 +
 app/controllers/admin/dashboard_controller.rb |    2 +-
 .../admin/data_files_controller.rb            |   60 +
 .../admin/external_links_controller.rb        |   72 +
 .../admin/file_folders_controller.rb          |   50 +
 .../admin/image_files_controller.rb           |   66 +
 .../admin/menu_aliases_controller.rb          |   15 +
 .../admin/menu_items_controller.rb            |  432 +
 app/controllers/admin/menu_urls_controller.rb |   14 +
 app/controllers/admin/menus_controller.rb     |   79 +
 .../admin/newsletters_controller.rb           |    2 +-
 app/controllers/admin/pages_controller.rb     |   14 +
 app/controllers/admin/people_controller.rb    |    2 +-
 app/controllers/admin/petitions_controller.rb |    2 +-
 .../admin/sheet_years_controller.rb           |    2 +-
 app/controllers/admin/sheets_controller.rb    |    2 +-
 .../admin/survey_types_controller.rb          |    2 +-
 app/controllers/admin/tiny_urls_controller.rb |    2 +-
 app/controllers/admin/topics_controller.rb    |    2 +-
 app/controllers/application_controller.rb     |   43 +-
 .../portlet/block_contents_controller.rb      |  111 +
 .../portlet/break_contents_controller.rb      |  116 +
 .../portlet/download_contents_controller.rb   |  109 +
 .../portlet/dynamic_contents_controller.rb    |  116 +
 .../portlet/gallery_contents_controller.rb    |  109 +
 .../portlet/gallery_images_controller.rb      |   82 +
 .../portlet/html_contents_controller.rb       |  116 +
 .../portlet/image_contents_controller.rb      |  100 +
 .../portlet/link_contents_controller.rb       |  110 +
 .../portlet/map_contents_controller.rb        |  116 +
 .../portlet/portlets_controller.rb            |  124 +
 .../portlet/table_cols_controller.rb          |   35 +
 .../portlet/table_contents_controller.rb      |  108 +
 .../portlet/table_rows_controller.rb          |  106 +
 .../portlet/text_contents_controller.rb       |  116 +
 .../portlet/title_contents_controller.rb      |  116 +
 app/controllers/public/articles_controller.rb |  100 +
 app/controllers/public/comments_controller.rb |   19 +
 app/controllers/public/events_controller.rb   |   38 +
 .../public/menu_items_controller.rb           |   79 +
 app/helpers/application_helper.rb             |   12 +
 app/models/admin.rb                           |   53 +-
 app/models/album.rb                           |    5 +
 app/models/allowed_block_content.rb           |    5 +
 app/models/article.rb                         |  116 +
 app/models/block.rb                           |   60 +
 app/models/block_content.rb                   |   60 +
 app/models/break_content.rb                   |   10 +
 app/models/category.rb                        |  127 +
 app/models/cel_table.rb                       |   90 +
 app/models/cible_alias.rb                     |   26 +
 app/models/cible_url.rb                       |   11 +
 app/models/comment.rb                         |   16 +
 app/models/data_file.rb                       |   44 +
 app/models/download_content.rb                |   12 +
 app/models/dynamic_content.rb                 |   13 +
 app/models/external_link.rb                   |   16 +
 app/models/file_folder.rb                     |    3 +
 app/models/gallery_content.rb                 |   49 +
 app/models/gallery_image.rb                   |   17 +
 app/models/html_content.rb                    |   11 +
 app/models/image_content.rb                   |   35 +
 app/models/image_file.rb                      |   42 +
 app/models/img_link_content.rb                |   39 +
 app/models/link_content.rb                    |   45 +
 app/models/map_content.rb                     |   16 +
 app/models/menu.rb                            |   12 +
 app/models/menu_alias.rb                      |   13 +
 app/models/menu_folder.rb                     |    8 +
 app/models/menu_item.rb                       |  165 +
 app/models/menu_url.rb                        |    9 +
 app/models/page.rb                            |   43 +
 app/models/portlet.rb                         |   39 +
 app/models/table_content.rb                   |   51 +
 app/models/table_row.rb                       |   82 +
 app/models/tag.rb                             |   30 +
 app/models/tag_taggable.rb                    |   16 +
 app/models/text_content.rb                    |   10 +
 app/models/title_content.rb                   |   11 +
 app/uploaders/file_uploader.rb                |   16 +-
 app/uploaders/image_uploader.rb               |   79 +
 app/views/admin/admin_auths/index.haml        |    6 +
 app/views/admin/admin_auths/new.haml          |   19 +
 app/views/admin/admins/_form.html.haml        |    4 +-
 app/views/admin/albums/_album.html.haml       |    4 +
 app/views/admin/albums/_albums.html.haml      |    3 +
 .../admin/albums/_albums_navbar.html.haml     |    4 +
 app/views/admin/albums/create.js.erb          |    2 +
 app/views/admin/albums/destroy.js.erb         |    4 +
 app/views/admin/albums/edit.js.erb            |   16 +
 app/views/admin/albums/new.js.erb             |   16 +
 app/views/admin/albums/update.js.erb          |    2 +
 app/views/admin/articles/_article.html.haml   |   22 +
 app/views/admin/articles/_form.html.haml      |   26 +
 .../admin/articles/_index_block.html.haml     |   30 +
 app/views/admin/articles/_show.html.haml      |   17 +
 app/views/admin/articles/_tags.html.haml      |   14 +
 app/views/admin/articles/create.js.erb        |    5 +
 app/views/admin/articles/destroy.js.erb       |    2 +
 app/views/admin/articles/edit.html.haml       |   81 +
 app/views/admin/articles/edit.js.erb          |    2 +
 app/views/admin/articles/index.html.haml      |   54 +
 app/views/admin/articles/index.js.erb         |    2 +
 app/views/admin/articles/new.js.erb           |    2 +
 app/views/admin/articles/update.js.erb        |    9 +
 app/views/admin/blocks/_block.html.haml       |    7 +
 .../admin/blocks/_block_allowed.html.haml     |    7 +
 app/views/admin/blocks/_edit.html.haml        |    0
 app/views/admin/blocks/_form.html.haml        |   16 +
 app/views/admin/blocks/edit.html.haml         |    1 +
 app/views/admin/blocks/edit.js.erb            |    8 +
 app/views/admin/blocks/old.block              |    5 +
 app/views/admin/blocks/old.show.html.haml     |   19 +
 .../admin/categories/_category.html.haml      |   26 +
 app/views/admin/categories/_form.html.haml    |   10 +
 .../admin/categories/_index_block.html.haml   |   53 +
 app/views/admin/categories/cible.html.haml    |    6 +
 app/views/admin/categories/create.js.erb      |    3 +
 app/views/admin/categories/destroy.js.erb     |    4 +
 app/views/admin/categories/edit.js.erb        |    1 +
 app/views/admin/categories/index.html.haml    |    6 +
 app/views/admin/categories/index.js.erb       |   13 +
 app/views/admin/categories/new.js.erb         |    1 +
 app/views/admin/categories/reorder.js.erb     |    4 +
 app/views/admin/categories/update.js.erb      |    4 +
 app/views/admin/categories/update_row.js.erb  |    2 +
 app/views/admin/cibles/_cible_place.html.haml |   10 +
 app/views/admin/cibles/index.html.haml        |    1 +
 app/views/admin/cibles/index.js.erb           |    2 +
 app/views/admin/cibles/new.html.haml          |   15 +
 app/views/admin/comments/_comment.html.haml   |   13 +
 app/views/admin/comments/_form.html.haml      |   15 +
 app/views/admin/comments/destroy.js.erb       |    2 +
 app/views/admin/comments/edit.js.erb          |    1 +
 app/views/admin/comments/index.html.haml      |   13 +
 app/views/admin/comments/update.js.erb        |    3 +
 app/views/admin/dashboard/index.html.haml     |    2 +-
 .../admin/data_files/_data_file.html.haml     |   22 +
 .../_data_files_container.html.haml           |    4 +
 app/views/admin/data_files/_form.html.haml    |   15 +
 .../admin/data_files/_index_block.html.haml   |  150 +
 app/views/admin/data_files/_show.html.haml    |   18 +
 app/views/admin/data_files/create.js.erb      |    4 +
 app/views/admin/data_files/destroy.js.erb     |    2 +
 app/views/admin/data_files/index.html.haml    |    2 +
 app/views/admin/data_files/index.js.erb       |    1 +
 app/views/admin/data_files/show.js.erb        |    3 +
 app/views/admin/data_files/update.js.erb      |    5 +
 .../external_links/_external_link.html.haml   |   11 +
 .../admin/external_links/_form.html.haml      |   14 +
 .../admin/external_links/cible.html.haml      |   11 +
 app/views/admin/external_links/create.js.erb  |    2 +
 app/views/admin/external_links/destroy.js.erb |    1 +
 app/views/admin/external_links/edit.html.haml |    6 +
 app/views/admin/external_links/edit.js.erb    |    1 +
 app/views/admin/external_links/index.js.erb   |    2 +
 app/views/admin/external_links/new.js.erb     |    1 +
 app/views/admin/external_links/show.html.haml |   31 +
 app/views/admin/external_links/update.js.erb  |    2 +
 .../admin/file_folders/_file_folder.html.haml |    5 +
 .../file_folders/_file_folders.html.haml      |    6 +
 .../_file_folders_navbar.html.haml            |    9 +
 app/views/admin/file_folders/create.js.erb    |    2 +
 app/views/admin/file_folders/destroy.js.erb   |    1 +
 app/views/admin/file_folders/edit.js.erb      |   16 +
 app/views/admin/file_folders/index.js.erb     |    3 +
 app/views/admin/file_folders/new.js.erb       |   16 +
 app/views/admin/file_folders/update.js.erb    |    2 +
 app/views/admin/image_files/_form.html.haml   |   17 +
 .../admin/image_files/_image_file.html.haml   |   10 +
 .../_image_files_container.html.haml          |    4 +
 .../admin/image_files/_index_block.html.haml  |  165 +
 app/views/admin/image_files/_show.html.haml   |   16 +
 app/views/admin/image_files/create.js.erb     |    9 +
 app/views/admin/image_files/destroy.js.erb    |    4 +
 app/views/admin/image_files/index.html.haml   |    3 +
 app/views/admin/image_files/index.js.erb      |    5 +
 app/views/admin/image_files/rotate.js.erb     |    9 +
 app/views/admin/image_files/show.js.erb       |    3 +
 app/views/admin/image_files/update.js.erb     |    5 +
 app/views/admin/menu_aliases/_form.html.haml  |    6 +
 .../admin/menu_aliases/_menu_alias.html.haml  |    4 +
 app/views/admin/menu_aliases/edit.html.haml   |    0
 .../admin/menu_items/_cible_line.html.haml    |    9 +
 .../admin/menu_items/_edit_form.html.haml     |   12 +
 app/views/admin/menu_items/_form.html.haml    |   16 +
 .../admin/menu_items/_form_line.html.haml     |    7 +
 .../admin/menu_items/_index_block.html.haml   |   55 +
 .../admin/menu_items/_menu_item.html.haml     |   34 +
 .../_menu_item_content_form.html.haml         |    7 +
 .../admin/menu_items/_new_form.html.haml      |   25 +
 app/views/admin/menu_items/_show.html.haml    |    7 +
 app/views/admin/menu_items/archives.html.haml |   10 +
 app/views/admin/menu_items/cible.html.haml    |    5 +
 app/views/admin/menu_items/create.js.erb      |    4 +
 app/views/admin/menu_items/edit.html.haml     |   14 +
 app/views/admin/menu_items/edit.js.erb        |    3 +
 app/views/admin/menu_items/import.html.haml   |  112 +
 app/views/admin/menu_items/index.html.haml    |    9 +
 app/views/admin/menu_items/index.js.erb       |   13 +
 app/views/admin/menu_items/new.html.haml      |    4 +
 app/views/admin/menu_items/new.js.erb         |    3 +
 app/views/admin/menu_items/reorder.js.erb     |    4 +
 app/views/admin/menu_items/show.js.erb        |   11 +
 app/views/admin/menu_items/update.js.erb      |    4 +
 .../menu_items/update_reorder_failled.js.erb  |    7 +
 app/views/admin/menu_urls/_form.html.haml     |    5 +
 app/views/admin/menu_urls/_menu_url.html.haml |    4 +
 app/views/admin/menu_urls/edit.html.haml      |    0
 app/views/admin/menus/_form.html.haml         |    8 +
 app/views/admin/menus/_index_block.html.haml  |   43 +
 app/views/admin/menus/_menu.html.haml         |    9 +
 app/views/admin/menus/edit.html.haml          |    4 +
 app/views/admin/menus/index.html.haml         |    5 +
 app/views/admin/menus/index.js.erb            |    2 +
 app/views/admin/menus/new.html.haml           |    4 +
 app/views/admin/menus/show.html.haml          |    2 +
 app/views/admin/pages/_form.html.haml         |    6 +
 app/views/admin/pages/_page.html.haml         |   78 +
 app/views/admin/pages/edit.html.haml          |    0
 app/views/admin/pages/update.html.haml        |    2 +
 .../admin/password_resets/edit.html.haml      |    6 +
 app/views/admin/password_resets/new.html.haml |    6 +
 app/views/admin/passwords/edit.html.haml      |   16 +
 app/views/admin/passwords/new.html.haml       |   11 +
 app/views/admin/tiny_urls/index.html.haml     |    2 +-
 app/views/layouts/admin.html.haml             |   49 +-
 app/views/layouts/forum.haml                  |    2 +-
 app/views/layouts/public.html.haml            |  126 +
 .../block_contents/_block_content.html.haml   |   20 +
 .../portlet/block_contents/_form.html.haml    |   84 +
 .../break_contents/_break_content.html.haml   |    1 +
 .../portlet/break_contents/_form.html.haml    |   11 +
 .../_download_content.html.haml               |    8 +
 .../portlet/download_contents/_form.html.haml |   31 +
 .../_dynamic_content.html.haml                |    1 +
 .../portlet/dynamic_contents/_form.html.haml  |   11 +
 .../portlet/gallery_contents/_form.html.haml  |   10 +
 .../_gallery_content.html.haml                |   18 +
 .../portlet/gallery_images/_form.html.haml    |   19 +
 .../gallery_images/_gallery_image.html.haml   |    9 +
 .../portlet/gallery_images/create.js.erb      |    1 +
 .../portlet/gallery_images/destroy.js.erb     |    4 +
 app/views/portlet/gallery_images/edit.js.erb  |    1 +
 .../portlet/gallery_images/reorder.js.erb     |    0
 .../portlet/gallery_images/update.js.erb      |    5 +
 .../portlet/html_contents/_form.html.haml     |   53 +
 .../html_contents/_html_content.html.haml     |   11 +
 .../portlet/image_contents/_form.html.haml    |   29 +
 .../image_contents/_image_content.html.haml   |   42 +
 .../portlet/link_contents/_form.html.haml     |   12 +
 .../link_contents/_link_content.html.haml     |   10 +
 .../portlet/map_contents/_form.html.haml      |   22 +
 .../map_contents/_map_content.html.haml       |   64 +
 app/views/portlet/portlets/_portlet.html.haml |   28 +
 app/views/portlet/portlets/new.html.haml      |    7 +
 app/views/portlet/portlets/new.js.erb         |   12 +
 app/views/portlet/portlets/update.js.erb      |    8 +
 app/views/portlet/shared/create.js.erb        |   18 +
 app/views/portlet/shared/destroy.js.erb       |   13 +
 app/views/portlet/shared/edit.js.erb          |   15 +
 app/views/portlet/shared/new.js.erb           |    7 +
 app/views/portlet/shared/update.js.erb        |    7 +
 app/views/portlet/table_cols/create.js.erb    |    4 +
 app/views/portlet/table_cols/destroy.js.erb   |    4 +
 .../portlet/table_contents/_form.html.haml    |   18 +
 .../table_contents/_table_content.html.haml   |   46 +
 .../_table_content_edit_pane.html.haml        |   33 +
 .../portlet/table_contents/destroy_row.js.erb |    6 +
 app/views/portlet/table_rows/create.js.erb    |    4 +
 app/views/portlet/table_rows/destroy.js.erb   |    4 +
 .../portlet/text_contents/_form.html.haml     |   78 +
 .../text_contents/_text_content.html.haml     |    2 +
 .../portlet/title_contents/_form.html.haml    |   34 +
 .../title_contents/_title_content.html.haml   |    4 +
 .../render_public/_blockcontent.html.haml     |   36 +
 .../render_public/_breakcontent.html.haml     |    1 +
 .../render_public/_downloadcontent.html.haml  |   11 +
 .../render_public/_dynamiccontent.html.haml   |    3 +
 .../render_public/_eventcontent.html.haml     |  106 +
 .../render_public/_gallerycontent.html.haml   |  130 +
 .../render_public/_htmlcontent.html.haml      |    5 +
 .../render_public/_imagecontent.html.haml     |   62 +
 .../render_public/_imglinkcontent.html.haml   |   27 +
 .../render_public/_linkcontent.html.haml      |    6 +
 .../render_public/_mapcontent.html.haml       |   64 +
 .../render_public/_tablecontent.html.haml     |   74 +
 .../render_public/_textcontent.html.haml      |    4 +
 .../render_public/_titlecontent.html.haml     |    8 +
 app/views/public/articles/_article.html.haml  |   20 +
 .../public/articles/_article_intro.html.haml  |   35 +
 app/views/public/articles/_index.html.haml    |    6 +
 .../articles/_sidebar_archives.html.haml      |   16 +
 .../articles/_sidebar_categories.html.haml    |    7 +
 .../articles/_sidebar_recents.html.haml       |    8 +
 .../public/articles/_sidebar_tags.html.haml   |    7 +
 app/views/public/articles/archive.html.haml   |   19 +
 app/views/public/articles/feed.rss.builder    |   22 +
 app/views/public/articles/index.html.haml     |    4 +
 app/views/public/articles/index.js.erb        |   50 +
 app/views/public/articles/show.html.haml      |    1 +
 app/views/public/blocks/_block.html.haml      |    5 +
 app/views/public/comments/_comment.html.haml  |   26 +
 app/views/public/comments/_form.html.haml     |   32 +
 app/views/public/comments/create.js.erb       |   12 +
 app/views/public/events/_event.haml           |    9 +
 app/views/public/events/index.html.haml       |    2 +
 app/views/public/events/show.html.haml        |    2 +
 app/views/public/menu_items/show.html.haml    |    1 +
 app/views/public/shared/_first_menu.html.haml |    3 +
 app/views/public/shared/_ga.html.erb          |   13 +
 config/deploy.rb                              |    2 +-
 config/environments/production.rb             |    4 +-
 config/initializers/devise.rb                 |  241 -
 config/nginx.conf                             |    2 +-
 config/routes.rb                              |   23 +-
 db/migrate/0003_create_menu.rb                |   15 +
 db/migrate/0004_menu_items.rb                 |   46 +
 db/migrate/0005_create_menu_aliases.rb        |   15 +
 db/migrate/0006_create_menu_urls.rb           |   15 +
 db/migrate/0010_create_pages.rb               |   19 +
 db/migrate/0065_create_blocks.rb              |   19 +
 db/migrate/0070_create_portlets.rb            |   19 +
 db/migrate/0074_create_block_contents.rb      |   20 +
 db/migrate/0075_create_title_contents.rb      |   17 +
 db/migrate/0076_create_text_contents.rb       |   16 +
 db/migrate/0077_create_image_contents.rb      |   25 +
 db/migrate/0078_create_link_contents.rb       |   24 +
 db/migrate/0079_create_break_contents.rb      |   16 +
 db/migrate/0080_create_html_contents.rb       |   16 +
 db/migrate/0081_create_download_contents.rb   |   20 +
 db/migrate/0082_create_gallery_contents.rb    |   19 +
 db/migrate/0090_create_external_links.rb      |   21 +
 db/migrate/0101_create_gallery_images.rb      |   20 +
 db/migrate/0102_create_dynamic_contents.rb    |   15 +
 db/migrate/0105_create_map_contents.rb        |   19 +
 db/migrate/0110_create_table_contents.rb      |   17 +
 db/migrate/0112_create_table_rows.rb          |   15 +
 db/migrate/0114_create_cel_tables.rb          |   17 +
 db/migrate/0200_create_albums.rb              |   17 +
 db/migrate/0210_create_image_files.rb         |   22 +
 db/migrate/0300_create_file_folders.rb        |   16 +
 db/migrate/0310_create_data_files.rb          |   19 +
 db/migrate/1010_create_tags.rb                |   19 +
 db/migrate/1020_create_tag_taggables.rb       |   11 +
 db/migrate/1030_create_categories.rb          |   19 +
 db/migrate/1040_create_articles.rb            |   23 +
 db/migrate/1050_create_comments.rb            |   22 +
 .../20141208202946_add_infos_to_admins.rb     |    7 +
 db/schema.rb                                  |  330 +-
 public/logo_pic_vert.png                      |  Bin 0 -> 31338 bytes
 462 files changed, 30000 insertions(+), 18801 deletions(-)
 create mode 100644 app/assets/javascripts/admin.coffee
 delete mode 100644 app/assets/javascripts/admin.js
 delete mode 100755 app/assets/javascripts/admin/redactor.js
 create mode 100644 app/assets/javascripts/bootstrap.js
 create mode 100644 app/assets/javascripts/bootstrap/affix.js
 create mode 100644 app/assets/javascripts/bootstrap/alert.js
 create mode 100644 app/assets/javascripts/bootstrap/button.js
 create mode 100644 app/assets/javascripts/bootstrap/carousel.js
 create mode 100644 app/assets/javascripts/bootstrap/collapse.js
 create mode 100755 app/assets/javascripts/bootstrap/datetimepicker.js
 create mode 100644 app/assets/javascripts/bootstrap/dropdown.js
 create mode 100644 app/assets/javascripts/bootstrap/modal.js
 create mode 100644 app/assets/javascripts/bootstrap/popover.js
 create mode 100644 app/assets/javascripts/bootstrap/scrollspy.js
 create mode 100644 app/assets/javascripts/bootstrap/tab.js
 create mode 100644 app/assets/javascripts/bootstrap/tooltip.js
 create mode 100644 app/assets/javascripts/bootstrap/transition.js
 create mode 100644 app/assets/javascripts/event_form.coffee
 create mode 100644 app/assets/javascripts/image_files.js
 create mode 100644 app/assets/javascripts/jquery.bxslider.js
 create mode 100755 app/assets/javascripts/jquery.easing.1.3.js
 create mode 100644 app/assets/javascripts/manager.js
 create mode 100644 app/assets/javascripts/nested_fields.coffee
 create mode 100644 app/assets/javascripts/pane_hover.js
 create mode 100755 app/assets/javascripts/redactor_plugins/fontcolor.js
 create mode 100755 app/assets/javascripts/redactor_plugins/fontfamily.js
 create mode 100755 app/assets/javascripts/redactor_plugins/fontsize.js
 create mode 100755 app/assets/javascripts/vendor/bootstrap-slider.js
 create mode 100644 app/assets/javascripts/vendor/jquery-sortable.js
 create mode 100644 app/assets/javascripts/vendor/jquery.event.drag.js
 create mode 100755 app/assets/javascripts/vendor/jquery.fileupload-process.js
 create mode 100755 app/assets/javascripts/vendor/jquery.fileupload-ui.js
 create mode 100755 app/assets/javascripts/vendor/jquery.fileupload.js
 create mode 100755 app/assets/javascripts/vendor/jquery.iframe-transport.js
 create mode 100755 app/assets/javascripts/vendor/jquery.ui.widget.js
 create mode 100755 app/assets/javascripts/vendor/select2.min.js
 create mode 100644 app/assets/javascripts/vendor/tmpl.min.js
 delete mode 100755 app/assets/stylesheets/admin/framework/accordion.less
 delete mode 100755 app/assets/stylesheets/admin/framework/alerts.less
 delete mode 100755 app/assets/stylesheets/admin/framework/bootstrap.less
 delete mode 100755 app/assets/stylesheets/admin/framework/breadcrumbs.less
 delete mode 100755 app/assets/stylesheets/admin/framework/button-groups.less
 delete mode 100755 app/assets/stylesheets/admin/framework/buttons.less
 delete mode 100755 app/assets/stylesheets/admin/framework/carousel.less
 delete mode 100755 app/assets/stylesheets/admin/framework/close.less
 delete mode 100755 app/assets/stylesheets/admin/framework/code.less
 delete mode 100755 app/assets/stylesheets/admin/framework/component-animations.less
 delete mode 100755 app/assets/stylesheets/admin/framework/dropdowns.less
 delete mode 100755 app/assets/stylesheets/admin/framework/forms.less
 delete mode 100644 app/assets/stylesheets/admin/framework/formt.less
 delete mode 100755 app/assets/stylesheets/admin/framework/grid.less
 delete mode 100755 app/assets/stylesheets/admin/framework/hero-unit.less
 delete mode 100755 app/assets/stylesheets/admin/framework/labels-badges.less
 delete mode 100755 app/assets/stylesheets/admin/framework/layouts.less
 delete mode 100755 app/assets/stylesheets/admin/framework/media.less
 delete mode 100755 app/assets/stylesheets/admin/framework/mixins.less
 delete mode 100755 app/assets/stylesheets/admin/framework/modals.less
 delete mode 100755 app/assets/stylesheets/admin/framework/navbar.less
 delete mode 100755 app/assets/stylesheets/admin/framework/navs.less
 delete mode 100755 app/assets/stylesheets/admin/framework/pager.less
 delete mode 100755 app/assets/stylesheets/admin/framework/pagination.less
 delete mode 100755 app/assets/stylesheets/admin/framework/popovers.less
 delete mode 100755 app/assets/stylesheets/admin/framework/progress-bars.less
 delete mode 100755 app/assets/stylesheets/admin/framework/reset.less
 delete mode 100755 app/assets/stylesheets/admin/framework/responsive-1200px-min.less
 delete mode 100755 app/assets/stylesheets/admin/framework/responsive-767px-max.less
 delete mode 100755 app/assets/stylesheets/admin/framework/responsive-768px-979px.less
 delete mode 100755 app/assets/stylesheets/admin/framework/responsive-navbar.less
 delete mode 100755 app/assets/stylesheets/admin/framework/responsive-utilities.less
 delete mode 100755 app/assets/stylesheets/admin/framework/responsive.less
 delete mode 100755 app/assets/stylesheets/admin/framework/scaffolding.less
 delete mode 100755 app/assets/stylesheets/admin/framework/slider.less
 delete mode 100755 app/assets/stylesheets/admin/framework/sprites.less
 delete mode 100755 app/assets/stylesheets/admin/framework/tables.less
 delete mode 100755 app/assets/stylesheets/admin/framework/thumbnails.less
 delete mode 100755 app/assets/stylesheets/admin/framework/tooltip.less
 delete mode 100755 app/assets/stylesheets/admin/framework/type.less
 delete mode 100755 app/assets/stylesheets/admin/framework/utilities.less
 delete mode 100755 app/assets/stylesheets/admin/framework/variables.less
 delete mode 100755 app/assets/stylesheets/admin/framework/wells.less
 delete mode 100755 app/assets/stylesheets/admin/lesshat.less
 delete mode 100644 app/assets/stylesheets/admin/pane_hover.less
 create mode 100644 app/assets/stylesheets/jquery.bxslider.css
 delete mode 100644 app/assets/stylesheets/old.fontawesome/bordered-pulled.less
 delete mode 100644 app/assets/stylesheets/old.fontawesome/core.less
 delete mode 100644 app/assets/stylesheets/old.fontawesome/fixed-width.less
 delete mode 100644 app/assets/stylesheets/old.fontawesome/font-awesome.less
 delete mode 100644 app/assets/stylesheets/old.fontawesome/icons.less
 delete mode 100644 app/assets/stylesheets/old.fontawesome/larger.less
 delete mode 100644 app/assets/stylesheets/old.fontawesome/list.less
 delete mode 100644 app/assets/stylesheets/old.fontawesome/mixins.less
 delete mode 100644 app/assets/stylesheets/old.fontawesome/path.less
 delete mode 100644 app/assets/stylesheets/old.fontawesome/rotated-flipped.less
 delete mode 100644 app/assets/stylesheets/old.fontawesome/spinning.less
 delete mode 100644 app/assets/stylesheets/old.fontawesome/stacked.less
 delete mode 100644 app/assets/stylesheets/old.fontawesome/variables.less
 create mode 100644 app/assets/stylesheets/public.scss
 create mode 100644 app/controllers/admin/admin_auths_controller.rb
 create mode 100644 app/controllers/admin/albums_controller.rb
 create mode 100644 app/controllers/admin/articles_controller.rb
 create mode 100644 app/controllers/admin/blocks_controller.rb
 create mode 100644 app/controllers/admin/categories_controller.rb
 create mode 100644 app/controllers/admin/cibles_controller.rb
 create mode 100644 app/controllers/admin/comments_controller.rb
 create mode 100644 app/controllers/admin/data_files_controller.rb
 create mode 100644 app/controllers/admin/external_links_controller.rb
 create mode 100644 app/controllers/admin/file_folders_controller.rb
 create mode 100644 app/controllers/admin/image_files_controller.rb
 create mode 100644 app/controllers/admin/menu_aliases_controller.rb
 create mode 100644 app/controllers/admin/menu_items_controller.rb
 create mode 100644 app/controllers/admin/menu_urls_controller.rb
 create mode 100644 app/controllers/admin/menus_controller.rb
 create mode 100644 app/controllers/admin/pages_controller.rb
 create mode 100644 app/controllers/portlet/block_contents_controller.rb
 create mode 100644 app/controllers/portlet/break_contents_controller.rb
 create mode 100644 app/controllers/portlet/download_contents_controller.rb
 create mode 100644 app/controllers/portlet/dynamic_contents_controller.rb
 create mode 100644 app/controllers/portlet/gallery_contents_controller.rb
 create mode 100644 app/controllers/portlet/gallery_images_controller.rb
 create mode 100644 app/controllers/portlet/html_contents_controller.rb
 create mode 100644 app/controllers/portlet/image_contents_controller.rb
 create mode 100644 app/controllers/portlet/link_contents_controller.rb
 create mode 100644 app/controllers/portlet/map_contents_controller.rb
 create mode 100644 app/controllers/portlet/portlets_controller.rb
 create mode 100644 app/controllers/portlet/table_cols_controller.rb
 create mode 100644 app/controllers/portlet/table_contents_controller.rb
 create mode 100644 app/controllers/portlet/table_rows_controller.rb
 create mode 100644 app/controllers/portlet/text_contents_controller.rb
 create mode 100644 app/controllers/portlet/title_contents_controller.rb
 create mode 100644 app/controllers/public/articles_controller.rb
 create mode 100644 app/controllers/public/comments_controller.rb
 create mode 100644 app/controllers/public/events_controller.rb
 create mode 100644 app/controllers/public/menu_items_controller.rb
 create mode 100644 app/models/album.rb
 create mode 100644 app/models/allowed_block_content.rb
 create mode 100644 app/models/article.rb
 create mode 100644 app/models/block.rb
 create mode 100644 app/models/block_content.rb
 create mode 100644 app/models/break_content.rb
 create mode 100644 app/models/category.rb
 create mode 100644 app/models/cel_table.rb
 create mode 100644 app/models/cible_alias.rb
 create mode 100644 app/models/cible_url.rb
 create mode 100644 app/models/comment.rb
 create mode 100644 app/models/data_file.rb
 create mode 100644 app/models/download_content.rb
 create mode 100644 app/models/dynamic_content.rb
 create mode 100644 app/models/external_link.rb
 create mode 100644 app/models/file_folder.rb
 create mode 100644 app/models/gallery_content.rb
 create mode 100644 app/models/gallery_image.rb
 create mode 100644 app/models/html_content.rb
 create mode 100644 app/models/image_content.rb
 create mode 100644 app/models/image_file.rb
 create mode 100644 app/models/img_link_content.rb
 create mode 100644 app/models/link_content.rb
 create mode 100644 app/models/map_content.rb
 create mode 100644 app/models/menu.rb
 create mode 100644 app/models/menu_alias.rb
 create mode 100644 app/models/menu_folder.rb
 create mode 100644 app/models/menu_item.rb
 create mode 100644 app/models/menu_url.rb
 create mode 100644 app/models/page.rb
 create mode 100644 app/models/portlet.rb
 create mode 100644 app/models/table_content.rb
 create mode 100644 app/models/table_row.rb
 create mode 100644 app/models/tag.rb
 create mode 100644 app/models/tag_taggable.rb
 create mode 100644 app/models/text_content.rb
 create mode 100644 app/models/title_content.rb
 create mode 100644 app/uploaders/image_uploader.rb
 create mode 100644 app/views/admin/admin_auths/index.haml
 create mode 100644 app/views/admin/admin_auths/new.haml
 create mode 100644 app/views/admin/albums/_album.html.haml
 create mode 100644 app/views/admin/albums/_albums.html.haml
 create mode 100644 app/views/admin/albums/_albums_navbar.html.haml
 create mode 100644 app/views/admin/albums/create.js.erb
 create mode 100644 app/views/admin/albums/destroy.js.erb
 create mode 100644 app/views/admin/albums/edit.js.erb
 create mode 100644 app/views/admin/albums/new.js.erb
 create mode 100644 app/views/admin/albums/update.js.erb
 create mode 100644 app/views/admin/articles/_article.html.haml
 create mode 100644 app/views/admin/articles/_form.html.haml
 create mode 100644 app/views/admin/articles/_index_block.html.haml
 create mode 100644 app/views/admin/articles/_show.html.haml
 create mode 100644 app/views/admin/articles/_tags.html.haml
 create mode 100644 app/views/admin/articles/create.js.erb
 create mode 100644 app/views/admin/articles/destroy.js.erb
 create mode 100644 app/views/admin/articles/edit.html.haml
 create mode 100644 app/views/admin/articles/edit.js.erb
 create mode 100644 app/views/admin/articles/index.html.haml
 create mode 100644 app/views/admin/articles/index.js.erb
 create mode 100644 app/views/admin/articles/new.js.erb
 create mode 100644 app/views/admin/articles/update.js.erb
 create mode 100644 app/views/admin/blocks/_block.html.haml
 create mode 100644 app/views/admin/blocks/_block_allowed.html.haml
 create mode 100644 app/views/admin/blocks/_edit.html.haml
 create mode 100644 app/views/admin/blocks/_form.html.haml
 create mode 100644 app/views/admin/blocks/edit.html.haml
 create mode 100644 app/views/admin/blocks/edit.js.erb
 create mode 100644 app/views/admin/blocks/old.block
 create mode 100644 app/views/admin/blocks/old.show.html.haml
 create mode 100644 app/views/admin/categories/_category.html.haml
 create mode 100644 app/views/admin/categories/_form.html.haml
 create mode 100644 app/views/admin/categories/_index_block.html.haml
 create mode 100644 app/views/admin/categories/cible.html.haml
 create mode 100644 app/views/admin/categories/create.js.erb
 create mode 100644 app/views/admin/categories/destroy.js.erb
 create mode 100644 app/views/admin/categories/edit.js.erb
 create mode 100644 app/views/admin/categories/index.html.haml
 create mode 100644 app/views/admin/categories/index.js.erb
 create mode 100644 app/views/admin/categories/new.js.erb
 create mode 100644 app/views/admin/categories/reorder.js.erb
 create mode 100644 app/views/admin/categories/update.js.erb
 create mode 100644 app/views/admin/categories/update_row.js.erb
 create mode 100644 app/views/admin/cibles/_cible_place.html.haml
 create mode 100644 app/views/admin/cibles/index.html.haml
 create mode 100644 app/views/admin/cibles/index.js.erb
 create mode 100644 app/views/admin/cibles/new.html.haml
 create mode 100644 app/views/admin/comments/_comment.html.haml
 create mode 100644 app/views/admin/comments/_form.html.haml
 create mode 100644 app/views/admin/comments/destroy.js.erb
 create mode 100644 app/views/admin/comments/edit.js.erb
 create mode 100644 app/views/admin/comments/index.html.haml
 create mode 100644 app/views/admin/comments/update.js.erb
 create mode 100644 app/views/admin/data_files/_data_file.html.haml
 create mode 100644 app/views/admin/data_files/_data_files_container.html.haml
 create mode 100644 app/views/admin/data_files/_form.html.haml
 create mode 100644 app/views/admin/data_files/_index_block.html.haml
 create mode 100644 app/views/admin/data_files/_show.html.haml
 create mode 100644 app/views/admin/data_files/create.js.erb
 create mode 100644 app/views/admin/data_files/destroy.js.erb
 create mode 100644 app/views/admin/data_files/index.html.haml
 create mode 100644 app/views/admin/data_files/index.js.erb
 create mode 100644 app/views/admin/data_files/show.js.erb
 create mode 100644 app/views/admin/data_files/update.js.erb
 create mode 100644 app/views/admin/external_links/_external_link.html.haml
 create mode 100644 app/views/admin/external_links/_form.html.haml
 create mode 100644 app/views/admin/external_links/cible.html.haml
 create mode 100644 app/views/admin/external_links/create.js.erb
 create mode 100644 app/views/admin/external_links/destroy.js.erb
 create mode 100644 app/views/admin/external_links/edit.html.haml
 create mode 100644 app/views/admin/external_links/edit.js.erb
 create mode 100644 app/views/admin/external_links/index.js.erb
 create mode 100644 app/views/admin/external_links/new.js.erb
 create mode 100644 app/views/admin/external_links/show.html.haml
 create mode 100644 app/views/admin/external_links/update.js.erb
 create mode 100644 app/views/admin/file_folders/_file_folder.html.haml
 create mode 100644 app/views/admin/file_folders/_file_folders.html.haml
 create mode 100644 app/views/admin/file_folders/_file_folders_navbar.html.haml
 create mode 100644 app/views/admin/file_folders/create.js.erb
 create mode 100644 app/views/admin/file_folders/destroy.js.erb
 create mode 100644 app/views/admin/file_folders/edit.js.erb
 create mode 100644 app/views/admin/file_folders/index.js.erb
 create mode 100644 app/views/admin/file_folders/new.js.erb
 create mode 100644 app/views/admin/file_folders/update.js.erb
 create mode 100644 app/views/admin/image_files/_form.html.haml
 create mode 100644 app/views/admin/image_files/_image_file.html.haml
 create mode 100644 app/views/admin/image_files/_image_files_container.html.haml
 create mode 100644 app/views/admin/image_files/_index_block.html.haml
 create mode 100644 app/views/admin/image_files/_show.html.haml
 create mode 100644 app/views/admin/image_files/create.js.erb
 create mode 100644 app/views/admin/image_files/destroy.js.erb
 create mode 100644 app/views/admin/image_files/index.html.haml
 create mode 100644 app/views/admin/image_files/index.js.erb
 create mode 100644 app/views/admin/image_files/rotate.js.erb
 create mode 100644 app/views/admin/image_files/show.js.erb
 create mode 100644 app/views/admin/image_files/update.js.erb
 create mode 100644 app/views/admin/menu_aliases/_form.html.haml
 create mode 100644 app/views/admin/menu_aliases/_menu_alias.html.haml
 create mode 100644 app/views/admin/menu_aliases/edit.html.haml
 create mode 100644 app/views/admin/menu_items/_cible_line.html.haml
 create mode 100644 app/views/admin/menu_items/_edit_form.html.haml
 create mode 100644 app/views/admin/menu_items/_form.html.haml
 create mode 100644 app/views/admin/menu_items/_form_line.html.haml
 create mode 100644 app/views/admin/menu_items/_index_block.html.haml
 create mode 100644 app/views/admin/menu_items/_menu_item.html.haml
 create mode 100644 app/views/admin/menu_items/_menu_item_content_form.html.haml
 create mode 100644 app/views/admin/menu_items/_new_form.html.haml
 create mode 100644 app/views/admin/menu_items/_show.html.haml
 create mode 100644 app/views/admin/menu_items/archives.html.haml
 create mode 100644 app/views/admin/menu_items/cible.html.haml
 create mode 100644 app/views/admin/menu_items/create.js.erb
 create mode 100644 app/views/admin/menu_items/edit.html.haml
 create mode 100644 app/views/admin/menu_items/edit.js.erb
 create mode 100644 app/views/admin/menu_items/import.html.haml
 create mode 100644 app/views/admin/menu_items/index.html.haml
 create mode 100644 app/views/admin/menu_items/index.js.erb
 create mode 100644 app/views/admin/menu_items/new.html.haml
 create mode 100644 app/views/admin/menu_items/new.js.erb
 create mode 100644 app/views/admin/menu_items/reorder.js.erb
 create mode 100644 app/views/admin/menu_items/show.js.erb
 create mode 100644 app/views/admin/menu_items/update.js.erb
 create mode 100644 app/views/admin/menu_items/update_reorder_failled.js.erb
 create mode 100644 app/views/admin/menu_urls/_form.html.haml
 create mode 100644 app/views/admin/menu_urls/_menu_url.html.haml
 create mode 100644 app/views/admin/menu_urls/edit.html.haml
 create mode 100644 app/views/admin/menus/_form.html.haml
 create mode 100644 app/views/admin/menus/_index_block.html.haml
 create mode 100644 app/views/admin/menus/_menu.html.haml
 create mode 100644 app/views/admin/menus/edit.html.haml
 create mode 100644 app/views/admin/menus/index.html.haml
 create mode 100644 app/views/admin/menus/index.js.erb
 create mode 100644 app/views/admin/menus/new.html.haml
 create mode 100644 app/views/admin/menus/show.html.haml
 create mode 100644 app/views/admin/pages/_form.html.haml
 create mode 100644 app/views/admin/pages/_page.html.haml
 create mode 100644 app/views/admin/pages/edit.html.haml
 create mode 100644 app/views/admin/pages/update.html.haml
 create mode 100644 app/views/admin/password_resets/edit.html.haml
 create mode 100644 app/views/admin/password_resets/new.html.haml
 create mode 100644 app/views/admin/passwords/edit.html.haml
 create mode 100644 app/views/admin/passwords/new.html.haml
 create mode 100644 app/views/layouts/public.html.haml
 create mode 100644 app/views/portlet/block_contents/_block_content.html.haml
 create mode 100644 app/views/portlet/block_contents/_form.html.haml
 create mode 100644 app/views/portlet/break_contents/_break_content.html.haml
 create mode 100644 app/views/portlet/break_contents/_form.html.haml
 create mode 100644 app/views/portlet/download_contents/_download_content.html.haml
 create mode 100644 app/views/portlet/download_contents/_form.html.haml
 create mode 100644 app/views/portlet/dynamic_contents/_dynamic_content.html.haml
 create mode 100644 app/views/portlet/dynamic_contents/_form.html.haml
 create mode 100644 app/views/portlet/gallery_contents/_form.html.haml
 create mode 100644 app/views/portlet/gallery_contents/_gallery_content.html.haml
 create mode 100644 app/views/portlet/gallery_images/_form.html.haml
 create mode 100644 app/views/portlet/gallery_images/_gallery_image.html.haml
 create mode 100644 app/views/portlet/gallery_images/create.js.erb
 create mode 100644 app/views/portlet/gallery_images/destroy.js.erb
 create mode 100644 app/views/portlet/gallery_images/edit.js.erb
 create mode 100644 app/views/portlet/gallery_images/reorder.js.erb
 create mode 100644 app/views/portlet/gallery_images/update.js.erb
 create mode 100644 app/views/portlet/html_contents/_form.html.haml
 create mode 100644 app/views/portlet/html_contents/_html_content.html.haml
 create mode 100644 app/views/portlet/image_contents/_form.html.haml
 create mode 100644 app/views/portlet/image_contents/_image_content.html.haml
 create mode 100644 app/views/portlet/link_contents/_form.html.haml
 create mode 100644 app/views/portlet/link_contents/_link_content.html.haml
 create mode 100644 app/views/portlet/map_contents/_form.html.haml
 create mode 100644 app/views/portlet/map_contents/_map_content.html.haml
 create mode 100644 app/views/portlet/portlets/_portlet.html.haml
 create mode 100644 app/views/portlet/portlets/new.html.haml
 create mode 100644 app/views/portlet/portlets/new.js.erb
 create mode 100644 app/views/portlet/portlets/update.js.erb
 create mode 100644 app/views/portlet/shared/create.js.erb
 create mode 100644 app/views/portlet/shared/destroy.js.erb
 create mode 100644 app/views/portlet/shared/edit.js.erb
 create mode 100644 app/views/portlet/shared/new.js.erb
 create mode 100644 app/views/portlet/shared/update.js.erb
 create mode 100644 app/views/portlet/table_cols/create.js.erb
 create mode 100644 app/views/portlet/table_cols/destroy.js.erb
 create mode 100644 app/views/portlet/table_contents/_form.html.haml
 create mode 100644 app/views/portlet/table_contents/_table_content.html.haml
 create mode 100644 app/views/portlet/table_contents/_table_content_edit_pane.html.haml
 create mode 100644 app/views/portlet/table_contents/destroy_row.js.erb
 create mode 100644 app/views/portlet/table_rows/create.js.erb
 create mode 100644 app/views/portlet/table_rows/destroy.js.erb
 create mode 100644 app/views/portlet/text_contents/_form.html.haml
 create mode 100644 app/views/portlet/text_contents/_text_content.html.haml
 create mode 100644 app/views/portlet/title_contents/_form.html.haml
 create mode 100644 app/views/portlet/title_contents/_title_content.html.haml
 create mode 100644 app/views/portlets/render_public/_blockcontent.html.haml
 create mode 100644 app/views/portlets/render_public/_breakcontent.html.haml
 create mode 100644 app/views/portlets/render_public/_downloadcontent.html.haml
 create mode 100644 app/views/portlets/render_public/_dynamiccontent.html.haml
 create mode 100644 app/views/portlets/render_public/_eventcontent.html.haml
 create mode 100644 app/views/portlets/render_public/_gallerycontent.html.haml
 create mode 100644 app/views/portlets/render_public/_htmlcontent.html.haml
 create mode 100644 app/views/portlets/render_public/_imagecontent.html.haml
 create mode 100644 app/views/portlets/render_public/_imglinkcontent.html.haml
 create mode 100644 app/views/portlets/render_public/_linkcontent.html.haml
 create mode 100644 app/views/portlets/render_public/_mapcontent.html.haml
 create mode 100644 app/views/portlets/render_public/_tablecontent.html.haml
 create mode 100644 app/views/portlets/render_public/_textcontent.html.haml
 create mode 100644 app/views/portlets/render_public/_titlecontent.html.haml
 create mode 100644 app/views/public/articles/_article.html.haml
 create mode 100644 app/views/public/articles/_article_intro.html.haml
 create mode 100644 app/views/public/articles/_index.html.haml
 create mode 100644 app/views/public/articles/_sidebar_archives.html.haml
 create mode 100644 app/views/public/articles/_sidebar_categories.html.haml
 create mode 100644 app/views/public/articles/_sidebar_recents.html.haml
 create mode 100644 app/views/public/articles/_sidebar_tags.html.haml
 create mode 100644 app/views/public/articles/archive.html.haml
 create mode 100644 app/views/public/articles/feed.rss.builder
 create mode 100644 app/views/public/articles/index.html.haml
 create mode 100644 app/views/public/articles/index.js.erb
 create mode 100644 app/views/public/articles/show.html.haml
 create mode 100644 app/views/public/blocks/_block.html.haml
 create mode 100644 app/views/public/comments/_comment.html.haml
 create mode 100644 app/views/public/comments/_form.html.haml
 create mode 100644 app/views/public/comments/create.js.erb
 create mode 100644 app/views/public/events/_event.haml
 create mode 100644 app/views/public/events/index.html.haml
 create mode 100644 app/views/public/events/show.html.haml
 create mode 100644 app/views/public/menu_items/show.html.haml
 create mode 100644 app/views/public/shared/_first_menu.html.haml
 create mode 100644 app/views/public/shared/_ga.html.erb
 delete mode 100644 config/initializers/devise.rb
 create mode 100644 db/migrate/0003_create_menu.rb
 create mode 100644 db/migrate/0004_menu_items.rb
 create mode 100644 db/migrate/0005_create_menu_aliases.rb
 create mode 100644 db/migrate/0006_create_menu_urls.rb
 create mode 100644 db/migrate/0010_create_pages.rb
 create mode 100644 db/migrate/0065_create_blocks.rb
 create mode 100644 db/migrate/0070_create_portlets.rb
 create mode 100644 db/migrate/0074_create_block_contents.rb
 create mode 100644 db/migrate/0075_create_title_contents.rb
 create mode 100644 db/migrate/0076_create_text_contents.rb
 create mode 100644 db/migrate/0077_create_image_contents.rb
 create mode 100644 db/migrate/0078_create_link_contents.rb
 create mode 100644 db/migrate/0079_create_break_contents.rb
 create mode 100644 db/migrate/0080_create_html_contents.rb
 create mode 100644 db/migrate/0081_create_download_contents.rb
 create mode 100644 db/migrate/0082_create_gallery_contents.rb
 create mode 100644 db/migrate/0090_create_external_links.rb
 create mode 100644 db/migrate/0101_create_gallery_images.rb
 create mode 100644 db/migrate/0102_create_dynamic_contents.rb
 create mode 100644 db/migrate/0105_create_map_contents.rb
 create mode 100644 db/migrate/0110_create_table_contents.rb
 create mode 100644 db/migrate/0112_create_table_rows.rb
 create mode 100644 db/migrate/0114_create_cel_tables.rb
 create mode 100644 db/migrate/0200_create_albums.rb
 create mode 100644 db/migrate/0210_create_image_files.rb
 create mode 100644 db/migrate/0300_create_file_folders.rb
 create mode 100644 db/migrate/0310_create_data_files.rb
 create mode 100644 db/migrate/1010_create_tags.rb
 create mode 100644 db/migrate/1020_create_tag_taggables.rb
 create mode 100644 db/migrate/1030_create_categories.rb
 create mode 100644 db/migrate/1040_create_articles.rb
 create mode 100644 db/migrate/1050_create_comments.rb
 create mode 100644 db/migrate/20141208202946_add_infos_to_admins.rb
 create mode 100644 public/logo_pic_vert.png

diff --git a/app/assets/images/admin/default_image.png b/app/assets/images/admin/default_image.png
index a2f6d995ebf1fcc861b3aec016558a817eab917e..a89151eb9a99c09a7be932c49d29c4e47c2da175 100644
GIT binary patch
literal 28345
zcmeIb1yEee_U}KqYY6Thd~kPncN;VWcXxtIAPExOf_rfH;4VRf1^3_t9yxN)x!iMk
zzkmH-)vH&PT{X<CUj1F&{psCn_a2xbOi^9}2_6?7001CKNs1~zJYPRN@?gOqe%7W<
zi#$BR*-2_S0sxp4KObOH%H&4?03xl0h=`)%OIs&f$CtKt#8M(6#C8t0W)@ba0D#+E
ziH57H>c#Y8?I5BlHaEC(@RI1Zng<p}jtCth3&cZNFplb8&l}jDfN&@o(QH!jC~-j}
zA<+t`ZW}rjHfn01W_jkx9d=vSp|@{S^^$D~&u+2z#TWB*NApEzlnk4Jw~{APNEw23
zZ+j#l9aSdA>x(@N1&KV$0TI27@sQo!-Cytd%E|%(ezeiNVdO;ji(?qD5mx{-7-AL0
zK}JBR0pLStf}|-R`?+5?Vv;B{Qv=wR<U<^=9vA@kmja7zfC_}4{72Fn$P6;MNEEO{
zeLwW%-nV8DDT;svbe|f;udo2lFep-Bn-)@AdV1$GKuQsy2Ll5G9^ecpAG%GJKNnzS
zkzjRi+Kbg3LjVZAP*tVt+Z^h+zs6V}2(e5AGu)IUTLaqyboDfKY`Fof{AL-4Q!o$&
z5s0HhA=?xe(#T?DaaUbWB1Fc)w!pe*!5CR_{m=vpKcB`01RGhVVJIH;8OGAl*i*~L
zWA>nIzpY=rl>)*OILJpcz2Ypzzzm^4bgUFzQ39|695gKCjlw&qzG#w4r$PEbyea8+
zhZ_^APmpmGrbKegIk_YU!~?#hQXs`>*ipL(9orea<4VVh2M7{nESPYG#fIzBh!Z0s
zsZ8c7zh2ED5m1d5#l#orVtl{e+l{#LzT-C34e$+6-CRcw;=K4I`+<|ye8+>qRyd`D
z<xG?`LI(fj6cY$5L|ykLFhUlC6f5g|DOlew<RB;z=0zn*&>AXpN-Q{G4r*Ws<hxac
zP!iE&Nqr`_H^QOlp~v=+YPZ~^2)vR?;3VO(Arf!0{Md7TSQu~zpXWhX_|CmP&uR`i
zt=s8TO9Bllnvt`lSa7Tc#t5%xqbi5qL10FC!IFev2#1DvUKaPdb!{2)8tNK5G24*f
z_zJ?0F<CaejQx(VsVgf=wJxH9M*7U?JEG%D%emJsd4U!JbLr>M3Dem~E0T?4`c9|>
zf;Zy_pDqOO`z4yZ(>4;$f>7_X(@9c{N9>6lV!2LCgvB)t3WIK~#lbO1uVpCD2%O)%
z%9d9&FCbHesGGDejBOAk$i=-oSGa^wHi=P<2thSkCn3rLMXRK$#7u<TtE6(Q3&N9x
zgC*I0L<9)KQ&i<-?cw8aNRswpIb?U;Rv6bY$Pe2HzS8E_IPP~VfB^?&x*o8oPa?V{
zK!~23N1B7-`#`>Iy^GXp0?g9-WhY!ZScHLRgZY6y&liD#X7Y!!T7kuKYs2z~?S$+i
zMYBkR=66s8yf8CF#>_%|uIbM<>qkEutak|qGwMgi=|904BU2YVza@&5mW5IV6hwuL
zP$c^V2hs7aoD?4xt0Urwsv{JeG)<C>In+v6_H!6l*NiBXl9Uy34SIFgNEc`o(msBR
z*aqz)jBpj|I4wt#y+8!_?ese5cmyJ8cAuyNO_CgDZ0@>|15SN(G0DZ7vvs%=UiYXy
z^7ObL7}RRgG0fTcFBoZp!gI$9=%l5Gvil2Y3WMil*p#d%pBKK}$z2+g)lU949{q`t
zK#FS2t06Q^f-#q4v~kO$;eCtna^B6B0wP;5TBrX?XQ)vQb0rQ7wrM0y4{{Gl&x;;5
zajZ4Aw|$ewb4+|mv4gB;436xMFC3pa5>+LAY4`fPXI`NRO$QTCL>u32+^1<;d{)d?
zyjDC=%rLD(p+=!Xft72Q>qJp8PMS-TyC~iJj)9g>9anK$u}1k^DOwGadPG^jv`MdC
z>MF}2;lwZeV|Y|}x^$LwX}|D$XBtm6`GN%{_kzO0SEV~8+*)cm4T8?8J3dn^g%@he
z71gund#L9aH7U)J&2JY6Te^J;K7KSS!OV{@rBu=Rs9xlvyq`9w6U}Z;M-@)?b#PPF
zafd5`Yh?2MRLNxEWL`l+p+*6bYHR*dQD!ly1TCw5A~8>?#9nhPSiJRP&BrRUVl)45
z%0r7E%-I^NHMOU;LE7LY-P-e?<X`bke*8rLN#xVjoPnk741exoZs%mhSlD>qRKe(#
zRGwa*f`-hD9EX<cN1N&crA2u@=@D&4X+{Iv`X#XDU5`TvoEUgq3jAu5$t9%(iRLk)
z5~6&@NyeGwJYTu{X0RFJLE;g^T%o{rJ(0Q5CA-QM#Ll7MJVZ~4-N<u-AtF8g>$a`s
zC`mHUY`5$$;`5OV*k^dj*b>+>ku!MdtOsmkEO4xSY+BY1gE_sb^OMV}CJl4n>$abj
zGH`?@kLdMUZ=5ILB#C|K8>;zGos5(?pGcL&$h>UsGb7yHF+e(CR4o=EmY!R%Av(Yn
z?;PK%^Fqg6YeTc7`c;*Ov9)ok(T@`6K<C=17P)tF1#+oF1UhW<fO*n+-1#CGSsunl
z-bOi>ggq%w*BktsS2q#JIe{U8pFwX$da--34}q&dHe(ykN`gRq8T?)R!<Z>NJQkO+
z+2D$i9<68@qFM*t`8oyp1NkfY`BWPoOD+XF{q=?Q+m7y~*N4jc4pVAFYzxjUmf5?G
z955W2^JcZl2XhC{7F(Td?eDi%wn@%rcgNN&wv$%s$4-M2qBT-xl*?F_5DyIxua+d5
zmap6{KYJlx-frw}C2uy)*LpS$xvgC8uMu4*-5lT6TsvPo{$RQFJvu~WLih?b3CRol
z2^ItL0M-lN1nV8%C#o&2a+Pw{OU0vP)buy?Btx01FGXLvzw}I0*HoSjF85sdw(@1g
zdBq#;0IiDb0~t>2SS&4>ttgJfarUe1Yf3lyM4n8x4+N>G%_P@Ck=~K4A1z3^>^r*D
zo*l|oejrbqM2(oupH-`HU9(yZU-d~HOu^@<_c+OR+q~pDwuYO7n|S6z)g+H7ubbw^
z)5k8AHW^o(#!FGpekCXUQrcA7e5Y=*zF>0#aYEE0YP<OR`gelu9|o_ztG^YMzBo|n
z|EQb(ipBZcWYq*>-i87Xx1Kk*?R7h%xVUuBK_p6(ran@c01J(yu^Ev-P;30XDk`-m
z{TA9a9PR6vs@qDMs)ni`l^UiO>yYcJ8{fl)Me#&O9LXGO*IW7`hUSwv64T>a%LEIE
zv%i*W%A`=)(6hcs(V8W(fAda?JHjh`8skhVJC`RsY_*^}ikTou)J4dK_FmklwW~F!
zVSPVx9S6qz)iB0L6VrgtbevX<Os9-*irmPz5t}4qcJq~#8^^$JHmMSW11U4i%SLyr
zS9%Dfn0wm!l}xrPwh<|qY78D{&iylT5m8u-nzu*Ep|(5yoTlTIc+1y5jT=1IJY%l=
zGP()H1}6o&iaw<s1zClwoyvFPj>|m0tp_*lrdk7Y37&MzO#$`7O{>@ae(xJ;*l1;F
ziAq1z75cEbI$!N*Sbi+y(%De2HZAGbzM30$2JYg{=#&~%+;s-0Ak7p87F}4g&efT$
zCCdfKC2+vlEH!q!$#lnG2!#67)w3B{dPh0SO|gHgiL;KWp|Z8T8QblhBM9c9aq(Js
zvGk>$)<?s##N2w{CVO#U_cOP<-bmUDPlg{D*D7oJz0Eoo+xtbcF+WazDEJItUS0cd
zLD0iABOm<e-bsiG`GoR*=Gj@*&JC^uE;rr;E)TK-=fe2<ywlc9Me6~tkxR~X{=wKr
zuWB?sKf7DgcQ@avocasV^RN*52_2hsSw8n_X9vrhf-Mzu`H*z}FPM`qw~@<9Wai$(
zg#4S%r7KOnSJwy!Sja!V-OXpZ#GGG8q+#JPx*NRO!CtoCb7<RmrXgIG(t_)Jc3Ukq
z!(B?H*XnNEA2pmDki1xXV#{~mynf+7k8r?r@NRjkPRDs<OMj?!@2<LRBKvgf$LI|f
zAvtf|k2m*6+eF>IUR&C?lKV<i#uL5Oiwuhr9vz+xd{;YCGb()({!5htZ1)S7gXdou
zeWC80Ga0MPcI&@ieT~RvMAAR-+Bh%F6)3%5+6|b2u<c*QZCX4V-qoAGd3O;5W9DV(
zt$8taU_6nxrQiyU01ZRI`vL_Z2u560>4(JwR?RASgPzf$w5JOI2v<;nhugln$EQ7K
z2Kd30v!F_91G-otl9R!Tpa6|Hp%8DdVaKPO*KxVKwMrS_>1!|yn+Wi|ED*~-_{EI3
zxBJTl1`^dmOwwo6OIGZHg%g~>AOljY4a(03Qg@fJPhO1$^Sv?v0C=D*R5hJ6<z%^y
zZLJwVCbmYV3~ttT4>uVA0Iz_X9mv?y)QQ;0)ZD^`kMyvym6X`RgpX8%O^!*<PQ>)3
zg`|grsfvfZs<DTqF_#Ic06#ph8}~y1Yf~o>v75D(jU%@kAL(y#xgTEtEM_Dn{;i6W
zB_FBK&jyJ#<rIlUY#mIA*%;X9jhUE%#2j1<KsHt`AdrrjnF+|k2xMYp=As7zxmh{5
zf$YS89Hjj453hI~Ow72IMaBPU?!n?Ced*+6$IZy->gvki%EDmlV9p5S;^JatVrFD!
zrhlkG@91vh1ahOdaU}aa$e(dUO&yILEbN>tY;A~t#swMKIy>=^lKyPyU&kNgvbOtI
zLpF|ouzR4$=mxT51Tru&{*%bW_+J`3X9ug_x@Ka`Xli9@ZEEA>_@D#+qt5Qn8@qqW
z|E<Y?x&Ld!4|5_X_s`-#`)h6ek4-x|iMc!=_yg&`HT$R1QPthflu_B#(bn0)*i_8r
zVJKw(G<qisv%e<i-y;3={MWvlx>@`e*-y{!vfoaH-)D&TVXWLD4yGU{Q_+V9|HB!?
zO3%bj&&;LD%*@RU<YwWZWn$)LV&Y|dRP(P{{w;=_t%-%1`#;6t;AUq3dyK!;d>rH9
zj5h%}f&NEP{$BS{oZrS{>!50DYsLTjs`=|)|KV1jS`K7vVe|9e|Ha=%^+)}`g)%Yb
zHnVlG208ItScA+>8SQM$c^UsI{9Da`ol@K)wpO+d4<j_?XW?c1r{aH9J-h*-`1|`0
z{Gt|)c2*$wzl;Co{YSN^t+DgZ6(M9}Z0hJ_>)`me`F)t>-`2b^$o$_+|8!Vc@QVO}
zY+P&{Y+~Z9Kv7|KF`$qzv#2<mD3FbvS)7^kVIV(O_d~_MTK}p3t@PjH{=L^v_3Gyt
zBPYi#W#i}sdg!#2DE~tNgN20&H;BoYotcBfjGluP$VSh~!pTO@1p;x=vzah48yT@O
zvjNQ>`tu+1zk2pZ=s#QkBecmwXeKjOkQwJgKr;?@CVEy5CS!Uo6ILU7BU5G|3m1^X
zh=qgW&(MF9|3_#A2aAUc53>4Oou9q`|JuYqg!zxABrSf<r~4!DKW9V5)c)T~|C-O=
za<LuA!O`?*rr{&~Gu8Ync|TPB*TMT+#^MGU|IFh2jvyCP6JExDEBmWck3|;$Ieq^#
z#=pn^oBY4G;ri0l=5bPD;bvw2Gokz*>bF||J&2>NnUgEX!BoinVU_%EGs5p7|6TLn
zV;jE&*_fM}@H762?azY8l7C)B4@`espH>$CH>d4?w(9<WPTSwF1OKm2+wYV4?~Cxy
z-0`1_miOlsoBLtGKb(G`-xeB>m+?Q!{yJfPudn%Y;aWNWUZ0hf>EU?T+dUkAX#ehi
ztkwG8X#ehito=)>W@F*R&-_PokBa}M`nj?A{lcg6um?8fXJ=z$VdG_dT>My}XyImR
zr73FhaOraVnS7Yp9!B<?=&|P?m0Eu(f$R^7`!D6+Jbx&EpRT{{SAWZ$zn4Djh95TK
zjQ`q+|3_N=SK9kO`Qoo3{hy5bDAun=9szmU{DtdjK99V=a6JO@wD}9y(|jIzf8lxr
z<Z1I4uBZ7t^8Uj02*}gsFI-RadF1_t>k*Kr&0n~l=JUw=3)dqcPn*ARJ<aEl_ZO~5
zK%O>#;d+|SBkwO<kAOUF{=)S%pGV$bxE=v{+Wdv<X+Dp<zi>SQ^0fI2*VB9+d4J)0
z1mtP+7p|xIJo5g+^$5t*<}X}N^Lga`h3gTJr_Eoup62t&`wQ12AWxgWa6QfEk@pv_
zM?ju7f8lzX&m-?IT#tY}ZT`abG@nP_U$`CtdD{Gi>uElZyuWZg0`j!^3)j<p9(jM^
zdIaQY^B1nC`8@Le!u1Hq)8>=7;Q#t;tEtVy2U=YpKDkP3M<n_1saIlSNo6?zz}guA
zaLfPzZWjT7KobDKZVLd|dkFwA@dE&;Z`Svcb^rj%3n@_{Rkyi4y(>rjUiW<)x;6+v
zyG%~0WTm7uGezDiS&c~}joOvxsYFhSYD!l@_(0{x=hznm-1(gt^!nhisEh)JG27dR
zdk0V%uqt$LjXW$oJg3*Y7tMFkml5~ZdDupwBth6B*tclLi7m)ge8Qop0-HR;uBk+v
z-asCQV|DwvJ%Q{hGaW?x?+x}4_qZK4r>=td{$J9slmPivrk>!FY|mjBmiiO|+O?pu
zn0a61KO0`g_5xo|_;lHCbhvU~!3hZ#K?I3-mqHYHrIe_5=hJ4i`K7UKPZbtyR=~~k
zdfRBzn{Ek75O98am`s>F=bz;TeS*Zq*q(;{En@5Zt>K(Od&52Dx6%CzuhCsRWMh%e
zJl-Sa^eUk*V1+nSL=d2uc{Km8xDs3+K^`>addQPSP>#tY1mi{|qnB65^U7FeZ|;3Q
zArX~_!gwq=P(M@HuY&INFwuwXMASUfQS#kR4e1_N0LNNr6xJus2U+0_ohyj&7Hb4w
z-S70ky$sZjv)UHQSj7=(AWpkuj5Q#}4-_(LQmW!m*#mQ;x)N&k$EuHpHOlA77l7@l
zfSR}VHzf6gS6**e(+o%wkYzV;E-2WRQHsJnTkWPo{7k5IXZvlT7D*HP$8e8rfVu1E
z?-o{MqkRtE#s!VAu1+SL9mUZ!>xp#MsT>1sP(r7&()Q?d=piR*E0n-Bz*G%NWo?8h
z|GACMcORu!H}ufKM&Gv9=@SN-WxAW!b(7zqDsEh<>$qvUp>eMax)GL}RO01~ZQ~oJ
z%a8X)-OxG(vZd*eaMhIa&v0X@8Y5t5rD_-;I#61C%sjR%vhW*g4ms@dR*GO(%5g80
zZ*G0gY<kh?%-)qf@I!>lj<r$#4SsoWtOgYc65zd6+xj3!gXtDGWppqCMYi6dzzEau
zvk;)>EcJ(q=(f{Cn)f}VK^aT#H6myd!L_qT7Umj2H7^RfCM@wCo=epnR`qOCQ`U@J
ze2YE5UR$IEY@2Kr<MiX;t#3vJf`|O<+L`INzNKLMW^C<8e0J`JhNCDLL_#ddS4Xc+
z5$#P78wkn^(_mVmUD8x4L>NO_VIICtAopV~lF9%gQk8$1FmIGkVjgWGC7E>)ggS3v
z3wWJ(sx~W~oFf;n%M!!^znY9|tKm^7b{84z>k}b0mmDp)osPLJ4!1S+ukl!*ar5tq
z(D)inSq|pkKOF=o4PaWpt_b=2cErC|4y3X~z^W=_jW3cwjpxi{ve_ZXW0R<UZrryB
zvYCR%m##~w?N|*Jp1|&b4h9|>=0Vv_LYCk9<a2XETEc2Eguv_;cVG0^iWk5=M}*R|
zpEk=J3jZ+mDlZpVEEz1AS7Km{1q{FmD}>bOZym|G$4z{UUS&)3!R6VplI|OdlQ`^X
zyJvZ2s?PSSgD8P|#!>9Iq3Kb@FAg><5kf#|Fhky2iMrAtK7#(Eke7!@Xmq1i2(pTT
z1}QgRpEY*sEHXMDUl*QUQInF9Euq?Rim<}6p*I<c5QFnK4m;{h4{g-TAxoL^A<HM5
z;2>=A!)JxObi>TM-6o*4>!kirMJ5FM5ro0d$;t`We+&E76uHWlo`p!0817W8t<&ZV
zr#gBK8yx&b+X|({o&PN&YAw1m3KD299$icfs(P}qP~SJ8fq%;({D{nu<+*gI22@9U
zCHW^-gEsp@>U458Zzx%nJlt@kRaCg+(H}~xAz&gg9<bWX+llTL?6{SB@gIq1=@31z
zjkaRS$IbbQQ$%<`%-<S|utQEX+sO2B^zs!%hDciwci=uTV+yCiAj)LzDGDCZ5zSVm
z?p>ai921hZ(C-eW5kpSl9?4Tiic6>NkM$_I5kmJS`khQT6CU>KI0%4B_JXyA;Ro6Y
z%+-uHQob%L@8+}cYER3KfkBj$@w3jJ`iC3Wg8>j_n3#qFPz8~fq?q!xr#?CrToGF5
zg<q}k68RGy=tm%jy$N`~P3Kr2>6SK>2!*G~!dvA`S04AiTop1b9MWtNHsDJL1B);#
z_YTYc&QMP-B6MimN1rxPKG1hBW*^t<h6NlF(IC`KqF4zdk1|xjchQjER7&nebls?i
z{snEH6_1aINwC@S3TDshCJ92VvEpbxXVo>4j=78;tr!tUoTRoB(JF>GCo&U<2T|@C
zbTva9KC7MO^7ICu1lcB8;r&37%H-<*q7DbO@D^inI_^xkj4}Hejv4A^Q5kBUlOQt6
z>AIyOT__?O_OcL@6om{eb|B_Bsb_AVJNv+#p7@WqKG6B6dG7*V(QZQUtOjB~XMtu&
z%=F_G?s;(u_)x5zW0-77pmnQN)?VsK{ow<H8eI6)bk&4nrtgp_AEQKJcGxP406ywf
z%0!HURLgMRb$dy4IF21w($^s%9hpIlF-pS`3?54X1*Ksy=FXUVVgbp^xl9UxCSr)v
z3my=(DIUt50@Hml7RqZ6L7f0*l{nqmPeXXwbja%I{;AcTES0<TPQ}bqW5><Yn<>yj
zkim@*z%u#T4|X4DOHrXAJj}l)dKn_W*iyx3Vw?<&A@<92dQohG5OsbsO6M98y{%}5
zi|>&v2Ezw|dIJX!Csxv~KKfM@Kk!(B3u7JN%OXA1&vsTxyoZ4#l=^JP(p)5vPLwz~
zBfhY=r%SNq1;6#1MHqZ<(Y66c#AQ*sY`)$l@XF=jV@5q4KF6!us!eu=l9IHf;^N@9
za`P@1gth`cb{9n>HuoFT=fe=t;+&K_JoccDQ4ug#BTY#%KYczLZ^hM4@R|)0@YO(!
zOMD37$n7t*Go`v7B!t%RUpTCFQj1IE8En#;FF6!i&yP2K>(0h(&npZvq1gi2UYFbY
zJ1mmFjg-axSWB&>R20x{r^0S0NK8U&vGG2^$L(x9f=aVY!XR?Q!29e_|3`0k@fPjy
zjC2=mddd(;Zb{`Oe~B`T>SPQOn@U^oXis8k>t)~>iw@Nr>*Zl<-RpUcJCbgb9xXa%
z#cX1yE5(q)3cy&yd?lRKnh?sV;apsYE=4}zN0mltx?wZpYU}Ck#q}#nB?tXfP#dha
zxWV{49N5CXfRIEQK2lgTxsDx<*KP#gi;D8fbUjuev%PCK%UV1<tecanh;S<=3&MSq
zq{=9ei_!;AgcWEgg$3)p?yjD-v>+1R52`S7q=Ki~#mt`UXS_>Nq@nsmszMzd8cwGL
z&yL_6J52^eyd(%h9L1`wwhwFkwx1f(=Cc+k(c6r_+_1;Y#Da^aF`TwUeo<F<_Pr!#
z>0=vJoWb(*fmKBF&lj|;WFk#G^fZMiG(Gs$vR#qSkNu;klWZ(4%|GwD9gei#?c8An
z>#Wj{3(?4+O08@md2mTsT|%tz4CLT`R7QGv54W;9&0@Q7>3(&pkgjde^J!&QZD~Z2
zBF}PAJh?+$pIRFwYzly=H?l-E6Gv#hOk_y#szNfH!s3AE6B8~8MPGRX4&n>w1NfOq
zegmJgzCa0I`elREloOq>+2<d}auB|xgybNzSelw8GINRb6RPqgKq$e%x}BJepekmU
zZk_T;wH=U^N(p`d1klfFcQx1o23=-7E9b4MP}-%U=x@krp{d=)kXT<25xv&6BOOhW
z-FgEot4Yc0G~MX$^m`di65M-Km`DoMwq8`-b;VvsA6uVFc?=9+Mt5d2g}gu}L`(i;
zF^SLB6*FW(G&<onIT4c)FAngs?~R`yk$2Y4ApZc87DAw>T&R}E;7M2PHw$Q&g!o1i
z!GwyP53SBoBA+pD<X6RH=)(bvPM5F;bDfpr^GSbVshx}$GZs{FC;d$bQtd@s*6WId
z5wc(~D-6t@a{>q#0lv0)05h(ewuV&6C}9RV|674fOrf|X$Vg=A4eXcwH!kL@YDjym
zptIgK(JjnZITV$(llWEM&<#Jfx<k*z$f64q<)vxy%!kwYoB5@RNP?(tJm+~(h<F<Y
zZtO-8F#U{)%0UFh=-ZgG*SNd+8cE>Qw3nUU31a=H;bsCPM>58oOl^6XN%<=8v)jWj
ziK7}A=95(L6byW>I;N+Xso~o+P+IDKbeF)y96+l<gPvnFHedL)CAL^s`1aWP+atd7
zr89r|LclKa4labmLh4hfUV0hLv85>MxLjy$qWcPi==MPuc6y`7+D>kQk%@^v_K2-M
zSF8I5qwkN)Kn0)L*83oI1-e)CgLiZs`6g4)n1|KfO|{Rb*NE||#I)&Lp<ZPLilER6
z!d7%~G-nl(`mDTNSAu}OE$UD5q>y`9(m#gIBH|}>`R^C5w;d1fwlx|XdE%Eqn0F<*
zFP@7MD`o6lTfkaBe61YA03@e8>kTVzq5lMnro$CqPn>4BDkX^s9W7?@)S}!4w>Zyq
zUdrb8Z$*qhE)Ag)_A5}`Doe1s{0^MlmJVOe?FO}eW0{@8p0Id3LlaQLcN;}9Jv<h4
zISP9HBIsygN<&vOoy2D?cXOHP7H}QVZAM8-hIK>LnE<&&E<q@FQ7M1m5=Q~3FO$A1
z1{Jx!6!V%cX~_J>XquPaa%;5c-C}pJeVVNCxk6%wVH6xMDHBP$-=5d4#ZHUS_>k^-
z@EAzhLt>AuHqnCxM<b`tL0~$I+Ck?PlcwESx6v*=-|3{Q_P34A(xpVBUb9Jh;b`^G
zl!>`19{!bq@5Pduuog9p_7G)zLc)ZM!%$R?7rxu$S)@ujOyz6~3Es7yUlr%PN7yW_
z;az=5l6f=i<lw9O!gPmVb^QnRZ4Gql4wL)qr?g=ZyEe*+ml@3g$L~U6BHZ5F2}8CP
z4DDo$k%M>id_e%#)F3R+)qSR=!S_Zbg(VJU9`)9N2*tCA%xalm)zJ=pHp%yW`8|2u
z61HhSLx7+MgTphh>e592ujyRXV>ZmggX6y8sQ8wbCBy{LvUhVkNxO`<#JSJOroD~V
zwrVwtdg@^IMFlkK8~U-J(il-T%1+jL-oMW$mCodK+FQs!^R2gbuAIILMLr?S*z&t=
zg4<=%)Z;sC#uE_me)Z#fLDk{yaYCSTDZ3_zdwvwHP&6z!4FGgUNyKc(SkzUk!_0OV
z^jW&kj^fC$BL85iafm*{V??;S4B-+>`(vdT{-!1hiIp|4^XZ(<i_*`kb}tBNJim!Z
zhFq|-y_rlfX*D3Nt6!I4C0&{f9lYXnP3N`oh4u7|3G5J01ky3GE4g@oW%^BxQ>647
zNJh3VOxTopw8ckP9ko{kZwa*2ye0SXVZ%}?R9}qXZV_xdAI?6<t8G3F6;U@0+3_MT
zey*8L>T_C<JhK!|)<snI(daZx!I`z%ijrD7Vg^kC+Feu&g&a$rc=+ImO#e!@JYKM^
zogK-|_vpyxhOGJiC>oZj+Tr5z92rGdhwl{n^%>Wy0nyy03vys#ydRs2f02UG4lm-0
zfmy(@*%uWh5@%!jeS=18kETZNR;1$?*V;pY+ak4>u^MU-v2@1Xk#6$ydgw8X8=u3$
zqhI1MrLp+o3Z6^HyqbZ%8~$8DL9q%-`Mz7D(CXH@aWtR4j6UVUl`mLHj9EOvzI3wC
zXrDaGt-3SvJe4T-_Voatsdc@u#ck*erKTjC{^b5a^GLXZ%=G^5{!RMg)mwhRl-g8>
z%WOr9;O!aIs;6qUet?H@fSFTFcp+UpIT|eg^ImxiUQ=D-vy{zHLHaFQ@5|)g#`&e}
zG~O>a%P4m`uW$v@QVb(<x!SHrn$#L=*wa0JTq_JbryiIPonSUk&b>%`=FLDY<r-Mk
z*FOv1%ZHdWWBMsf%BNuVVbgOzQgZJ^a@Y5^*>(ATYG(d|qD;S8VG^aR^BVP7r9_<c
zW5rpIR9C8seAdk%jD-U`wgeS!T+7=$r7T=GYhhln%sDHT<K^@7PS>Ry*Gf&@dh0`8
zugzxP#`_}~bxS4BHyHxcA;pvpK_R)y@5g|PF!PskyNGW^cK}M-e)Z2;iHY?iTx*lv
z!S)w!cw$<8Hk%Dv?#FD21nxfYj4Um!#qfJy?7R9Nzcia^k9(H3&J>(MunRMPHAKr%
z_M;2!I=H1X^TTY{0Tv0<Wmtg|Tk<P8^Ga|STBKOdn1LotyfdliewI-aPD=ZyJid3U
z11KCbjA`?APUqiy`unwEXP13X&dvipQ4SXx?-PCq^;t!{Dhv+Ge5*%fgEb=Hcsi%B
zbhYM-h~TB6I$O2auE}K-+&AN7LeapheWEKy0e-}{8n!coQT`gl#0hr6CprY?YJ2(N
z2J-7tAkPKi!kCFj>ieR__yqqm@MDE|>ajN4nB?nrbFwa0;_s-yFN8<$t*>f^Q566x
zP9Zs<8Ph|y8OY#VRR1`S>Kcy*p6QU#m@#Ug>k4`_T?_U#GCB!}%*+=_qzkrmh<@se
zAPsTalpT2OEQ1Lr&LRAuvB*0lP^mT}eEC56F4XF>l>%tnBsqblR#l2sO55HTjWKsA
zKh%6awqj29t4C+@MADwR0aU{|#-~Mf4TWa=wY-7OYw+WlWkjH};l7!~o0^JO^Ov1C
z<SKOo-Gc;{nCFcaB2B<0Z!T`U;3VgU&*0QGzSjpk{d2oB@zG}_t1NgiKCq6eTvII=
z;3d-EU%Wzqp!6?^AP6?hFN-}K+&B?J<9yeYF#UnWcqv{DzGhK%*6RMJoWsZEe9(-u
zcz+!AxHof-t&p=hk3xPj$%jdF9}2n)zmrmEz#Z%;_%2JqBDWq&!WuQ2ULT1Qy!ct@
zA)=|n#%ErCLp%7FZer=NNhUVLo&|9#U(k-x3o(Kic2G?2za^ur{@m~v%T~U{OQb_p
zr;-SCezr=>U6yUr_C31vIA&@+16el{+a6`{aEPe{RD0)|Z7*L}?!3`B<8!iTX<M2T
z#s-Tc5%aK0Z81UxAdexdC1JcJS-qX%<6nOD&t!|D5?IX~#+3%XOy?74oO1;2_R}){
zpzf)&KfiS?Yfbvdp2o4yg6x7{E>G4{rFOo;b<R!VwVYa)*R7%IpslHw=lXDmd{7I&
ztASGPbL6nLca=P|j9-a6+{w?cNkn{Cg00e>8X=@3TcU6fo$`hmx&=ra8C@0`TX_)d
zXHc5SqG4k|cQ|mQm&$+-y@ke*(s<o3BY;1(lStz8J`vM=#&MyXU*Z;Fq-A>lV|@eW
zTMM6R4fLYnH$e!ZVmh1fT`WK-)GrM?!nOQjL4J0i-5uKHD-x{)v&c)YuX528(|I%E
zPS`Q2hf62XV$Z;&&nv0G+h=x#py_i`MZEl+xvF4VLh={qng&69B3{}AdhPZ-9<;+A
zuU~(uPF2nhx-Y6IKk%!wgVltOgi=A2dA>TP><_5%?RK#_9WP?Mmn`96FF(G#k90oI
z=O5dtxTsJfXL)1PY9fsS)-tH|TBrlVc{ScF;dlY9qkc%Htoin$hx|V3465iV*pQFG
znYZg8A@rISUyL~?vgWgCMam+TW*1DgAAO7))fPST`saRI_i}#G+X9u{W!^@c*ACx1
zZ05v~13LSCHPkTdS&x#W?!?!%=aiaHPqJrqsYq$b1&~!Cpfe27wV*@GmUEo_R1Lj@
zFA<houVTEzOMKR#`#3i`QeuO`m3qyEafaVucMPYCST(i>9TcJ&I*rpNnC<LapvFg@
zZD(In8Z9bAAgbv?-3qC#clkJGqaEaC$vfgOt_CXiiwpABe=~X6yXCVNrFq|@vqe!~
z#h{P83H4G=v>$a{RA?~VEgtsmBpg_a2s6uwXA@I(B)a>}bkBw@&h#33kJMy>n5XVr
z(S@^6$&!>8H!|(Le#fEawi)4WliK*g?z-PC;9+&}5)2y8>8o~s$a)s*YU*XMzH$hk
zXp>2Z#V!dPh3Q*k>%v1kJ3_UH`c7=9!E~x#zUlP?a<}*L_Kr=p-b-t>&n?WPAADd}
zMfV`)Xcx6hHA`NstaV6JfRsAsQamWIU1BW{BNrRlkGvtBvP;HZ8+>)+gwV(oVbGjB
z#nAhTxHJMvGuq!4qc#6Kax+?f<SWJLId;?@p9=g+m1WgS$lZ|5MfFHbRehvR6HH<S
z?R>y)kq5l<QDb3fLcrvA3iXpUN4y02a($fF^W|xW6su>!_<I0JA%y761(9-yI60F5
zRUZ*`y{=i;&w*x4l;7?d(tNLVqR(bGs8toCXE!TfteSAKX^9o@4ak!a(yUJTLzEyf
zHkZw>W*8GL*Up|f9lTIGe^ul{V4WSHZKfRY49;}bkgqG;?PaJ$cPAv&?c0(B5ge(N
zZlIFgLTB$+xl?gmbq6$>Za)cLoqPzNE*O#LxgMkG8BIi3%pUO_9W;n^rpHQSMei*x
zNnB}U$O<}R+_+-qIq9iix6j^5XjX1;1NVbdjV}(-V@`T-5ib<pgs)WS#YeVev6>26
zB4&^-5sRj2Iv>|}N#CP+LyNPzHG2~rU{pG1p$it%vDB;xqbLcEdSi6azVOdSNa6a@
zu+m7HGqzw@JsGf0mzVz|7Jgib0m(mr{q?1xFmK*HWCd=yTeke*&5CEf#4Y{U_o>+O
z0~|xN{L$wKtJOqsV<f?p7px^&X^9um80um$)O{bf*vYdtW4c7E6OMrxtKA=F0yG9l
z_35j}sy^QIO+&9{xN4s{JB8r2l%}Irg?>h>$t2cCGkUjfnaf*4Q8<%=9QJJfpr%DF
zTex(L5Dy03Q<WL_hDma$$1XGDlJ;G}sO&4YF|M*p0_{dgNXXJ`11>d4+vu(0<|VWb
z%HIVO?umm?J2Wm@wwSfsS~0k+?Fl(ss3$*Vr4T)*f>4a-ln@-`&iJ;k#?^)5nuS{_
zkJ1iapqdLFgl*W)oYHzXyg2WAu%tg8i30I8lC9C}3~-ju+cy%E88t!6w^m{pRsK3?
zJ+JaMwz2R{d=Mb8rz0X5Rr^i25KDgB39}@<uH49|9PtkJ(71lh1rt7HjiHd!Oqc>>
zdKd{*m?umAgtHU&!6e{#6g7s>@U^44`438W)Ja_z^J0lb-irVqDzK&1?K!d#V^}yZ
zE$qy!HPiq_B#z`*m;t)wDx<V2<s71<c;w#l6y&q)ED<HFB;ipaU<5x<bLKq_O`n@-
z3Pv&7J~eSsyy)u+M+yvKH7($w9cQ%c&Q4F%^IiHIx=r@}YKSaU2$g4VpAF5t6)!4`
z4|QQL2}Fb|KNh1=$JV}nJ4C3UPN}JV?0W5z3Gb&kzDQdT9ejp1O!-!Aw_voF9l;TN
zUmthRHKU80d1(=&L6Z77qmhANk0BW5)P<-fs1@hH^@1?rrYwE2!R>B)RKy`~go#df
z!gebIx9ho!_xVL`#E4aKI^)IS;v(?jw;6cE`XDEiJZ$$$*1kxyQf_GF2z))2LHPG^
z%q!(}FS5r}U?51k;zE&MjWO`ge{uiBtwq~<`z?w{;P!fHY3U%&eTal$@=DoU{FSq_
z^^ZMF_lG-&&S`WAhZGN+3r?^K-n>Gt;Z{Rx8+q|dV>E%$&j|b8>V$6BLRw=92_ueE
z>G@ERoVa;c+|%Dj8V$VVar00+u9F;BOo|p;nr^frz@M3;z*$ecYxtB?Do)TO3z>i^
z>?KtQG`cX!bkmf^CWd_;(#@Hy(0cjsZzzzr_^<%Aw)aZL`_vHzyT~H%MOh4Aj8$(o
zu^VJ<r<BKc*?kw>if;cp9&I;3LYU>^pPDL>?&Yxync-a<!++IzK1}ABsFCnta-$q*
z_`yjrY(R$GudbT_lEen6;ZPShGpgfC{fz3R+(}@}QvLnc12}O{>x+YB_j`p_Yi9w(
zUAfp}xn{C12g6ljNg-_{H+&Mp;!y~(Vy0aCb<YFid)LFe6UgJ{^1I~ayMepAX9SHk
z(uPQ@4OU|?Fg;^81zt&-HNuSM-$Fw^l8Vp_leks{*-JT$viltN9n81h&%_9L9|rZ-
z9-W~G+;x^M-<gXIpP0Qv9?YS@9~${4XP*3yq*25oINTjyOd#5WI!g6JQUf}~vGBMR
zsxahd@UNnVKr<^_qMJkCqsIC4X5X^{EJiCmF7KVaAarVlnz5S33pdZ3mBq$%pOY^)
z^YbWE(mP7zY4O;4o&3OWra8u6pkJBQqn&SVrVy~tI=igrh}!w#=J3NGtDy<ts?<;S
zu|LQA4n!EF0NPsH3S58fT=qR$Ika5J*Jk;~jh=svds;~UB`~Gp+p06c0<TY8G*|0T
zu)jGpfSKxfuzgnV!bn#V1RoxWY-O5<NH$*nMmE?<-37~6q=YP{5A!Fj#H4Ap+t)fJ
z`TOurbQYJPjqUDiG*QLZNNCdeL5K!~LmM_^Rs42p^&UH7T41mr!HaikQX&SibM(L}
z$_Y&_R*t?fZsr5-q~Y6f?%RwO7j}F3wFjT6Vgyj6ddOhZdt$go*w+nqkq{!T_8v1;
zGL^k#EKkM+2je8nfWaBbe!bi2#y^v=8`8;lpnEO*$+ueItCcFQG7dUIH)U>MUV9k*
zD;!H8xQlA3xL$Z%+OzL;nb}a@HFSPG=cM@qEX=1!n*J1t=cZ1v&;9X`jETQ_#^A|(
ze0|hgM~l51%mn1N8S=%q2UyqyC0&@chrQu92yo(H!(oyD(=jjU_xEp5B_oa`N5HEH
z3pT>5U|Nat3eE+_a*@kdC1JKAebAQ=-Uy(DFv}0&j_w|V3!vxGHtye2OtYw&iXolM
z=4Dbk8O^Govr_3!5mp_|{btN+=ZZCk;vTB$&&S;27ajtN*z>n&;|TXrdgk6k*1uOr
zLWTJi*5wX#hui5JA&}gMGN+tQa~VS`)L0Q#pzb2h4UdVxIZy!HIOmTOrGD;0Ir5%T
zL|1UP!HQ`R`&br++HvPoYqX}n6VRd>8&|IY71zVmK?Bs}tXGblY6vg&746**XzzgV
z;er5v0a!E<oRUytldUmYoX@IQY+^94r6J@$fl6FxP4@1u``GnP)1VI{n%B5Zib*x!
zzyvcUc~Svk<;BI~OpZkMDUnJzmBb+4BofvVOF#oeVBd~V0mw821+la%tW43RZP(c|
zX270{TMM!7L-!b{VUSO|W3Yaoa9cq16@cA?r-sx(Bz&$G2fsM3U5(J2FASDGJr`CB
zdD^F>7UpLVU-*u$`&1NZIaY(*xX;Td?Et4Y<e7C4Tp+R${u`N6Y$<klMskhnuhpQn
zO8gKw@6^l7_fkpb5td0z8S330R=|BGR7(*(wbu!j^q)zOAHERWjEziN|1#mLo?P^p
zBigC(#--rYZFvm{J$3BhbMS_r4>bppXJDq-REMBgcbU8xyi-ry{1uKpRkRG*N)!1(
zP7U6y2z9$yQ47Z2_wi4w$hnGS@%v>RXe+RMU%G{eGcuQ?H>!;X$@QlcNKd0*PXz^h
ztYWazB|k)4VXz`8&s0G$j>$bXW;)AW55h(I&i}R!!)yX>BQ2bz9MuDR8!7Um9wF0M
zsE@@G@es#=W@QX!mp2e`T$k-dY!DPof(>NtIE{+u%9x)yHKw58zK%ONwFKik#|HII
zF9_PGFm@xAUY*D<`AV2%AyY8nU~x<sXVPoK%cF>6xnHnnWYuIKMKnW&Q8hGWtLv^C
zDuS!N)GMAj3&EzckfFE?cZP=c?08Xdy0=dE*>QTsnESn3!F;#MKaC1k@`f(SKchIZ
ze8}GvBpbgeYf95xydb;28*Zu5wxCZmJrTDM<T<iqmBTwTYq)BR-I&<}LhTfG9YKq+
zT2NvCfP9l1+y5F17LJ6e?i173rSLEs#_EpLeU&2gxtM_WT?Ig|_&btRHzQTuS(7np
ztX;`ieJg2GRoNQe^avKiE52SSaYCx%aO{bS7V(+k&ZdPvp(tTFMr5|3Jb$UU>MpVA
zv(vAdHv#c}?}+KgqNhaD&$QOCucbnqk=1Jk5HG0>`-s2|ojNk8En4E42N2`8H!0U+
z6WLBA6;;7K%05qEmkI39(_^yOzZP~et0y~Ui^Yew09Z145Q`WShqqXnfRPh~oPIJC
z^eVyoGGQsEQrE^L0i}ozwr~<5h33enYFHW#N{njA;q^L!`nYmqzgHNSMb?ihRW8Z!
zc}X&og!F5*L^p*^HV<Zr9orzFWLINPhh5&F(~kO0J2RDEa$OYYpr@MrJQY}JjB}r8
z`(hAYA7$V(U4IX16cy0gm3vQ=E6>Wlg%P@&{WJLf+67E?W#H^rXKewg{rb6eZGyL?
z1gRa+Z9IG!3g16kVObMNnN%&u*yrNDf^9p!+pE&5*bk&(fiV>r*F<Vp1VN%vK${i3
zZxnKZ<VCdZyWISOy6>aQehC4onQgnQ!ZLrZeyo;OO7Uz2^tF?d`CG<<U%79VunKA&
z9SW(J-&mRWdfH16+>6t>${^&gmt8;3oj^!CdCsbCCZZ%zdE)H$??8o#`5{ZMSX<M}
zHLEff6z%eZL{}g(Wdc~1-`Lin9|zfCi~$FfExy9(Yoyw9=JWDqcF2y$px4-xQgtS7
zVhoWH-ydd-%Bq`CO7OPj`-?Im<=g<|1N?`DGT+lsLk!zl9qmVFe{v*bW1ZCQm)hRP
z5&bYXvK@A}2yZBXd|q{-f(srDdkM84Z2bA;Jr^p)dlWBxY@K5W=2d@FxTpa&5(}P^
z2+<P@(V1~g`l<eoDz1R4)%GuWf{{r|A>ym3>6k7Fezq++C_Uv_8Q;8Wnv}%_1$i|v
zg;HbYXJX>te;P^vJFX<i-h^kFp7NhYmFdi26Gs|?^2$bqNNMJX24ahYK}?RLN=uqU
zz8<d@#Pb?W--%S6iWv&y4$%+wd!4ryF{h0xvg4h#ZPvY3v`U3hAJgPNA`pi^j*W2H
zyW(pOL-o-QpoWa7y@eU%$3xSqL!Agi@0i#P6J09`r?F;>*;|e&@)1c?uIFuC;0IWv
z&$qBAaRo-7!=5P$L6V?^B9gf3L&OHF!oCxfIv4XqcwP-|b4Kij&-3s{DvC5#8)t?_
zr};xB^Z>m@mdGX(w&<C)s$eDHq)?P(CB`uCJVX!^mnbiorAU}Pr22b~F*gy^rV7D{
z6QStf24bd8RrYawYu1of&(v>R!{JnxwnSPEw#;~H%Eqg8=n^!t9-zU~3!o@3nIgJc
zFR_w6+Hp8KO!ozklQnb1k??%jt2lM75w#v}EA*&$*ORaGv(|>FS<<n$Uyw#gAyN+q
z5G#7&PRnjucer&zTB>9{+X(BxAemwib@9J!Ypvie8|Bl$F1Nvvj_!~uN4=PZyPzpC
za5@AKO>1@}y&vyYHyIQ)Or_0S=lz0aF!~LOnx|*mrIc*DFusr`k;(M917(vWk`;Xy
q{y1uh<CN*MX8zl3(6KKB;Oz@&G$;SG`k((LLP|_tv{cwI;C}&cUdJ5(

literal 6483
zcma)9cQl;cw;m;o5+xxfh%q8cL=A%Iy|?JSGotr4IuSi;7+v%j(K}zF3=xDOV=#IN
zq7$7v-|ybL?!Wh}b<SD)UC-WYpMBnQ&hxz2)>OJrN>2&^0Pd?O%j@FiEL_h9;^W2u
zDIqG{MB<@r><s{rJ^Z)h0dn&|003z?R8CG?+sWO>-P_6CgIPsRj@iS@-2v)ikMo<Y
z&2rSvFs6?gKlA-WP{lyVDwtMEIE=5M`8>|<p~kDnvn^2VuW=N~OCW8XuY4s@HUK0b
zo`iZp5Xkm}K%la+2E<p~AZ6s?|Mm=Nuv^ukua#eYHh;BXNxXEPVAt?Mmv$)Y`Pv7W
zp2)UyLcCQ;BW)r&@tL@OQGvp^IFj?aOAiJ@!2B2LVLRjV#ZPQ1W7GulgyF0z$s!EQ
z$$;oGBQ`^T9XnuElr#swNE`29-SdzHpg;zY@{Oy-J4lZ;0*3RZ#Gepw=m656J{W$3
z=f?t&DG<@e`$9+XC0%v03~<E^;PuQ^#{Y5!FmiMpPXjQT12$CdGSV-3b5x$@u;^?9
zDR=P!R+kl<Lk;rB2X_X3273ojaseU&G48AY-|(NRhSBo(y-nOaPWUz}6b2|71);j<
zd<ovy4`M~V4Q7;+Sus*pAH9#t39p9^;etONm;8*gel#3moyEzbxWGJ`D`@@k&056M
zi(yf`H?hW$6#BzAlLT^#UJWdY4(sh7o_4aTl`1(rW4Zfc9Sfd>C<rt_A^~3yh-rqs
zX#q>G)P%JP3UbS-&WG%bhkr#<Rn7b|S+a6;Pr;S+>rellP6B*D@$mIBZ61CIDL~-Q
zJ33nuy;i*I94YZtG~kZIqd_~5Yn<Vz5+F@L_Iyc>;gT;>)MW|a7$6-7h-P8bi9?dd
zeTa1#;wL_?Csg40O79{q+G5N8cL_jI%*5{bh|c4lYg^3KZ+S|KB1$lyG!<dg(gSf>
zI3Ke*kn3B7$Fr_DfDJyiO8>+6^3Ng9yxw2*>y|`wJp2CsiM-I^YtK9pH8Ymk_nq=|
z6KY-0dQxf9<c?G%CNmh-I?^QVK#vtP+20If>?GS0%@o{NxQ1`+o&;uf$u6+G9;UOC
zx<@0dkZz+~U)-j9&9R(8s7k7!X{^jyo}u%cQz(N-m291;Ed40$C`Yy8s1m>W{&W<*
zdQy3ORbv%d6<5{zl*E*n^UG7B=7d?L8_m^8AE<$#zX^~#IZG8T$5oO!QSGDz-GsI}
zNi<RVh?%FmDf$-^qgJ;bpWt7rUK#{(cYj#W+%G?S2_komrR__n9;4!?Nn{yx7z`bJ
zJm{-Px%x1DRM1L{k06IcowG63cyNA1e6(vU<U6CbuD*bdmm#TP8pr4xliDV=Dw(ZZ
z-IPgyT9W<Xk)1-lfRUOJ+(_v2@n_=C{w~77<a0?9Ir(E2KNk8WhkAzgY{E7wy<doi
z=0Wq!#-5M4X+GWL*?f{cBD7B0PGWY?pSCqOIQc5>N+qYlrG~NOg^tB1vtqM~5c7-7
z__X-<@hRWQGea^3GW(vR^(?BNSLIe;R>kYlRU1??8SZND8m?AhYGP{aYijl8YW!4o
zbHwDZdJ@v+B|Yk}ic8T`H>McJ{^Qm6fog%B0h@smA!3V(;BVtg*$0#drWY{!ZTeL~
z8^H}{J*T|M-&3EQa-CzH9H59_;-3Odk4HGVbtFsElxjixFSjo%Q%p*mqfLfQ227ew
zTAO;D$eIY6UN)nh(Ql=uinoon)qmxbHfn5kjg3rPPcW4ZlqM*F>0w&gQ_WLJQ`|qX
zRl)kLmRgp)%39^E#`}2-YA_90acJyq&<*Ocn@F61H_9jKl*p01fJ~53GV;Y&Hkrnv
zacwl;3?JI#opsIfKcGhb30qR+RC1tGzkrvJD!+;Ql--o0i<S69K+mD%YA~BB8-fkW
z#-L%ME}5H~GnmWss`eGkq1^tFO_qDh_@4+-^!!{%OJLcB23bc;jY9c=L4vT_<m9lx
zXv4RoTw3V5OQu`%bTu~DVb_7X8PT-&WqIa&W)1VFajRjvDc{P}$<+PI`SamSbp2ao
zOX7{&rd_su>&RYDcL%HzRt$@}F(p<bu9u7H(@;X#7Ok=%ZIj&xjg!=vT3zR#uos}@
zE7mnNG#B&C^VY|N#=3b1dEWDwnu(cRAgB>s=DZyf^C8$r?fE`efA;<$JfzlcXZr@9
zqHODsjfW1a>BxQh#a+?CH*4*EjVQIH%-^Rqh83;FtwWuYSM@)YIj9Xt3NMY$?au$4
z1+Kr{<T{hszM2@vx<^=+N)1R2_0IGPNlP$`6^SqDEPecE>K|AHOh!}Yo=no$rll`S
z&0n8Df*>oY+o?U;*+1_Uk6Pz_;j~`2PGL9FOx1GwsH{nz-{!UwrNWl}DSf+-n(09g
z&$V^5asQvVhv{4CPuUFBLmxoFqEZd^r0(B;a0XX|#2qD>Jn@y96&HKe!KwJn!9?Bn
z2h!+nW^!h%t=^Mt1<}9LUx5UxS+VxB>ODKry8p4m+Id{C0;+&=(|QG$^uH{7EcUX&
zAuqQ|;Emw12Mag9u&4Wqp-x++?o=U7TGO*Ctv~Dw9H9_u)n95s=@RK`>4oJ1<r(GT
zYNzVv*|YGCe1ojN0$AQ|@f!_AkHNo*DLKnIoiB+SZ5o{$b1?5Q$g=H8b?EVn8)I+B
z=8?~K3JqhJy~bBR_R`-C*LcO{ZHXdjLSocCh0x+>74r!3x~}*xEpM9*#)2AQL$R}M
z@sU8T4T(|8A9uCkCd@oex$Yui!`Fy=l4O1_SRb)*yO`KDIbli)24oV>URZMvn;j_?
zn_EMdugdDx7_zpwO}jo{RTLHerRAg>P7uoqezAD_@^tg0(9}=_G1IjYT>t6Z>%F;(
z@i01bB{Ms${>~o78&#ug(2Vf2=ytsiOY#}rZC-eLmQkI#k?mIpZ$r3sTfq)5&lnus
z+Vq4GE?0`b2IrIV;cPBqEtr7g+)>LB)OUCNbAu_j32cMS2(mV<7TrqHI_-j<vuL;(
zsoUyZz)&}pA|{&}T-afb3uEk^Hh#_58<(cOnVR}4)2-M^Y<@7ynV?~(p5gv9wlfIa
z&g*Zve+#{uqc{hP7}&mPEH!9sS!1TyU<$bnUfFM@jCtZL_9v)qBX0Nuw^E=|!cJUA
zpfBtcdYX@1NofXCN-Rt*O?aF{@4m;f-`6t8n-poj6x=y!Kt(woji0>wPH$PDAu)#)
zY}~qSZ}WZyXMfdNK>0fCP<AQCn_H6GktfJPJaG7C@^A!^y;CP*S=G7ibNU;s8OG@9
z>sH&j;k9c7H#L>JI{%A8ch?nmFNdvu8%>29x@mMwhrYi2o1YAQlJC#zUw|F$xZ1E-
z=#IEb0RLp7k<x=1{Z&5GSucDP_RCMqzhL`lzvD9C`|1^TWsfdw{ra@o5%X{_y`h3g
ztENy?{56JQX6|pu_HhAS104Zx!fpBAR_?kVmQMn?LtxFkh`P<B>(QmT%>Aat-B77L
z*qbo<yHZLFm`L(b*yL@~X5-Fg7H_>}0mYAt@8=y`@PXFYed|RqxdSD|cX=;rKsbK5
zx(eRH9#PvNpzgjEC*`RQ0Kh+098pYhR2W#<h!4n%$WM}Xc}g`4ba{x+CL2!7EDMw;
zkr5M1&I{vUADFP_NHC}T`JIS(aR8s3Y{?Y4v?P7AwAA`M+>6rbnr|u!FC0Odv7OdW
z^3LJi+t|AWr8|l}ON`UOn!f>#pfcMk>uLZ1ZtMVncO3w5<^ll3;%wJr0ATwY0Kg{+
z0DyP|R||*$016Eic^SQc*+2Ql-g6=k!bws)s^Fhi<oq<!a%Qo2cW)fP4g#5W;*tUJ
z{JsZNcz@*BO_H7jD;qB@7lF-qOo@jnvA^8}>3?t6F{mi#-%C(prXr;V#sH)7i>V^C
z<D@y{nQ8ttWeH^=_{IM*S^h=b``7$$#Q!+p5dZ7ILUkKn(p3(Z0q)+}B}#<ezdr1|
zdjK4<Zjn>q#JaUcrwVG2Kr(a(LDyuEX#OmFV;!0cxK(0=J=XKr1Bf_G70QUzp&9UG
zL>~HeYM?T7I|vB2+fbq>8sYYh7?;+$UBAw0XU_OYD*WwJ2BgreB@n<-W(`6Z)Qmbj
zMDp_mTPYM~!%X9;bZN>^Tb0$byMFLdHgbxH)Pz}FSV9>pLY1`eG<&?P7>*@9nzFgw
zWW`dq)&zb;LQ<`mY<R0h9c<CE4h_xS`?EaJo4~KgsQ_%A+g<h$VWeP4Qar7F>r0Ja
zaT>H6xDeFskcc;iPxz(Tr1mgCoIc6U7|{T&<&aIp<&W4QlF?@ELaJiiS}Ran9wMJz
zICMp$LAI(}HuVSMDO9?oUC5VZ)zz`qO>?`X)up;Zp*l1<<?R?3=8rXT5|%vK)*$Cx
z;T-kq@??D(pw{;@7}9f6uok}y7P0lS;WHokVpm`(hpO+CP8CpU@FO(0XWvl%qJZ8`
zhN|B)Bq#{CbP|XS&$Y8Su54H=)~h|k{=!IR;SES2_HI1v-r)J#nw<!vK}3nJSTCyz
zqOPu#L+m5CEtv`~_ef8NCXs(l0q;44aIzv*32RS8@ej%45;&YecF0bEGrvTaI+Pfs
z#mqk9RWrTq*O{+bfpHP0zi*u7Z}k_=wR9St%BoVrLE6Vh-Y2NxPZHggb+@;dtSgqU
zIg(G8DRvaasETtuyXv;6!@BMBz81Gtqn1rlEXBA~SAPeop?tb6c(X@NgYFmRm~$>?
zX4ylc%Tdtx9Y$kjaa1hPX6EKG)*nYgzeVkx2CW{pp?4xm1HL5m+CEa4xcN`>>l^?%
z5|i|;|M}x0!kAT-@Qj&|%LfMQHmPmc0gHcjYpsFiR##8zpdW_Yr?K|zU-f7Khb6yQ
zndFae;<BQNf5zMof|s`&y=XWt&A_cq0~Ol`=@lXbJdQ116$yNoUBZ!_osG-+yb??|
zzCV)9i@AuPoZLU-<>iIE{N}!8l}&?-#m>&ImFX6eedE{J-QCUo>}?d;2A#qOd*gPO
zDHq|_Qc~`M^aE|=MJuSSla&>Go3zB%7K=J_^yqDt35#8#aaJaO;C;M43<l#P#vO1<
z+f~a91VS+842kudfw&s3lf=if^n-XGB_w*2tA}oGZr+6UT7j+UxZ4nLu7kyH>iG?H
zEER+XiNj+qMmLY$T1_8GjUQ8JvmL|=EI5qH21loE27V!w0cNuP?eh1>{X5Rhq$%0d
zgF}L&X4k-H9<Nf1h;0cJ7zRLhEL1j$ui&FMHxh)CsA1s9(HW<}dw#JTb)qP|Vm+If
zZLsY5cumcK&4&+*hDb;8G<#!Nj`)>n=Oijs)RZq4g+igDQu$kqUT~CwY)OjmuCFZf
z-3+S>Le39}+cF-z$5S00U-`Q)-V%njw|8HiqVHr2B!H2J0rOivq#uDEc%`q&`)*=b
zO@>J`7Q^mVS1YtI7don87Z*3lg(qiaA+mA%S9Oj&ConKeG;x?#3rVTEY?-y(1Dmwy
z)RPNTVWFhua6?-D;=sVg#r2E$rwRr%3W4JOFS18Ol5v-XyLa`0!B<w50#epTJz%6~
z&f62^Z$NnYuGpR}`S_2pL3J=WahB^t)ps|yP9i}etI%8`nWCMbU22}}5kZaKw?(O}
zki>ZMVkXN1``Lodp&_j_R#nWOBnOZfL@$lC5<lSkd$LF?ft-ULnI3v+PII2@%-WcG
zZlte-@t9v=qK>NLOLMf)QuZ^N1sCBicd$21QHMrBM^7X4mtiPoRjQmJ*Uc%zK`1e?
ze%e{zmOI+(GO|$vv!Z8boV*$Im^Tr3YvpuL+?N}tWtEmDzmj%-pUO`}+pUk1LivcJ
zM|#A@L8$xY=;kgNrT}kGMzk)OH3@g}sw$)(G?%q1YOyh``d-%=WMXl{<;CbN4^p6Z
zXGq&m;}g&r@s)VtXqj9QTfFn`h=8Q;3&O;RQ;7&-2T$JIsCjh0(c8tL@(9U~4w2xE
zPUK(kmSzf_X<<ZqdS{k*_lNGm-72Lv=u8eS&18rCI%^|o6@Zwm`-gIa`RCD88t4<c
z<GFiCm9!~!vSJTB(z2SRUJ*^ic?A7Sm@q1(ZRiWu?E+i+O^Zw|1qcbtlDIn(x`X~6
zOxWxt)-~jQ;a`EL2s&~Mtk%zQa~f11F9;i!EZW%|%jjGrhS*_RR@YXPk}%ZQ*%gvq
zp|MT!v_JBDvsmN6B8RJ3!}x3nca1sO7+A_<z4eMT6nr}?2H7wTvwC2!hpJFIvt+Ua
zNsT8bJjyB!1I_(~T)u)o#(j+sVOD*D#HJrcdH-`=LCfcg78o^OQ<WH;X)!~e@{L`7
z0v6{=u2V~e7~X5AaI!G@$Pf3W3C-FPNlu5|<m(E<w}K#-t#^VVId3eyt@%5HdoFn0
zDDGl(S3x_Jfz-doQ)M^p5Gawsp?Y(qU&EZ%_ey@0uN;@i@lPi~+|KU*?3-yYLwfQL
z>b5xB3|a16Hl44zmQGY!YC}c@dTS+swj*9<$k9Evkmf?nHgSsEZu_3sN}Dq!3=tU8
zU@MAPb*Qr}q1k3{S~;ccfK5LrW>v}8d>3^KLHbd~EqYIfF&XBLmX~l`Q$4>{w5*vH
zv+)6z?YFFVv?Lt&@5dIu4T4IvfNX!}#V_9T_?#b+?1ZF;0j=l!%-OkmZ!XKcUjO4K
z>R!I)q-<|2`O6`&ve3i(7w=Z=nC}gw)D*qtb53N~MZ7eEB~GON47NY9?Ab0vJXRc*
zAbo86v#=fkEViE|bLCu<%AdcipiRHKR?^XL9-Ol&IvY~U9r=3M=`DR-^tSA5EcVxv
z>guDO2R*OhtSXU%{_ie$lXvaw!1F2K>YrZ=_<!x3lFn3)!V)-6c1D94fYwM)m$^X^
zrCWtpP0xQXx)Ju_J?koqOQtKG;4tL8KREMm#l5EsWp30IG*gQ*{KWDt>J0xm<+wMm
z-n;1DI+yaQntu>vPyQ0>UkDsNy4ztF*ak!7(Lx&Va%eoON?NL(9ttw}m*;k0fIg{A
z)>%8ABTSdZULa?FVL?)Q66#N{N?_d;ObS}9=|#AX3{T&!+l1b3jDF5&-2T|l#LFt9
z=)m{8w_r~zWAdxj($#I$u5(I7d`h7tygYLt^c#yv*$K9@aG@K<r7vfdDEs;iLZw-D
z^P72^EJ~2?wH9;+nNlbfa{e^<S`!GnyLI(F|N7vSI%Cw=BEGunBC$zq(!H;fe)G7u
zNh*dp`kL2LGVJ!{)h)m37Vg2>+QP7{wNq!R7!58vq_Ykm)5TJe?h!b}R_+9SkgNEq
zYt_g1jqiH5brC#%oT$=}R~i;!4Jw@&YB4V;Ap0h8yK+?yb%0VP@+kr}*wQ1%hqx#p
zFQm3QLjC>y4_Ii<U*wi=b!c+J$}c8$9E8v~-W2f^{*vgy0GR2GlO>z#R)Bcua24Y}
z<9y_Z6cRtf#rgSvkBwWF{l(har*i{Ch5ah4#8HQrA}P1wokHYtD3J}zf1b7X_O`md
zR!K7>PX6K0sGIzFVBl$V&uHLV>LND!g#p`7ef)2AXv{4waq+~bFZZkFzxjy8u<DU~
zQ0H_MmRX$N*?G&k8A|Zcoh@CZcTwtlJ%1;oHYm1dAIC|$h=C7fWBZmd7-Qr1?#bk$
ze$Z8qd+r7v%`=tA(oKDR*JhJRseJJZa#7i#pl*stt7a3Jt3<xH-~MUP@kO3xH_Vqh
zk|(IZ5$DsX82&gz$fpxWj>)DCt_mB2%PEsze#$6^(#I}4G#b~Te~v5xR>`l&#>WHE
zwT2`4fmV@4tJ_$txrI65_D}8y9Ta_EqqV(HmzcjlX%W;|712zy>%_`xWk#h?utir^
z2Ze@G5FccogVYw*$*hU;%KVJ-_b31-jD)TMAwyiB{qTGPM$|%BRB;?NnyTbvefa2=
z^BYyA(hnsZt*x!RP@mHbAtEoNmyQ2Bug9?v{nhX*)h08x=#!xCk&zLLI{y<1C8f`j
z_+gtTCqBYlj;=Kwz~wDL_~=Cl1@}6au6TW2NOY=Zg}0|CKT`^qZy@b<0N%L0F#I$~
zVx-}S>3HPyo1JliW<_qfbz+T27EC`f-cg)JcF3mQ=*6Qz0#~L|RegPPba7mQ{(dF=
z`QLmzv>y62w0A#nfyY*Nt*5~p-&!o6f{37MD%9W<^^I7Q?NiT^`Z&Hcezj)BOQw{o
z8%f4L-=7DL>D{N=QwsGsxpr=jbm&uZC%|8`;-dVtcm4!>(+8PHE6WbyYR;35V*x5@
zH(5NypMLvE*&DmH&Q;^utc!5*yF9&zRT`AS+Q4Y--bF)wT3ve_IKD(A86}7f`<)sS
zXx7qkhd(sz+oMu5J?nc{)3Y)CV3{DHf<v`*LR+7fMOZobo7QiK&czTaL0SVsNE9hX
zPeJD&Re~0Js6{vR9@n$$9@Dy+yM0?G>9<m6=9VsXc*}1ZXM3vVji($f{*n@^)tOj;
zzkn&0Q<(oxnf;GY!znXnn*Rv3|EH8o6<7-+00>HShaIO#{l$q;fQo{qJVMqg^1lFH
C%zuFZ

diff --git a/app/assets/javascripts/admin.coffee b/app/assets/javascripts/admin.coffee
new file mode 100644
index 0000000..bbe478d
--- /dev/null
+++ b/app/assets/javascripts/admin.coffee
@@ -0,0 +1,411 @@
+
+#= require jquery
+#= require jquery_ujs
+# require turbolinks
+
+#= require event_form
+#= require bootstrap
+
+#= require vendor/jquery-sortable
+#= require vendor/jquery.event.drag.js
+#= require vendor/bootstrap-slider
+#= require vendor/jquery.ui.widget
+#= require vendor/tmpl.min
+#= require vendor/jquery.iframe-transport
+#= require vendor/jquery.fileupload
+#= require vendor/jquery.fileupload-ui
+#= require vendor/jquery.fileupload-process
+#= require vendor/select2.min
+
+
+#= require manager
+#= require image_files
+#= require pane_hover
+
+
+#= require redactor
+#= require redactor_plugins/fontsize
+#= require redactor_plugins/fontfamily
+#= require redactor_plugins/fontcolor
+
+#= require nested_fields
+#= require_tree ./admin
+
+#require ./shared/jquery.strings.js
+#require ./shared/jquery.utils.js
+#require ./shared/ui.timepickr.js
+#require ./shared/modernizr.js
+
+
+#= require ./shared/raphael
+#= require ./shared/morris
+#= require_tree ./note_files
+
+portlet_to_move = false
+content_type_to_move =false
+@open_collapse3 = ->
+  $("#collapse3 .panel").show()
+  $("#collapse3").show()
+  
+@reset_edit_pane = ->
+  $("#element_form").html()
+  $("#collapse3").hide()
+  
+@unselect_portlet = ->
+  $(".portlet.active").removeClass("active")
+  reset_edit_pane()
+  
+@cancel_move_portlet = ->
+  $(".move_message").show()
+  $(".cancel_message").hide()
+  
+  $(".move").removeClass("move")
+  $(".portlet_placeholder").remove()
+  portlet_to_move = false
+  
+$(document).ready -> 
+  
+  $(document).on 'click', 'input.datepicker', ->
+    $(this).datetimepicker(
+      language: 'fr'
+      pickTime: false
+    ).focus();
+    
+  $(document).on 'click', 'input.datetimepicker', ->
+    $(this).datetimepicker(
+      use24hours: true
+      format: 'DD/MM/YYYY hh:mm'
+      minuteStepping:15
+      language: 'fr'
+    ).focus();
+    
+    
+  $(document).on 'click', 'input.timepicker', ->
+    $(this).datetimepicker(
+      use24hours: true
+      format: 'DD/MM/YYYY hh:mm'
+      minuteStepping:15
+      pickDate: false
+      language: 'fr'
+    ).focus();
+  
+    
+    
+
+  
+  
+  $(document).on "click", ".portlet", (event) ->
+    if !$(this).hasClass("active") and portlet_to_move == false
+      
+      $(".portlet.active").removeClass("active")
+      $(this).addClass("active")
+    
+    
+      $.ajax({url : $(this).data("edit-link"), type: "GET"});
+      $("#collapse3 .trash").attr("href", $(this).data("show-link"));
+    
+    event.stopPropagation();
+  
+  $(document).on "click", ".block_portlets", (event) ->
+    portlet_to_move = false
+    content_type_to_move = false
+    $("#element_form").html("")
+    
+    $(".portlet.active").removeClass("active")
+    
+  
+  
+  
+  
+  $(document).on "click", "#content_types .content_type", ->
+    cancel_move_portlet()
+    unselect_portlet()
+    reset_edit_pane()
+    
+    
+    type = $(this).data("type")
+    content_type_to_move = type
+    init_portlets_place_holder()
+    $(this).addClass("move")
+    false
+  
+    
+  
+  $(document).on "click", ".portlet_handle", ->
+    if portlet_to_move == false
+      
+      $(".move_message").hide()
+      $(".cancel_message").show()
+      
+      
+      id = $(this).data("portlet-id")
+      portlet_to_move = $("#portlet_"+id)
+      init_portlets_place_holder()
+      portlet_to_move.addClass("move")
+      false
+    else
+      cancel_move_portlet()
+      
+      false
+    
+  $(document).on "click", ".portlet_placeholder", ->
+    if portlet_to_move != false
+      $(this).after portlet_to_move
+      $(".move").removeClass("move")
+      $(".portlet_placeholder").remove()
+      update_block_portlet_order(portlet_to_move.closest(".block_portlets").data("block_id"))
+      cancel_move_portlet()
+    else 
+      
+      block_id = $(this).closest(".block_portlets").data("block_id")
+  
+  
+      $(this).replaceWith('<div id="new_portlet_form_inline" class="portlet"><div id="new_portlet_content_form"></div></div>');
+  
+      $.ajax({
+        url:"/portlet/portlets/new.js", 
+        type: "GET",
+        data: { 
+          block_id : block_id,
+          position : $(this).attr("data_position"),
+          content_type : content_type_to_move
+          } 
+      
+      })
+      content_type_to_move = false
+      $(".portlet_placeholder").remove()
+      
+      
+    
+
+@init_portlets_place_holder = ->
+  placeholder = '<div class="portlet_placeholder"><i class="fa fa-angle-right place"></i></div>'
+  $(".block_portlets").each ->
+    $(this).find(".portlet_placeholder").remove()
+    $(this).prepend(placeholder)
+    $(this).find(".portlet").each ->
+      $(this).after(placeholder)
+
+
+  
+
+@flash_delay = ->
+  $("#flashs").find(".alert").each ->
+    
+    if !$(this).hasClass("delay")
+      $(this).addClass("delay")
+      $(this).delay(3000).fadeOut();
+    
+  
+
+@init_menu_items_list = ->
+  
+  if $(".prevv_folder").length > 0
+    
+    $(".prevv_folder").sortable({
+      group:"menu_items",
+      containerSelector :".receptable",
+      itemSelector:".menu_item_row",
+      handle: ".handle",
+      nested:false,
+      placeholder:"<div class='placeholder'></div>",
+
+  
+      })
+  oldContainer = ""
+  $("#sortable_menu_item").sortable({
+    group:"menu_items",
+    containerSelector :".receptable",
+    itemSelector:".menu_item_row",
+    handle: ".handle",
+    nested:true,
+    placeholder:"<div class='placeholder'></div>",
+    afterMove:  (placeholder, container) ->
+      if oldContainer != container and container.el.hasClass("prevv_folder")
+        if oldContainer
+          oldContainer.el.removeClass("active")
+        container.el.addClass("active")
+      oldContainer = container
+    onDrop: (item, Container, _super) ->
+      
+      
+      if Container
+        
+        parent_id = Container.el.data("parent-id")
+        menu_id = Container.el.data("menu-id")
+        id = item.data("menu-item-id")
+        $.ajax({
+          url:"/admin/menu_items/"+id+".js", 
+          type: "PUT",
+          data: { 
+            reorder : true,
+            menu_item : {
+              parent_id : parent_id,
+              menu_id : menu_id
+            } 
+          },
+          success : ->
+          
+            
+            _super(item)
+            item.remove()
+          
+        })
+        
+        
+        
+        
+        
+      else
+
+
+        
+        
+        _super(item)
+        
+        sortable_data = {parent_id :$("#sortable_menu_item").data("parent-id"), menu_id :$("#sortable_menu_item").data("menu-id") , menu_items_ids : []}
+        
+        $("#sortable_menu_item").find(".menu_item_row").each ->
+          sortable_data.menu_items_ids.push $(this).data("menu-item-id")
+        
+        
+        $.ajax({url : "/admin/menu_items/reorder", data : sortable_data, type: "POST"});
+  
+    })
+    
+
+@update_block_portlet_order = (block_portlet_id) ->
+  return_order = []
+  
+  block_portlet = $("#block_portlet_"+block_portlet_id)
+  
+  block_data = {block_id : block_portlet.data('block_id'), block_portlet_ids : []}
+
+  block_portlet.children('.portlet').each ->
+    if $(this).data('portlet_id')
+      block_data.block_portlet_ids.push($(this).data('portlet_id'))
+      
+
+  
+  return_order.push(block_data);
+
+
+
+  $.ajax({url : "/portlet/portlets/reorder", data : {blocks:return_order}, type: "POST"})
+ 
+  
+jQuery ->
+  
+  $(".inline-contenteditable").keypress (e) ->
+    if e.which == 13
+      false
+    else
+      $(this).html($(this).text())
+      return true
+      
+  
+  $(document).on 'click', ".portlet_title_content .inline-contenteditable", () ->
+    
+    $.ajax
+      url : "/portlet/title_contents/"+$(this).data("title-id")+"/edit.js", 
+      type: "GET",
+  
+  $(document).on 'blur keyup paste', ".portlet_title_content .inline-contenteditable", () ->
+    $(this).html($(this).text())
+    $.ajax
+      url : "/portlet/title_contents/"+$(this).data("title-id"), 
+      type: "PUT",
+      data : 
+        title_content : 
+          content : $(this).html()
+  
+    
+    
+    
+  $(".sortable").sortable({
+
+    containerSelector :".block",
+    itemSelector:".portlet",
+    handle: ".handle",
+    nested:true,
+    placeholder:"<div class='placeholder'></div>"
+    
+    })
+    
+  
+  
+    
+    
+  flash_delay();
+  
+
+  item_catched = ""
+  
+    
+  adjustment = ""
+  
+  $("#menu_item_inspector_container").sortable({
+
+
+    itemSelector:"#menu_item_informations",
+    pullPlaceholder :false,
+    placeholder : "",
+    handle: ".inspector_handle",
+    onDragStart: ($item, container, _super) ->
+      $item.css({
+        height: $item.height(),
+        width: $item.width()
+        })
+      
+      $("body").addClass("dragging")
+      
+      offset = $item.offset()
+      pointer = container.rootGroup.pointer
+      adjustment = {
+        left: pointer.left - offset.left,
+        top: pointer.top - offset.top
+        }      
+      
+    onCancel : ($item, container, _super) ->
+      $item.css(position)
+      $item.removeClass("dragged")
+      $("body").removeClass("dragging")
+      
+    onDrag: ($item, position, _super) ->
+
+      $item.css({
+        left: position.left - adjustment.left,
+        top: position.top - adjustment.top - $(window).scrollTop()
+      })
+
+
+
+
+    
+    })
+                   
+
+
+  
+
+
+$(document).on "scroll", () ->
+
+  if( $(this).scrollTop() <= 52 ) 
+    top = 52 - $(this).scrollTop()
+  else
+    top = 0
+
+  $("#toolbar-text, #menu_item_informations").css
+    top : top
+    
+$(document).on "click", "#menu_item_informations .save", ->
+  $(this).closest(".panel").find("form").submit()
+  return false
+  
+$(document).on "click", "#menu_item_informations h4", ->
+  $(this).next(".panel").toggle()
+  return false
+
+
+
diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
deleted file mode 100644
index 634a807..0000000
--- a/app/assets/javascripts/admin.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-=require jquery
-= require twitter/bootstrap
-
-
-require ./shared/jquery.strings.js
-require ./shared/jquery.utils.js
-require ./shared/ui.timepickr.js
-require ./shared/modernizr.js
-
-*= require jquery_ujs
-
-
-*= require_tree ./admin
-
-
-*= require ./shared/raphael
-*= require ./shared/morris
-
-*= require_tree ./note_files
-
-
-
-
-
-
-*/
-
-
-$(document).ready(function(){
-
-
-
-});
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/redactor.js b/app/assets/javascripts/admin/redactor.js
deleted file mode 100755
index 08b8ccf..0000000
--- a/app/assets/javascripts/admin/redactor.js
+++ /dev/null
@@ -1,4210 +0,0 @@
-/*
-	Redactor v8.2.2
-	Updated: January 17, 2013
-
-	http://redactorjs.com/
-
-	Copyright (c) 2009-2013, Imperavi Inc.
-	License: http://redactorjs.com/license/
-
-	Usage: $('#content').redactor();
-*/
-
-var rwindow, rdocument;
-
-if (typeof RELANG === 'undefined')
-{
-	var RELANG = {};
-}
-
-var RLANG = {
-	html: 'HTML',
-	video: 'Insert Video',
-	image: 'Insert Image',
-	table: 'Table',
-	link: 'Link',
-	link_insert: 'Insert link',
-	unlink: 'Unlink',
-	formatting: 'Formatting',
-	paragraph: 'Paragraph',
-	quote: 'Quote',
-	code: 'Code',
-	header1: 'Header 1',
-	header2: 'Header 2',
-	header3: 'Header 3',
-	header4: 'Header 4',
-	bold:  'Bold',
-	italic: 'Italic',
-	fontcolor: 'Font Color',
-	backcolor: 'Back Color',
-	unorderedlist: 'Unordered List',
-	orderedlist: 'Ordered List',
-	outdent: 'Outdent',
-	indent: 'Indent',
-	cancel: 'Cancel',
-	insert: 'Insert',
-	save: 'Save',
-	_delete: 'Delete',
-	insert_table: 'Insert Table',
-	insert_row_above: 'Add Row Above',
-	insert_row_below: 'Add Row Below',
-	insert_column_left: 'Add Column Left',
-	insert_column_right: 'Add Column Right',
-	delete_column: 'Delete Column',
-	delete_row: 'Delete Row',
-	delete_table: 'Delete Table',
-	rows: 'Rows',
-	columns: 'Columns',
-	add_head: 'Add Head',
-	delete_head: 'Delete Head',
-	title: 'Title',
-	image_position: 'Position',
-	none: 'None',
-	left: 'Left',
-	right: 'Right',
-	image_web_link: 'Image Web Link',
-	text: 'Text',
-	mailto: 'Email',
-	web: 'URL',
-	video_html_code: 'Video Embed Code',
-	file: 'Insert File',
-	upload: 'Upload',
-	download: 'Download',
-	choose: 'Choose',
-	or_choose: 'Or choose',
-	drop_file_here: 'Drop file here',
-	align_left:	'Align text to the left',
-	align_center: 'Center text',
-	align_right: 'Align text to the right',
-	align_justify: 'Justify text',
-	horizontalrule: 'Insert Horizontal Rule',
-	deleted: 'Deleted',
-	anchor: 'Anchor',
-	link_new_tab: 'Open link in new tab',
-	underline: 'Underline',
-	alignment: 'Alignment'
-};
-
-(function($){
-
-	// Plugin
-	jQuery.fn.redactor = function(option)
-	{
-		return this.each(function()
-		{
-			var $obj = $(this);
-
-			var data = $obj.data('redactor');
-			if (!data)
-			{
-				$obj.data('redactor', (data = new Redactor(this, option)));
-			}
-		});
-	};
-
-
-	// Initialization
-	var Redactor = function(element, options)
-	{
-		// Element
-		this.$el = $(element);
-
-		// Lang
-		if (typeof options !== 'undefined' && typeof options.lang !== 'undefined' && options.lang !== 'en' && typeof RELANG[options.lang] !== 'undefined')
-		{
-			RLANG = RELANG[options.lang];
-		}
-
-		// Options
-		this.opts = $.extend({
-
-			iframe: false,
-			css: false, // url
-
-			lang: 'en',
-			direction: 'ltr', // ltr or rtl
-
-			callback: false, // function
-			keyupCallback: false, // function
-			keydownCallback: false, // function
-			execCommandCallback: false, // function
-
-			plugins: false,
-			cleanup: true,
-
-			focus: false,
-			tabindex: false,
-			autoresize: true,
-			minHeight: false,
-			fixed: false,
-			fixedTop: 0, // pixels
-			fixedBox: false,
-			source: true,
-			shortcuts: true,
-
-			mobile: true,
-			air: false, // true or toolbar
-			wym: false,
-
-			convertLinks: true,
-			convertDivs: true,
-			protocol: 'http://', // for links http or https or ftp or false
-
-			autosave: false, // false or url
-			autosaveCallback: false, // function
-			interval: 60, // seconds
-
-			imageGetJson: false, // url (ex. /folder/images.json ) or false
-
-			imageUpload: false, // url
-			imageUploadCallback: false, // function
-			imageUploadErrorCallback: false, // function
-
-			fileUpload: false, // url
-			fileUploadCallback: false, // function
-			fileUploadErrorCallback: false, // function
-
-			uploadCrossDomain: false,
-			uploadFields: false,
-
-			observeImages: true,
-			overlay: true, // modal overlay
-
-			allowedTags: ["form", "input", "button", "select", "option", "datalist", "output", "textarea", "fieldset", "legend",
-					"section", "header", "hgroup", "aside", "footer", "article", "details", "nav", "progress", "time", "canvas",
-					"code", "span", "div", "label", "a", "br", "p", "b", "i", "del", "strike", "u",
-					"img", "video", "source", "track", "audio", "iframe", "object", "embed", "param", "blockquote",
-					"mark", "cite", "small", "ul", "ol", "li", "hr", "dl", "dt", "dd", "sup", "sub",
-					"big", "pre", "code", "figure", "figcaption", "strong", "em", "table", "tr", "td",
-					"th", "tbody", "thead", "tfoot", "h1", "h2", "h3", "h4", "h5", "h6"],
-
-			toolbarExternal: false, // ID selector
-
-			buttonsCustom: {},
-			buttonsAdd: [],
-			buttons: ['html', '|', 'formatting', '|', 'bold', 'italic', 'deleted', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent', '|',
-					'image', 'video', 'file', 'table', 'link', '|',
-					'fontcolor', 'backcolor', '|', 'alignment', '|', 'horizontalrule'], // 'underline', 'alignleft', 'aligncenter', 'alignright', 'justify'
-
-			airButtons: ['formatting', '|', 'bold', 'italic', 'deleted', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent', '|', 'fontcolor', 'backcolor'],
-
-			formattingTags: ['p', 'blockquote', 'pre', 'h1', 'h2', 'h3', 'h4'],
-
-			activeButtons: ['deleted', 'italic', 'bold', 'underline', 'unorderedlist', 'orderedlist'], // 'alignleft', 'aligncenter', 'alignright', 'justify'
-			activeButtonsStates: {
-				b: 'bold',
-				strong: 'bold',
-				i: 'italic',
-				em: 'italic',
-				del: 'deleted',
-				strike: 'deleted',
-				ul: 'unorderedlist',
-				ol: 'orderedlist',
-				u: 'underline'
-			},
-
-			colors: [
-				'#ffffff', '#000000', '#eeece1', '#1f497d', '#4f81bd', '#c0504d', '#9bbb59', '#8064a2', '#4bacc6', '#f79646', '#ffff00',
-				'#f2f2f2', '#7f7f7f', '#ddd9c3', '#c6d9f0', '#dbe5f1', '#f2dcdb', '#ebf1dd', '#e5e0ec', '#dbeef3', '#fdeada', '#fff2ca',
-				'#d8d8d8', '#595959', '#c4bd97', '#8db3e2', '#b8cce4', '#e5b9b7', '#d7e3bc', '#ccc1d9', '#b7dde8', '#fbd5b5', '#ffe694',
-				'#bfbfbf', '#3f3f3f', '#938953', '#548dd4', '#95b3d7', '#d99694', '#c3d69b', '#b2a2c7', '#b7dde8', '#fac08f', '#f2c314',
-				'#a5a5a5', '#262626', '#494429', '#17365d', '#366092', '#953734', '#76923c', '#5f497a', '#92cddc', '#e36c09', '#c09100',
-				'#7f7f7f', '#0c0c0c', '#1d1b10', '#0f243e', '#244061', '#632423', '#4f6128', '#3f3151', '#31859b', '#974806', '#7f6000'],
-
-			// private
-			emptyHtml: '<p><br /></p>',
-			buffer: false,
-			visual: true,
-
-			// modal windows container
-			modal_file: String() +
-				'<div id="redactor_modal_content">' +
-				'<form id="redactorUploadFileForm" method="post" action="" enctype="multipart/form-data">' +
-					'<label>Name (optional)</label>' +
-					'<input type="text" id="redactor_filename" class="redactor_input" />' +
-					'<div style="margin-top: 7px;">' +
-						'<input type="file" id="redactor_file" name="file" />' +
-					'</div>' +
-				'</form><br>' +
-				'</div>',
-
-			modal_image_edit: String() +
-				'<div id="redactor_modal_content">' +
-				'<label>' + RLANG.title + '</label>' +
-				'<input id="redactor_file_alt" class="redactor_input" />' +
-				'<label>' + RLANG.link + '</label>' +
-				'<input id="redactor_file_link" class="redactor_input" />' +
-				'<label>' + RLANG.image_position + '</label>' +
-				'<select id="redactor_form_image_align">' +
-					'<option value="none">' + RLANG.none + '</option>' +
-					'<option value="left">' + RLANG.left + '</option>' +
-					'<option value="right">' + RLANG.right + '</option>' +
-				'</select>' +
-				'</div>' +
-				'<div id="redactor_modal_footer">' +
-					'<a href="javascript:void(null);" id="redactor_image_delete_btn" class="redactor_modal_btn">' + RLANG._delete + '</a>&nbsp;&nbsp;&nbsp;' +
-					'<a href="javascript:void(null);" class="redactor_modal_btn redactor_btn_modal_close">' + RLANG.cancel + '</a>' +
-					'<input type="button" name="save" class="redactor_modal_btn" id="redactorSaveBtn" value="' + RLANG.save + '" />' +
-				'</div>',
-
-			modal_image: String() +
-				'<div id="redactor_modal_content">' +
-				'<div id="redactor_tabs">' +
-					'<a href="javascript:void(null);" class="redactor_tabs_act">' + RLANG.upload + '</a>' +
-					'<a href="javascript:void(null);">' + RLANG.choose + '</a>' +
-					'<a href="javascript:void(null);">' + RLANG.link + '</a>' +
-				'</div>' +
-				'<form id="redactorInsertImageForm" method="post" action="" enctype="multipart/form-data">' +
-					'<div id="redactor_tab1" class="redactor_tab">' +
-						'<input type="file" id="redactor_file" name="file" />' +
-					'</div>' +
-					'<div id="redactor_tab2" class="redactor_tab" style="display: none;">' +
-						'<div id="redactor_image_box"></div>' +
-					'</div>' +
-				'</form>' +
-				'<div id="redactor_tab3" class="redactor_tab" style="display: none;">' +
-					'<label>' + RLANG.image_web_link + '</label>' +
-					'<input type="text" name="redactor_file_link" id="redactor_file_link" class="redactor_input"  />' +
-				'</div>' +
-				'</div>' +
-				'<div id="redactor_modal_footer">' +
-					'<a href="javascript:void(null);" class="redactor_modal_btn redactor_btn_modal_close">' + RLANG.cancel + '</a>' +
-					'<input type="button" name="upload" class="redactor_modal_btn" id="redactor_upload_btn" value="' + RLANG.insert + '" />' +
-				'</div>',
-
-			modal_link: String() +
-				'<div id="redactor_modal_content">' +
-				'<form id="redactorInsertLinkForm" method="post" action="">' +
-					'<div id="redactor_tabs">' +
-						'<a href="javascript:void(null);" class="redactor_tabs_act">URL</a>' +
-						'<a href="javascript:void(null);">Email</a>' +
-						'<a href="javascript:void(null);">' + RLANG.anchor + '</a>' +
-					'</div>' +
-					'<input type="hidden" id="redactor_tab_selected" value="1" />' +
-					'<div class="redactor_tab" id="redactor_tab1">' +
-						'<label>URL</label><input type="text" id="redactor_link_url" class="redactor_input"  />' +
-						'<label>' + RLANG.text + '</label><input type="text" class="redactor_input redactor_link_text" id="redactor_link_url_text" />' +
-						'<label><input type="checkbox" id="redactor_link_blank"> ' + RLANG.link_new_tab + '</label>' +
-					'</div>' +
-					'<div class="redactor_tab" id="redactor_tab2" style="display: none;">' +
-						'<label>Email</label><input type="text" id="redactor_link_mailto" class="redactor_input" />' +
-						'<label>' + RLANG.text + '</label><input type="text" class="redactor_input redactor_link_text" id="redactor_link_mailto_text" />' +
-					'</div>' +
-					'<div class="redactor_tab" id="redactor_tab3" style="display: none;">' +
-						'<label>' + RLANG.anchor + '</label><input type="text" class="redactor_input" id="redactor_link_anchor"  />' +
-						'<label>' + RLANG.text + '</label><input type="text" class="redactor_input redactor_link_text" id="redactor_link_anchor_text" />' +
-					'</div>' +
-				'</form>' +
-				'</div>' +
-				'<div id="redactor_modal_footer">' +
-					'<a href="javascript:void(null);" class="redactor_modal_btn redactor_btn_modal_close">' + RLANG.cancel + '</a>' +
-					'<input type="button" class="redactor_modal_btn" id="redactor_insert_link_btn" value="' + RLANG.insert + '" />' +
-				'</div>',
-
-			modal_table: String() +
-				'<div id="redactor_modal_content">' +
-					'<label>' + RLANG.rows + '</label>' +
-					'<input type="text" size="5" value="2" id="redactor_table_rows" />' +
-					'<label>' + RLANG.columns + '</label>' +
-					'<input type="text" size="5" value="3" id="redactor_table_columns" />' +
-				'</div>' +
-				'<div id="redactor_modal_footer">' +
-					'<a href="javascript:void(null);" class="redactor_modal_btn redactor_btn_modal_close">' + RLANG.cancel + '</a>' +
-					'<input type="button" name="upload" class="redactor_modal_btn" id="redactor_insert_table_btn" value="' + RLANG.insert + '" />' +
-				'</div>',
-
-			modal_video: String() +
-				'<div id="redactor_modal_content">' +
-				'<form id="redactorInsertVideoForm">' +
-					'<label>' + RLANG.video_html_code + '</label>' +
-					'<textarea id="redactor_insert_video_area" style="width: 99%; height: 160px;"></textarea>' +
-				'</form>' +
-				'</div>'+
-				'<div id="redactor_modal_footer">' +
-					'<a href="javascript:void(null);" class="redactor_modal_btn redactor_btn_modal_close">' + RLANG.cancel + '</a>' +
-					'<input type="button" class="redactor_modal_btn" id="redactor_insert_video_btn" value="' + RLANG.insert + '" />' +
-				'</div>',
-
-			toolbar: {
-				html:
-				{
-					title: RLANG.html,
-					func: 'toggle'
-				},
-				formatting:
-				{
-					title: RLANG.formatting,
-					func: 'show',
-					dropdown:
-					{
-						p:
-						{
-							title: RLANG.paragraph,
-							exec: 'formatblock'
-						},
-						blockquote:
-						{
-							title: RLANG.quote,
-							exec: 'formatblock',
-							className: 'redactor_format_blockquote'
-						},
-						pre:
-						{
-							title: RLANG.code,
-							exec: 'formatblock',
-							className: 'redactor_format_pre'
-						},
-						h1:
-						{
-							title: RLANG.header1,
-							exec: 'formatblock',
-							className: 'redactor_format_h1'
-						},
-						h2:
-						{
-							title: RLANG.header2,
-							exec: 'formatblock',
-							className: 'redactor_format_h2'
-						},
-						h3:
-						{
-							title: RLANG.header3,
-							exec: 'formatblock',
-							className: 'redactor_format_h3'
-						},
-						h4:
-						{
-							title: RLANG.header4,
-							exec: 'formatblock',
-							className: 'redactor_format_h4'
-						}
-					}
-				},
-				bold:
-				{
-					title: RLANG.bold,
-					exec: 'bold'
-				},
-				italic:
-				{
-					title: RLANG.italic,
-					exec: 'italic'
-				},
-				deleted:
-				{
-					title: RLANG.deleted,
-					exec: 'strikethrough'
-				},
-				underline:
-				{
-					title: RLANG.underline,
-					exec: 'underline'
-				},
-				unorderedlist:
-				{
-					title: '&bull; ' + RLANG.unorderedlist,
-					exec: 'insertunorderedlist'
-				},
-				orderedlist:
-				{
-					title: '1. ' + RLANG.orderedlist,
-					exec: 'insertorderedlist'
-				},
-				outdent:
-				{
-					title: '< ' + RLANG.outdent,
-					exec: 'outdent'
-				},
-				indent:
-				{
-					title: '> ' + RLANG.indent,
-					exec: 'indent'
-				},
-				image:
-				{
-					title: RLANG.image,
-					func: 'showImage'
-				},
-				video:
-				{
-					title: RLANG.video,
-					func: 'showVideo'
-				},
-				file:
-				{
-					title: RLANG.file,
-					func: 'showFile'
-				},
-				table:
-				{
-					title: RLANG.table,
-					func: 'show',
-					dropdown:
-					{
-						insert_table:
-						{
-							title: RLANG.insert_table,
-							func: 'showTable'
-						},
-						separator_drop1:
-						{
-							name: 'separator'
-						},
-						insert_row_above:
-						{
-							title: RLANG.insert_row_above,
-							func: 'insertRowAbove'
-						},
-						insert_row_below:
-						{
-							title: RLANG.insert_row_below,
-							func: 'insertRowBelow'
-						},
-						insert_column_left:
-						{
-							title: RLANG.insert_column_left,
-							func: 'insertColumnLeft'
-						},
-						insert_column_right:
-						{
-							title: RLANG.insert_column_right,
-							func: 'insertColumnRight'
-						},
-						separator_drop2:
-						{
-							name: 'separator'
-						},
-						add_head:
-						{
-							title: RLANG.add_head,
-							func: 'addHead'
-						},
-						delete_head:
-						{
-							title: RLANG.delete_head,
-							func: 'deleteHead'
-						},
-						separator_drop3:
-						{
-							name: 'separator'
-						},
-						delete_column:
-						{
-							title: RLANG.delete_column,
-							func: 'deleteColumn'
-						},
-						delete_row:
-						{
-							title: RLANG.delete_row,
-							func: 'deleteRow'
-						},
-						delete_table:
-						{
-							title: RLANG.delete_table,
-							func: 'deleteTable'
-						}
-					}
-				},
-				link:
-				{
-					title: RLANG.link,
-					func: 'show',
-					dropdown:
-					{
-						link:
-						{
-							title: RLANG.link_insert,
-							func: 'showLink'
-						},
-						unlink:
-						{
-							title: RLANG.unlink,
-							exec: 'unlink'
-						}
-					}
-				},
-				fontcolor:
-				{
-					title: RLANG.fontcolor,
-					func: 'show'
-				},
-				backcolor:
-				{
-					title: RLANG.backcolor,
-					func: 'show'
-				},
-				alignment:
-				{
-					title: RLANG.alignment,
-					func: 'show',
-					dropdown:
-					{
-						alignleft:
-						{
-							title: RLANG.align_left,
-							exec: 'JustifyLeft'
-						},
-						aligncenter:
-						{
-							title: RLANG.align_center,
-							exec: 'JustifyCenter'
-						},
-						alignright:
-						{
-							title: RLANG.align_right,
-							exec: 'JustifyRight'
-						},
-						justify:
-						{
-							title: RLANG.align_justify,
-							exec: 'JustifyFull'
-						}
-					}
-				},
-				alignleft:
-				{
-					exec: 'JustifyLeft',
-					title: RLANG.align_left
-				},
-				aligncenter:
-				{
-					exec: 'JustifyCenter',
-					title: RLANG.align_center
-				},
-				alignright:
-				{
-					exec: 'JustifyRight',
-					title: RLANG.align_right
-				},
-				justify:
-				{
-					exec: 'JustifyFull',
-					title: RLANG.align_justify
-				},
-				horizontalrule:
-				{
-					exec: 'inserthorizontalrule',
-					title: RLANG.horizontalrule
-				}
-			}
-
-
-		}, options, this.$el.data());
-
-		this.dropdowns = [];
-
-		// Init
-		this.init();
-	};
-
-	// Functionality
-	Redactor.prototype = {
-
-
-		// Initialization
-		init: function()
-		{
-			// get dimensions
-			this.height = this.$el.css('height');
-			this.width = this.$el.css('width');
-
-			rdocument = this.document = document;
-			rwindow = this.window = window;
-
-			// mobile
-			if (this.opts.mobile === false && this.isMobile())
-			{
-				this.build(true);
-				return false;
-			}
-
-			// iframe
-			if (this.opts.iframe)
-			{
-				this.opts.autoresize = false;
-			}
-
-			// extend buttons
-			if (this.opts.air)
-			{
-				this.opts.buttons = this.opts.airButtons;
-			}
-			else if (this.opts.toolbar !== false)
-			{
-				if (this.opts.source === false)
-				{
-					var index = this.opts.buttons.indexOf('html');
-					var next = this.opts.buttons[index+1];
-					this.opts.buttons.splice(index, 1);
-					if (typeof next !== 'undefined' && next === '|')
-					{
-						this.opts.buttons.splice(index, 1);
-					}
-				}
-
-				$.extend(this.opts.toolbar, this.opts.buttonsCustom);
-				$.each(this.opts.buttonsAdd, $.proxy(function(i,s)
-				{
-					this.opts.buttons.push(s);
-
-				}, this));
-			}
-
-			// formatting tags
-			if (this.opts.toolbar !== false)
-			{
-				$.each(this.opts.toolbar.formatting.dropdown, $.proxy(function(i,s)
-				{
-					if ($.inArray(i, this.opts.formattingTags) == '-1')
-					{
-						delete this.opts.toolbar.formatting.dropdown[i];
-					}
-
-				}, this));
-			}
-
-			function afterBuild()
-			{
-	      		// air enable
-				this.enableAir();
-
-				// toolbar
-				this.buildToolbar();
-
-				// PLUGINS
-				if (typeof this.opts.plugins === 'object')
-				{
-					$.each(this.opts.plugins, $.proxy(function(i,s)
-					{
-						if (typeof RedactorPlugins[s] !== 'undefined')
-						{
-							$.extend(this, RedactorPlugins[s]);
-
-							if (typeof RedactorPlugins[s].init !== 'undefined')
-							{
-								this.init();
-							}
-						}
-
-					}, this));
-				}
-
-				// buttons response
-				if (this.opts.activeButtons !== false && this.opts.toolbar !== false)
-				{
-					var observeFormatting = $.proxy(function() { this.observeFormatting(); }, this);
-					this.$editor.click(observeFormatting).keyup(observeFormatting);
-				}
-
-				// paste
-				var oldsafari = false;
-				if (this.browser('webkit') && navigator.userAgent.indexOf('Chrome') === -1)
-				{
-					var arr = this.browser('version').split('.');
-					if (arr[0] < 536) oldsafari = true;
-				}
-
-				if (this.isMobile(true) === false && oldsafari === false)
-				{
-					this.$editor.bind('paste', $.proxy(function(e)
-					{
-						if (this.opts.cleanup === false)
-						{
-							return true;
-						}
-
-						this.pasteRunning = true;
-
-						this.setBuffer();
-
-						if (this.opts.autoresize === true)
-						{
-							this.saveScroll = this.document.body.scrollTop;
-						}
-						else
-						{
-							this.saveScroll = this.$editor.scrollTop();
-						}
-
-						var frag = this.extractContent();
-
-						setTimeout($.proxy(function()
-						{
-							var pastedFrag = this.extractContent();
-							this.$editor.append(frag);
-
-							this.restoreSelection();
-
-							var html = this.getFragmentHtml(pastedFrag);
-							this.pasteCleanUp(html);
-							this.pasteRunning = false;
-
-						}, this), 1);
-
-					}, this));
-				}
-
-				// key handlers
-				this.keyup();
-				this.keydown();
-
-				// autosave
-				if (this.opts.autosave !== false)
-				{
-					this.autoSave();
-				}
-
-				// observers
-				setTimeout($.proxy(function()
-				{
-					this.observeImages();
-					this.observeTables();
-
-				}, this), 1);
-
-				// FF fix
-				if (this.browser('mozilla'))
-				{
-					this.$editor.click($.proxy(function()
-					{
-						this.saveSelection();
-					}, this));
-
-					try
-					{
-						this.document.execCommand('enableObjectResizing', false, false);
-						this.document.execCommand('enableInlineTableEditing', false, false);
-					}
-					catch (e) {}
-				}
-
-				// focus
-				if (this.opts.focus)
-				{
-					setTimeout($.proxy(function(){
-						this.$editor.focus();
-					}, this), 1);
-				}
-
-				// fixed
-				if (this.opts.fixed)
-				{
-					this.observeScroll();
-					$(document).scroll($.proxy(this.observeScroll, this));
-				}
-
-				// callback
-				if (typeof this.opts.callback === 'function')
-				{
-					this.opts.callback(this);
-				}
-
-				if (this.opts.toolbar !== false)
-				{
-					this.$toolbar.find('a').attr('tabindex', '-1');
-				}
-			}
-
-			// construct editor
-		    this.build(false, afterBuild);
-
-		},
-		shortcuts: function(e, cmd)
-		{
-			e.preventDefault();
-			this.execCommand(cmd, false);
-		},
-		keyup: function()
-		{
-			this.$editor.keyup($.proxy(function(e)
-			{
-				var key = e.keyCode || e.which;
-
-				if (this.browser('mozilla') && !this.pasteRunning)
-				{
-					this.saveSelection();
-				}
-
-				// callback as you type
-				if (typeof this.opts.keyupCallback === 'function')
-				{
-					this.opts.keyupCallback(this, e);
-				}
-
-				// if empty
-				if (key === 8 || key === 46)
-				{
-					this.observeImages();
-					return this.formatEmpty(e);
-				}
-
-				// new line p
-				if (key === 13 && !e.shiftKey && !e.ctrlKey && !e.metaKey)
-				{
-					if (this.browser('webkit'))
-					{
-						this.formatNewLine(e);
-					}
-
-					// convert links
-					if (this.opts.convertLinks)
-					{
-						this.$editor.linkify();
-					}
-				}
-
-				this.syncCode();
-
-			}, this));
-		},
-		keydown: function()
-		{
-			this.$editor.keydown($.proxy(function(e)
-			{
-				var key = e.keyCode || e.which;
-				var parent = this.getParentNode();
-				var current = this.getCurrentNode();
-				var pre = false;
-				var ctrl = e.ctrlKey || e.metaKey;
-
-				if ((parent || current) && ($(parent).get(0).tagName === 'PRE' || $(current).get(0).tagName === 'PRE'))
-				{
-					pre = true;
-				}
-
-				// callback keydown
-				if (typeof this.opts.keydownCallback === 'function')
-				{
-					this.opts.keydownCallback(this, e);
-				}
-
-				if (ctrl && this.opts.shortcuts)
-				{
-					if (key === 90)
-					{
-						if (this.opts.buffer !== false)
-						{
-							e.preventDefault();
-							this.getBuffer();
-						}
-						else if (e.shiftKey)
-						{
-							this.shortcuts(e, 'redo');	// Ctrl + Shift + z
-						}
-						else
-						{
-							this.shortcuts(e, 'undo'); // Ctrl + z
-						}
-					}
-					else if (key === 77)
-					{
-						this.shortcuts(e, 'removeFormat'); // Ctrl + m
-					}
-					else if (key === 66)
-					{
-						this.shortcuts(e, 'bold'); // Ctrl + b
-					}
-					else if (key === 73)
-					{
-						this.shortcuts(e, 'italic'); // Ctrl + i
-					}
-					else if (key === 74)
-					{
-						this.shortcuts(e, 'insertunorderedlist'); // Ctrl + j
-					}
-					else if (key === 75)
-					{
-						this.shortcuts(e, 'insertorderedlist'); // Ctrl + k
-					}
-					else if (key === 76)
-					{
-						this.shortcuts(e, 'superscript'); // Ctrl + l
-					}
-					else if (key === 72)
-					{
-						this.shortcuts(e, 'subscript'); // Ctrl + h
-					}
-				}
-
-				// clear undo buffer
-				if (!ctrl && key !== 90)
-				{
-					this.opts.buffer = false;
-				}
-
-				// enter
-				if (pre === true && key === 13)
-				{
-					e.preventDefault();
-
-					var html = $(current).parent().text();
-					this.insertNodeAtCaret(this.document.createTextNode('\r\n'));
-					if (html.search(/\s$/) == -1)
-					{
-						this.insertNodeAtCaret(this.document.createTextNode('\r\n'));
-					}
-					this.syncCode();
-
-					return false;
-				}
-
-				// tab
-				if (this.opts.shortcuts && !e.shiftKey && key === 9)
-				{
-					if (pre === false)
-					{
-						this.shortcuts(e, 'indent'); // Tab
-					}
-					else
-					{
-						e.preventDefault();
-						this.insertNodeAtCaret(this.document.createTextNode('\t'));
-						this.syncCode();
-						return false;
-					}
-				}
-				else if (this.opts.shortcuts && e.shiftKey && key === 9 )
-				{
-					this.shortcuts(e, 'outdent'); // Shift + tab
-				}
-
-				// safari shift key + enter
-				if (this.browser('webkit') && navigator.userAgent.indexOf('Chrome') === -1)
-				{
-					return this.safariShiftKeyEnter(e, key);
-				}
-			}, this));
-		},
-		build: function(mobile, whendone)
-		{
-			if (mobile !== true)
-			{
-				// container
-				this.$box = $('<div class="redactor_box"></div>');
-
-				// air box
-				if (this.opts.air)
-				{
-					this.air = $('<div class="redactor_air" style="display: none;"></div>');
-				}
-
-				this.$content = null;
-
-				function initFrame()
-				{
-					this.$editor = this.$content.contents().find("body").attr('contenteditable', true).attr('dir', this.opts.direction);
-
-					rdocument = this.document = this.$editor[0].ownerDocument;
-					rwindow = this.window = this.document.defaultView || window;
-
-					if (this.opts.css !== false)
-					{
-						this.$content.contents().find('head').append('<link rel="stylesheet" href="' + this.opts.css + '" />');
-					}
-
-					this.$editor.html(html);
-
-					if (whendone)
-					{
-						whendone.call(this);
-						whendone = null;
-					}
-				}
-
-				// editor
-				this.textareamode = true;
-				if (this.$el.get(0).tagName === 'TEXTAREA')
-				{
-					if(this.opts.iframe)
-					{
-						var me = this;
-						this.$content = $('<iframe style="width: 100%;" frameborder="0"></iframe>').load(function()
-						{
-							initFrame.call(me);
-						});
-					}
-					else
-					{
-						 this.$content = this.$editor = $('<div></div>');
-					}
-
-					var classlist = this.$el.get(0).className.split(/\s+/);
-					$.each(classlist, $.proxy(function(i,s)
-					{
-						this.$content.addClass('redactor_' + s);
-					}, this));
-				}
-				else
-				{
-					this.textareamode = false;
-					this.$content = this.$editor = this.$el;
-					this.$el = $('<textarea name="' + this.$editor.attr('id') + '"></textarea>').css('height', this.height);
-				}
-
-				if (this.$editor)
-				{
-					this.$editor.addClass('redactor_editor').attr('contenteditable', true).attr('dir', this.opts.direction);
-				}
-
-				if (this.opts.tabindex !== false)
-				{
-					this.$content.attr('tabindex', this.opts.tabindex);
-				}
-
-				if (this.opts.minHeight !== false)
-				{
-					this.$content.css('min-height', this.opts.minHeight + 'px');
-				}
-
-				if (this.opts.wym === true)
-				{
-					this.$content.addClass('redactor_editor_wym');
-				}
-
-				if (this.opts.autoresize === false)
-				{
-					this.$content.css('height', this.height);
-				}
-
-				// hide textarea
-				this.$el.hide();
-
-				// append box and frame
-				var html = '';
-				if (this.textareamode)
-				{
-					// get html
-					html = this.$el.val();
-					html = this.savePreCode(html);
-
-					this.$box.insertAfter(this.$el).append(this.$content).append(this.$el);
-				}
-				else
-				{
-					// get html
-					html = this.$editor.html();
-					html = this.savePreCode(html);
-
-					this.$box.insertAfter(this.$content).append(this.$el).append(this.$editor);
-
-				}
-
-				// conver newlines to p
-				html = this.paragraphy(html);
-
-				// enable
-				if (this.$editor)
-				{
-					this.$editor.html(html);
-				}
-
-				if (this.textareamode === false)
-				{
-					this.syncCode();
-				}
-			}
-			else
-			{
-				if (this.$el.get(0).tagName !== 'TEXTAREA')
-				{
-					var html = this.$el.val();
-					var textarea = $('<textarea name="' + this.$editor.attr('id') + '"></textarea>').css('height', this.height).val(html);
-					this.$el.hide();
-					this.$el.after(textarea);
-				}
-			}
-
-			if (whendone && this.$editor)
-			{
-				whendone.call(this);
-			}
-
-		},
-		enableAir: function()
-		{
-			if (this.opts.air === false)
-			{
-				return false;
-			}
-
-			this.air.hide();
-
-			this.$editor.bind('textselect', $.proxy(function(e)
-			{
-				this.showAir(e);
-
-			}, this));
-
-			this.$editor.bind('textunselect', $.proxy(function()
-			{
-				this.air.hide();
-
-			}, this));
-
-		},
-		showAir: function(e)
-		{
-			$('.redactor_air').hide();
-
-			var width = this.air.innerWidth();
-			var left = e.clientX;
-
-			if ($(this.document).width() < (left + width))
-			{
-				left = left - width;
-			}
-
-			var top = e.clientY + $(document).scrollTop() + 14;
-			if (this.opts.iframe === true)
-			{
-				top = top + this.$box.position().top;
-				left = left + this.$box.position().left;
-			}
-
-			this.air.css({ left: left + 'px', top: top + 'px' }).show();
-		},
-		syncCode: function()
-		{
-			this.$el.val(this.$editor.html());
-		},
-
-		// API functions
-		setCode: function(html)
-		{
-			html = this.stripTags(html);
-			this.$editor.html(html).focus();
-
-			this.syncCode();
-		},
-		getCode: function()
-		{
-			var html = '';
-			if (this.opts.visual)
-			{
-				html = this.$editor.html()
-			}
-			else
-			{
-				html = this.$el.val();
-			}
-
-			return this.stripTags(html);
-		},
-		insertHtml: function(html)
-		{
-			this.$editor.focus();
-			this.pasteHtmlAtCaret(html);
-			this.observeImages();
-			this.syncCode();
-		},
-
-		pasteHtmlAtCaret: function (html)
-		{
-			var sel, range;
-			if (this.document.getSelection)
-			{
-				sel = this.window.getSelection();
-				if (sel.getRangeAt && sel.rangeCount)
-				{
-					range = sel.getRangeAt(0);
-					range.deleteContents();
-					var el = this.document.createElement("div");
-					el.innerHTML = html;
-					var frag = this.document.createDocumentFragment(), node, lastNode;
-					while (node = el.firstChild)
-					{
-						lastNode = frag.appendChild(node);
-					}
-					range.insertNode(frag);
-
-					if (lastNode)
-					{
-						range = range.cloneRange();
-						range.setStartAfter(lastNode);
-						range.collapse(true);
-						sel.removeAllRanges();
-						sel.addRange(range);
-					}
-				}
-			}
-			else if (this.document.selection && this.document.selection.type != "Control")
-			{
-				this.document.selection.createRange().pasteHTML(html);
-			}
-		},
-
-		destroy: function()
-		{
-			var html = this.getCode();
-
-			if (this.textareamode)
-			{
-				this.$box.after(this.$el);
-				this.$box.remove();
-				this.$el.height(this.height).val(html).show();
-			}
-			else
-			{
-				this.$box.after(this.$editor);
-				this.$box.remove();
-				this.$editor.removeClass('redactor_editor').removeClass('redactor_editor_wym').attr('contenteditable', false).html(html).show();
-			}
-
-			if (this.opts.toolbarExternal)
-			{
-				$(this.opts.toolbarExternal).empty();
-			}
-
-			$('.redactor_air').remove();
-
-			for (var i = 0; i < this.dropdowns.length; i++)
-			{
-				this.dropdowns[i].remove();
-				delete(this.dropdowns[i]);
-			}
-
-			if (this.opts.autosave !== false)
-			{
-				clearInterval(this.autosaveInterval);
-			}
-
-		},
-		// end API functions
-
-		// OBSERVERS
-		observeFormatting: function()
-		{
-			var parent = this.getCurrentNode();
-
-			this.inactiveAllButtons();
-
-			$.each(this.opts.activeButtonsStates, $.proxy(function(i,s)
-			{
-				if ($(parent).closest(i,this.$editor.get()[0]).length != 0)
-				{
-					this.setBtnActive(s);
-				}
-
-			}, this));
-
-			var tag = $(parent).closest(['p', 'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote', 'td']);
-
-			if (typeof tag[0] !== 'undefined' && typeof tag[0].elem !== 'undefined' && $(tag[0].elem).size() != 0)
-			{
-				var align = $(tag[0].elem).css('text-align');
-
-				switch (align)
-				{
-					case 'right':
-						this.setBtnActive('alignright');
-					break;
-					case 'center':
-						this.setBtnActive('aligncenter');
-					break;
-					case 'justify':
-						this.setBtnActive('justify');
-					break;
-					default:
-						this.setBtnActive('alignleft');
-					break;
-				}
-			}
-		},
-		observeImages: function()
-		{
-			if (this.opts.observeImages === false)
-			{
-				return false;
-			}
-
-			this.$editor.find('img').each($.proxy(function(i,s)
-			{
-				if (this.browser('msie'))
-				{
-					$(s).attr('unselectable', 'on');
-				}
-
-				this.resizeImage(s);
-
-			}, this));
-
-		},
-		observeTables: function()
-		{
-			this.$editor.find('table').click($.proxy(this.tableObserver, this));
-		},
-		observeScroll: function()
-		{
-			var scrolltop = $(this.document).scrollTop();
-			var boxtop = this.$box.offset().top;
-			var left = 0;
-
-			if (scrolltop > boxtop)
-			{
-				var width = '100%';
-				if (this.opts.fixedBox)
-				{
-					left = this.$box.offset().left;
-					width = this.$box.innerWidth();
-				}
-
-				this.fixed = true;
-				this.$toolbar.css({ position: 'fixed', width: width, zIndex: 1005, top: this.opts.fixedTop + 'px', left: left });
-			}
-			else
-			{
-				this.fixed = false;
-				this.$toolbar.css({ position: 'relative', width: 'auto', zIndex: 1, top: 0, left: left });
-			}
-		},
-
-		// BUFFER
-		setBuffer: function()
-		{
-			this.saveSelection();
-			this.opts.buffer = this.$editor.html();
-		},
-		getBuffer: function()
-		{
-			if (this.opts.buffer === false)
-			{
-				return false;
-			}
-
-			this.$editor.html(this.opts.buffer);
-
-			if (!this.browser('msie'))
-			{
-				this.restoreSelection();
-			}
-
-			this.opts.buffer = false;
-		},
-
-
-
-		// EXECCOMMAND
-		execCommand: function(cmd, param)
-		{
-			if (this.opts.visual == false)
-			{
-				this.$el.focus();
-				return false;
-			}
-
-			try
-			{
-
-				var parent;
-
-				if (cmd === 'inserthtml')
-				{
-					if (this.browser('msie'))
-					{
-						this.$editor.focus();
-						this.document.selection.createRange().pasteHTML(param);
-					}
-					else
-					{
-						this.pasteHtmlAtCaret(param);
-						//this.execRun(cmd, param);
-					}
-
-					this.observeImages();
-				}
-				else if (cmd === 'unlink')
-				{
-					parent = this.getParentNode();
-					if ($(parent).get(0).tagName === 'A')
-					{
-						$(parent).replaceWith($(parent).text());
-					}
-					else
-					{
-						this.execRun(cmd, param);
-					}
-				}
-				else if (cmd === 'JustifyLeft' || cmd === 'JustifyCenter' || cmd === 'JustifyRight' || cmd === 'JustifyFull')
-				{
-					parent = this.getCurrentNode();
-					var tag = $(parent).get(0).tagName;
-
-					if (this.opts.iframe === false && $(parent).parents('.redactor_editor').size() == 0)
-					{
-						return false;
-					}
-
-					var tagsArray = ['P', 'DIV', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'BLOCKQUOTE', 'TD'];
-					if ($.inArray(tag, tagsArray) != -1)
-					{
-						var align = false;
-
-						if (cmd === 'JustifyCenter')
-						{
-							align = 'center';
-						}
-						else if (cmd === 'JustifyRight')
-						{
-							align = 'right';
-						}
-						else if (cmd === 'JustifyFull')
-						{
-							align = 'justify';
-						}
-
-						if (align === false)
-						{
-							$(parent).css('text-align', '');
-						}
-						else
-						{
-							$(parent).css('text-align', align);
-						}
-					}
-					else
-					{
-						this.execRun(cmd, param);
-					}
-				}
-				else if (cmd === 'formatblock' && param === 'blockquote')
-				{
-					parent = this.getCurrentNode();
-					if ($(parent).get(0).tagName === 'BLOCKQUOTE')
-					{
-						if (this.browser('msie'))
-						{
-							var node = $('<p>' + $(parent).html() + '</p>');
-							$(parent).replaceWith(node);
-						}
-						else
-						{
-							this.execRun(cmd, 'p');
-						}
-					}
-					else if ($(parent).get(0).tagName === 'P')
-					{
-						var parent2 = $(parent).parent();
-						if ($(parent2).get(0).tagName === 'BLOCKQUOTE')
-						{
-							var node = $('<p>' + $(parent).html() + '</p>');
-							$(parent2).replaceWith(node);
-							this.setSelection(node[0], 0, node[0], 0);
-						}
-						else
-						{
-							if (this.browser('msie'))
-							{
-								var node = $('<blockquote>' + $(parent).html() + '</blockquote>');
-								$(parent).replaceWith(node);
-							}
-							else
-							{
-								this.execRun(cmd, param);
-							}
-						}
-					}
-					else
-					{
-						this.execRun(cmd, param);
-					}
-				}
-				else if (cmd === 'formatblock' && (param === 'pre' || param === 'p'))
-				{
-					parent = this.getParentNode();
-
-					if ($(parent).get(0).tagName === 'PRE')
-					{
-						$(parent).replaceWith('<p>' +  this.encodeEntities($(parent).text()) + '</p>');
-					}
-					else
-					{
-						this.execRun(cmd, param);
-					}
-				}
-				else
-				{
-					if (cmd === 'inserthorizontalrule' && this.browser('msie'))
-					{
-						this.$editor.focus();
-					}
-
-					if (cmd === 'formatblock' && this.browser('mozilla'))
-					{
-						this.$editor.focus();
-					}
-
-					this.execRun(cmd, param);
-				}
-
-				if (cmd === 'inserthorizontalrule')
-				{
-					this.$editor.find('hr').removeAttr('id');
-				}
-
-				this.syncCode();
-
-				if (this.oldIE())
-				{
-					this.$editor.focus();
-				}
-
-				if (typeof this.opts.execCommandCallback === 'function')
-				{
-					this.opts.execCommandCallback(this, cmd);
-				}
-
-				if (this.opts.air)
-				{
-					this.air.hide();
-				}
-			}
-			catch (e) { }
-		},
-		execRun: function(cmd, param)
-		{
-			if (cmd === 'formatblock' && this.browser('msie'))
-			{
-				param = '<' + param + '>';
-			}
-
-			this.document.execCommand(cmd, false, param);
-		},
-
-		// FORMAT NEW LINE
-		formatNewLine: function(e)
-		{
-			var parent = this.getParentNode();
-
-			if (parent.nodeName === 'DIV' && parent.className === 'redactor_editor')
-			{
-				var element = $(this.getCurrentNode());
-
-				if (element.get(0).tagName === 'DIV' && (element.html() === '' || element.html() === '<br>'))
-				{
-					var newElement = $('<p>').append(element.clone().get(0).childNodes);
-					element.replaceWith(newElement);
-					newElement.html('<br />');
-					this.setSelection(newElement[0], 0, newElement[0], 0);
-				}
-			}
-		},
-
-		// SAFARI SHIFT KEY + ENTER
-		safariShiftKeyEnter: function(e, key)
-		{
-			if (e.shiftKey && key === 13)
-			{
-				e.preventDefault();
-				this.insertNodeAtCaret($('<span><br /></span>').get(0));
-				this.syncCode();
-				return false;
-			}
-			else
-			{
-				return true;
-			}
-		},
-
-		// FORMAT EMPTY
-		formatEmpty: function(e)
-		{
-			var html = $.trim(this.$editor.html());
-
-			if (this.browser('mozilla'))
-			{
-				html = html.replace(/<br>/i, '');
-			}
-
-			var thtml = html.replace(/<(?:.|\n)*?>/gm, '');
-
-			if (html === '' || thtml === '')
-			{
-				e.preventDefault();
-
-				var node = $(this.opts.emptyHtml).get(0);
-				this.$editor.html(node);
-				this.setSelection(node, 0, node, 0);
-
-				this.syncCode();
-				return false;
-			}
-			else
-			{
-				this.syncCode();
-			}
-		},
-
-		// PARAGRAPHY
-		paragraphy: function (str)
-		{
-			str = $.trim(str);
-			if (str === '' || str === '<p></p>')
-			{
-				return this.opts.emptyHtml;
-			}
-
-			// convert div to p
-			if (this.opts.convertDivs)
-			{
-				str = str.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi, '<p>$2</p>');
-			}
-
-			// inner functions
-			var X = function(x, a, b) { return x.replace(new RegExp(a, 'g'), b); };
-			var R = function(a, b) { return X(str, a, b); };
-
-			// block elements
-			var blocks = '(table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|style|script|object|input|param|p|h[1-6])';
-
-			//str = '<p>' + str;
-			str += '\n';
-
-			R('<br />\\s*<br />', '\n\n');
-			R('(<' + blocks + '[^>]*>)', '\n$1');
-			R('(</' + blocks + '>)', '$1\n\n');
-			R('\r\n|\r', '\n'); // newlines
-			R('\n\n+', '\n\n'); // remove duplicates
-			R('\n?((.|\n)+?)$', '<p>$1</p>\n'); // including one at the end
-			R('<p>\\s*?</p>', ''); // remove empty p
-			R('<p>(<div[^>]*>\\s*)', '$1<p>');
-			R('<p>([^<]+)\\s*?(</(div|address|form)[^>]*>)', '<p>$1</p>$2');
-			R('<p>\\s*(</?' + blocks + '[^>]*>)\\s*</p>', '$1');
-			R('<p>(<li.+?)</p>', '$1');
-			R('<p>\\s*(</?' + blocks + '[^>]*>)', '$1');
-			R('(</?' + blocks + '[^>]*>)\\s*</p>', '$1');
-			R('(</?' + blocks + '[^>]*>)\\s*<br />', '$1');
-			R('<br />(\\s*</?(p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)', '$1');
-
-			// pre
-			if (str.indexOf('<pre') != -1)
-			{
-				R('(<pre(.|\n)*?>)((.|\n)*?)</pre>', function(m0, m1, m2, m3)
-				{
-					return X(m1, '\\\\([\'\"\\\\])', '$1') + X(X(X(m3, '<p>', '\n'), '</p>|<br />', ''), '\\\\([\'\"\\\\])', '$1') + '</pre>';
-				});
-			}
-
-			return R('\n</p>$', '</p>');
-		},
-
-		// REMOVE TAGS
-		stripTags: function(html)
-		{
-			var allowed = this.opts.allowedTags;
-			var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi;
-			return html.replace(tags, function ($0, $1)
-			{
-				return $.inArray($1.toLowerCase(), allowed) > '-1' ? $0 : '';
-			});
-		},
-
-
-		savePreCode: function(html)
-		{
-			var pre = html.match(/<pre(.*?)>([\w\W]*?)<\/pre>/gi);
-			if (pre !== null)
-			{
-				$.each(pre, $.proxy(function(i,s)
-				{
-					var arr = s.match(/<pre(.*?)>([\w\W]*?)<\/pre>/i);
-					arr[2] = this.encodeEntities(arr[2]);
-					html = html.replace(s, '<pre' + arr[1] + '>' + arr[2] + '</pre>');
-				}, this));
-			}
-
-			return html;
-		},
-		encodeEntities: function(str)
-		{
-			str = String(str).replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"');
-			return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-		},
-		cleanupPre: function(s)
-		{
-			s = s.replace(/<br>/gi, '\n');
-			s = s.replace(/<\/p>/gi, '\n');
-			s = s.replace(/<\/div>/gi, '\n');
-
-			var tmp = this.document.createElement("div");
-			tmp.innerHTML = s;
-			return tmp.textContent||tmp.innerText;
-
-		},
-
-
-		// PASTE CLEANUP
-		pasteCleanUp: function(html)
-		{
-			var parent = this.getParentNode();
-
-			// clean up pre
-			if ($(parent).get(0).tagName === 'PRE')
-			{
-				html = this.cleanupPre(html);
-				this.pasteCleanUpInsert(html);
-				return true;
-			}
-
-			// remove comments and php tags
-			html = html.replace(/<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi, '');
-
-			// remove nbsp
-			html = html.replace(/(&nbsp;){2,}/gi, '&nbsp;');
-
-			// remove google docs marker
-			html = html.replace(/<b\sid="internal-source-marker(.*?)">([\w\W]*?)<\/b>/gi, "$2");
-
-			// strip tags
-			html = this.stripTags(html);
-
-			// prevert
-			html = html.replace(/<td><\/td>/gi, '[td]');
-			html = html.replace(/<td>&nbsp;<\/td>/gi, '[td]');
-			html = html.replace(/<td><br><\/td>/gi, '[td]');
-			html = html.replace(/<a(.*?)href="(.*?)"(.*?)>([\w\W]*?)<\/a>/gi, '[a href="$2"]$4[/a]');
-			html = html.replace(/<iframe(.*?)>([\w\W]*?)<\/iframe>/gi, '[iframe$1]$2[/iframe]');
-			html = html.replace(/<video(.*?)>([\w\W]*?)<\/video>/gi, '[video$1]$2[/video]');
-			html = html.replace(/<audio(.*?)>([\w\W]*?)<\/audio>/gi, '[audio$1]$2[/audio]');
-			html = html.replace(/<embed(.*?)>([\w\W]*?)<\/embed>/gi, '[embed$1]$2[/embed]');
-			html = html.replace(/<object(.*?)>([\w\W]*?)<\/object>/gi, '[object$1]$2[/object]');
-			html = html.replace(/<param(.*?)>/gi, '[param$1]');
-			html = html.replace(/<img(.*?)style="(.*?)"(.*?)>/gi, '[img$1$3]');
-
-			// remove attributes
-			html = html.replace(/<(\w+)([\w\W]*?)>/gi, '<$1>');
-
-			// remove empty
-			html = html.replace(/<[^\/>][^>]*>(\s*|\t*|\n*|&nbsp;|<br>)<\/[^>]+>/gi, '');
-			html = html.replace(/<[^\/>][^>]*>(\s*|\t*|\n*|&nbsp;|<br>)<\/[^>]+>/gi, '');
-
-			// revert
-			html = html.replace(/\[td\]/gi, '<td>&nbsp;</td>');
-			html = html.replace(/\[a href="(.*?)"\]([\w\W]*?)\[\/a\]/gi, '<a href="$1">$2</a>');
-			html = html.replace(/\[iframe(.*?)\]([\w\W]*?)\[\/iframe\]/gi, '<iframe$1>$2</iframe>');
-			html = html.replace(/\[video(.*?)\]([\w\W]*?)\[\/video\]/gi, '<video$1>$2</video>');
-			html = html.replace(/\[audio(.*?)\]([\w\W]*?)\[\/audio\]/gi, '<audio$1>$2</audio>');
-			html = html.replace(/\[embed(.*?)\]([\w\W]*?)\[\/embed\]/gi, '<embed$1>$2</embed>');
-			html = html.replace(/\[object(.*?)\]([\w\W]*?)\[\/object\]/gi, '<object$1>$2</object>');
-			html = html.replace(/\[param(.*?)\]/gi, '<param$1>');
-			html = html.replace(/\[img(.*?)\]/gi, '<img$1>');
-
-
-			// convert div to p
-			if (this.opts.convertDivs)
-			{
-				html = html.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi, '<p>$2</p>');
-			}
-
-			// remove span
-			html = html.replace(/<span>([\w\W]*?)<\/span>/gi, '$1');
-
-			html = html.replace(/\n{3,}/gi, '\n');
-
-			// remove dirty p
-			html = html.replace(/<p><p>/gi, '<p>');
-			html = html.replace(/<\/p><\/p>/gi, '</p>');
-
-			// FF fix
-			if (this.browser('mozilla'))
-			{
-				html = html.replace(/<br>$/gi, '');
-			}
-
-			this.pasteCleanUpInsert(html);
-
-		},
-
-		pasteCleanUpInsert: function(html)
-		{
-			this.execCommand('inserthtml', html);
-
-			if (this.opts.autoresize === true)
-			{
-				$(this.document.body).scrollTop(this.saveScroll);
-			}
-			else
-			{
-				this.$editor.scrollTop(this.saveScroll);
-			}
-		},
-
-
-		// TEXTAREA CODE FORMATTING
-		formattingRemove: function(html)
-		{
-			// save pre
-			var prebuffer = [];
-			var pre = html.match(/<pre(.*?)>([\w\W]*?)<\/pre>/gi);
-			if (pre !== null)
-			{
-				$.each(pre, function(i,s)
-				{
-					html = html.replace(s, 'prebuffer_' + i);
-					prebuffer.push(s);
-				});
-			}
-
-			html = html.replace(/\s{2,}/g, ' ');
-			html = html.replace(/\n/g, ' ');
-			html = html.replace(/[\t]*/g, '');
-			html = html.replace(/\n\s*\n/g, "\n");
-			html = html.replace(/^[\s\n]*/g, '');
-			html = html.replace(/[\s\n]*$/g, '');
-			html = html.replace(/>\s+</g, '><');
-
-			if (prebuffer)
-			{
-				$.each(prebuffer, function(i,s)
-				{
-					html = html.replace('prebuffer_' + i, s);
-				});
-
-				prebuffer = [];
-			}
-
-			return html;
-		},
-		formattingIndenting: function(html)
-		{
-			html = html.replace(/<li/g, "\t<li");
-			html = html.replace(/<tr/g, "\t<tr");
-			html = html.replace(/<td/g, "\t\t<td");
-			html = html.replace(/<\/tr>/g, "\t</tr>");
-
-			return html;
-		},
-		formattingEmptyTags: function(html)
-		{
-			var etags = ["<pre></pre>","<blockquote>\\s*</blockquote>","<em>\\s*</em>","<ul></ul>","<ol></ol>","<li></li>","<table></table>","<tr></tr>","<span>\\s*<span>", "<span>&nbsp;<span>", "<b>\\s*</b>", "<b>&nbsp;</b>", "<p>\\s*</p>", "<p>&nbsp;</p>",  "<p>\\s*<br>\\s*</p>", "<div>\\s*</div>", "<div>\\s*<br>\\s*</div>"];
-			for (var i = 0; i < etags.length; ++i)
-			{
-				var bbb = etags[i];
-				html = html.replace(new RegExp(bbb,'gi'), "");
-			}
-
-			return html;
-		},
-		formattingAddBefore: function(html)
-		{
-			var lb = '\r\n';
-			var btags = ["<p", "<form","</ul>", '</ol>', "<fieldset","<legend","<object","<embed","<select","<option","<input","<textarea","<pre","<blockquote","<ul","<ol","<li","<dl","<dt","<dd","<table", "<thead","<tbody","<caption","</caption>","<th","<tr","<td","<figure"];
-			for (var i = 0; i < btags.length; ++i)
-			{
-				var eee = btags[i];
-				html = html.replace(new RegExp(eee,'gi'),lb+eee);
-			}
-
-			return html;
-		},
-		formattingAddAfter: function(html)
-		{
-			var lb = '\r\n';
-			var atags = ['</p>', '</div>', '</h1>', '</h2>', '</h3>', '</h4>', '</h5>', '</h6>', '<br>', '<br />', '</dl>', '</dt>', '</dd>', '</form>', '</blockquote>', '</pre>', '</legend>', '</fieldset>', '</object>', '</embed>', '</textarea>', '</select>', '</option>', '</table>', '</thead>', '</tbody>', '</tr>', '</td>', '</th>', '</figure>'];
-			for (var i = 0; i < atags.length; ++i)
-			{
-				var aaa = atags[i];
-				html = html.replace(new RegExp(aaa,'gi'),aaa+lb);
-			}
-
-			return html;
-		},
-		formatting: function(html)
-		{
-			html = this.formattingRemove(html);
-
-			// empty tags
-			html = this.formattingEmptyTags(html);
-
-			// add formatting before
-			html = this.formattingAddBefore(html);
-
-			// add formatting after
-			html = this.formattingAddAfter(html);
-
-			// indenting
-			html = this.formattingIndenting(html);
-
-			return html;
-		},
-
-		// TOGGLE
-		toggle: function()
-		{
-			var html;
-
-			if (this.opts.visual)
-			{
-				var height = this.$editor.innerHeight();
-
-				this.$editor.hide();
-				this.$content.hide();
-
-				html = this.$editor.html();
-				//html = $.trim(this.formatting(html));
-
-				this.$el.height(height).val(html).show().focus();
-
-				this.setBtnActive('html');
-				this.opts.visual = false;
-			}
-			else
-			{
-				this.$el.hide();
-				var html = this.$el.val();
-
-				//html = this.savePreCode(html);
-
-				// clean up
-				//html = this.stripTags(html);
-
-				// set code
-				this.$editor.html(html).show();
-				this.$content.show();
-
-				if (this.$editor.html() === '')
-				{
-					this.setCode(this.opts.emptyHtml);
-				}
-
-				this.$editor.focus();
-
-				this.setBtnInactive('html');
-				this.opts.visual = true;
-
-				this.observeImages();
-				this.observeTables();
-			}
-		},
-
-		// AUTOSAVE
-		autoSave: function()
-		{
-			this.autosaveInterval = setInterval($.proxy(function()
-			{
-				$.ajax({
-					url: this.opts.autosave,
-					type: 'post',
-					data: this.$el.attr('name') + '=' + escape(encodeURIComponent(this.getCode())),
-					success: $.proxy(function(data)
-					{
-						// callback
-						if (typeof this.opts.autosaveCallback === 'function')
-						{
-							this.opts.autosaveCallback(data, this);
-						}
-
-					}, this)
-				});
-
-
-			}, this), this.opts.interval*1000);
-		},
-
-		// TOOLBAR
-		buildToolbar: function()
-		{
-			if (this.opts.toolbar === false)
-			{
-				return false;
-			}
-
-			this.$toolbar = $('<ul>').addClass('redactor_toolbar');
-
-			if (this.opts.air)
-			{
-				$(this.air).append(this.$toolbar);
-				$('body').append(this.air);
-			}
-			else
-			{
-				if (this.opts.toolbarExternal === false)
-				{
-					this.$box.prepend(this.$toolbar);
-				}
-				else
-				{
-					$(this.opts.toolbarExternal).html(this.$toolbar);
-				}
-			}
-
-			$.each(this.opts.buttons, $.proxy(function(i,key)
-			{
-
-				if (key !== '|' && typeof this.opts.toolbar[key] !== 'undefined')
-				{
-					var s = this.opts.toolbar[key];
-
-					if (this.opts.fileUpload === false && key === 'file')
-					{
-						return true;
-					}
-
-					this.$toolbar.append($('<li>').append(this.buildButton(key, s)));
-				}
-
-
-				if (key === '|')
-				{
-					this.$toolbar.append($('<li class="redactor_separator"></li>'));
-				}
-
-			}, this));
-
-		},
-		buildButton: function(key, s)
-		{
-			var button = $('<a href="javascript:void(null);" title="' + s.title + '" class="redactor_btn_' + key + '"></a>');
-
-			if (typeof s.func === 'undefined')
-			{
-				button.click($.proxy(function()
-				{
-					if ($.inArray(key, this.opts.activeButtons) != -1)
-					{
-						this.inactiveAllButtons();
-						this.setBtnActive(key);
-					}
-
-					if (this.browser('mozilla'))
-					{
-						this.$editor.focus();
-						//this.restoreSelection();
-					}
-
-					this.execCommand(s.exec, key);
-
-				}, this));
-			}
-			else if (s.func !== 'show')
-			{
-				button.click($.proxy(function(e) {
-
-					this[s.func](e);
-
-				}, this));
-			}
-
-			if (typeof s.callback !== 'undefined' && s.callback !== false)
-			{
-				button.click($.proxy(function(e) { s.callback(this, e, key); }, this));
-			}
-
-			// dropdown
-			if (key === 'backcolor' || key === 'fontcolor' || typeof(s.dropdown) !== 'undefined')
-			{
-				var dropdown = $('<div class="redactor_dropdown" style="display: none;">');
-
-				if (key === 'backcolor' || key === 'fontcolor')
-				{
-					dropdown = this.buildColorPicker(dropdown, key);
-				}
-				else
-				{
-					dropdown = this.buildDropdown(dropdown, s.dropdown);
-				}
-
-				this.dropdowns.push(dropdown.appendTo($(document.body)));
-
-				// observing dropdown
-				this.hdlShowDropDown = $.proxy(function(e) { this.showDropDown(e, dropdown, key); }, this);
-
-				button.click(this.hdlShowDropDown);
-			}
-
-			return button;
-		},
-		buildDropdown: function(dropdown, obj)
-		{
-			$.each(obj, $.proxy(
-				function (x, d)
-				{
-					if (typeof(d.className) === 'undefined')
-					{
-						d.className = '';
-					}
-
-					var drop_a;
-					if (typeof d.name !== 'undefined' && d.name === 'separator')
-					{
-						drop_a = $('<a class="redactor_separator_drop">');
-					}
-					else
-					{
-						drop_a = $('<a href="javascript:void(null);" class="' + d.className + '">' + d.title + '</a>');
-
-						if (typeof(d.callback) === 'function')
-						{
-							$(drop_a).click($.proxy(function(e) { d.callback(this, e, x); }, this));
-						}
-						else if (typeof(d.func) === 'undefined')
-						{
-							$(drop_a).click($.proxy(function() { this.execCommand(d.exec, x); }, this));
-						}
-						else
-						{
-							$(drop_a).click($.proxy(function(e) { this[d.func](e); }, this));
-						}
-					}
-
-					$(dropdown).append(drop_a);
-
-				}, this)
-			);
-
-			return dropdown;
-
-		},
-		buildColorPicker: function(dropdown, key)
-		{
-			var mode;
-			if (key === 'backcolor')
-			{
-				if (this.browser('msie'))
-				{
-					mode = 'BackColor';
-				}
-				else
-				{
-					mode = 'hilitecolor';
-				}
-			}
-			else
-			{
-				mode = 'forecolor';
-			}
-
-			$(dropdown).width(210);
-
-			var len = this.opts.colors.length;
-			for (var i = 0; i < len; ++i)
-			{
-				var color = this.opts.colors[i];
-
-				var swatch = $('<a rel="' + color + '" href="javascript:void(null);" class="redactor_color_link"></a>').css({ 'backgroundColor': color });
-				$(dropdown).append(swatch);
-
-				var _self = this;
-				$(swatch).click(function()
-				{
-					_self.execCommand(mode, $(this).attr('rel'));
-
-					if (mode === 'forecolor')
-					{
-						_self.$editor.find('font').replaceWith(function() {
-
-							return $('<span style="color: ' + $(this).attr('color') + ';">' + $(this).html() + '</span>');
-
-						});
-					}
-
-					if (_self.browser('msie') && mode === 'BackColor')
-					{
-						_self.$editor.find('font').replaceWith(function() {
-
-							return $('<span style="' + $(this).attr('style') + '">' + $(this).html() + '</span>');
-
-						});
-					}
-
-				});
-			}
-
-			var elnone = $('<a href="javascript:void(null);" class="redactor_color_none"></a>').html(RLANG.none);
-
-			if (key === 'backcolor')
-			{
-				elnone.click($.proxy(this.setBackgroundNone, this));
-			}
-			else
-			{
-				elnone.click($.proxy(this.setColorNone, this));
-			}
-
-			$(dropdown).append(elnone);
-
-			return dropdown;
-		},
-		setBackgroundNone: function()
-		{
-			$(this.getParentNode()).css('background-color', 'transparent');
-			this.syncCode();
-		},
-		setColorNone: function()
-		{
-			$(this.getParentNode()).attr('color', '').css('color', '');
-			this.syncCode();
-		},
-
-		// DROPDOWNS
-		showDropDown: function(e, dropdown, key)
-		{
-			if (this.getBtn(key).hasClass('dropact'))
-			{
-				this.hideAllDropDown();
-			}
-			else
-			{
-				this.hideAllDropDown();
-
-				this.setBtnActive(key);
-				this.getBtn(key).addClass('dropact');
-
-				var left = this.getBtn(key).offset().left;
-
-				if (this.opts.air)
-				{
-					var air_top = this.air.offset().top;
-
-					$(dropdown).css({ position: 'absolute', left: left + 'px', top: air_top+30 + 'px' }).show();
-				}
-				else if (this.opts.fixed && this.fixed)
-				{
-					$(dropdown).css({ position: 'fixed', left: left + 'px', top: '30px' }).show();
-				}
-				else
-				{
-					var top = this.$toolbar.offset().top + 30;
-					$(dropdown).css({ position: 'absolute', left: left + 'px', top: top + 'px' }).show();
-				}
-			}
-
-			var hdlHideDropDown = $.proxy(function(e) { this.hideDropDown(e, dropdown, key); }, this);
-
-			$(document).one('click', hdlHideDropDown);
-			this.$editor.one('click', hdlHideDropDown);
-			this.$content.one('click', hdlHideDropDown);
-
-			e.stopPropagation();
-
-		},
-		hideAllDropDown: function()
-		{
-			this.$toolbar.find('a.dropact').removeClass('redactor_act').removeClass('dropact');
-			$('.redactor_dropdown').hide();
-		},
-		hideDropDown: function(e, dropdown, key)
-		{
-			if (!$(e.target).hasClass('dropact'))
-			{
-				$(dropdown).removeClass('dropact');
-				this.showedDropDown = false;
-				this.hideAllDropDown();
-			}
-		},
-
-		// BUTTONS MANIPULATIONS
-		getBtn: function(key)
-		{
-			if (this.opts.toolbar === false)
-			{
-				return false;
-			}
-
-			return $(this.$toolbar.find('a.redactor_btn_' + key));
-		},
-		setBtnActive: function(key)
-		{
-			this.getBtn(key).addClass('redactor_act');
-		},
-		setBtnInactive: function(key)
-		{
-			this.getBtn(key).removeClass('redactor_act');
-		},
-		inactiveAllButtons: function()
-		{
-			$.each(this.opts.activeButtons, $.proxy(function(i,s)
-			{
-				this.setBtnInactive(s);
-
-			}, this));
-		},
-		changeBtnIcon: function(key, classname)
-		{
-			this.getBtn(key).addClass('redactor_btn_' + classname);
-		},
-		removeBtnIcon: function(key, classname)
-		{
-			this.getBtn(key).removeClass('redactor_btn_' + classname);
-		},
-
-		addBtnSeparator: function()
-		{
-			this.$toolbar.append($('<li class="redactor_separator"></li>'));
-		},
-		addBtnSeparatorAfter: function(key)
-		{
-			var $btn = this.getBtn(key);
-			$btn.parent().after($('<li class="redactor_separator"></li>'));
-		},
-		addBtnSeparatorBefore: function(key)
-		{
-			var $btn = this.getBtn(key);
-			$btn.parent().before($('<li class="redactor_separator"></li>'));
-		},
-		removeBtnSeparatorAfter: function(key)
-		{
-			var $btn = this.getBtn(key);
-			$btn.parent().next().remove();
-		},
-		removeBtnSeparatorBefore: function(key)
-		{
-			var $btn = this.getBtn(key);
-			$btn.parent().prev().remove();
-		},
-
-		setBtnRight: function(key)
-		{
-			if (this.opts.toolbar === false)
-			{
-				return false;
-			}
-
-			this.getBtn(key).parent().addClass('redactor_btn_right');
-		},
-		setBtnLeft: function(key)
-		{
-			if (this.opts.toolbar === false)
-			{
-				return false;
-			}
-
-			this.getBtn(key).parent().removeClass('redactor_btn_right');
-		},
-		addBtn: function(key, title, callback, dropdown)
-		{
-			if (this.opts.toolbar === false)
-			{
-				return false;
-			}
-
-			var btn = this.buildButton(key, { title: title, callback: callback, dropdown: dropdown });
-			this.$toolbar.append($('<li>').append(btn));
-		},
-		addBtnFirst: function(key, title, callback, dropdown)
-		{
-			if (this.opts.toolbar === false)
-			{
-				return false;
-			}
-
-			var btn = this.buildButton(key, { title: title, callback: callback, dropdown: dropdown });
-			this.$toolbar.prepend($('<li>').append(btn));
-		},
-		addBtnAfter: function(afterkey, key, title, callback, dropdown)
-		{
-			if (this.opts.toolbar === false)
-			{
-				return false;
-			}
-
-			var btn = this.buildButton(key, { title: title, callback: callback, dropdown: dropdown });
-			var $btn = this.getBtn(afterkey);
-			$btn.parent().after($('<li>').append(btn));
-		},
-		addBtnBefore: function(beforekey, key, title, callback, dropdown)
-		{
-			if (this.opts.toolbar === false)
-			{
-				return false;
-			}
-
-			var btn = this.buildButton(key, { title: title, callback: callback, dropdown: dropdown });
-			var $btn = this.getBtn(beforekey);
-			$btn.parent().before($('<li>').append(btn));
-		},
-		removeBtn: function(key, separator)
-		{
-			var $btn = this.getBtn(key);
-
-			if (separator === true)
-			{
-				$btn.parent().next().remove();
-			}
-
-			$btn.parent().removeClass('redactor_btn_right');
-			$btn.remove();
-		},
-
-
-		// SELECTION AND NODE MANIPULATION
-		getFragmentHtml: function (fragment)
-		{
-			var cloned = fragment.cloneNode(true);
-			var div = this.document.createElement('div');
-			div.appendChild(cloned);
-			return div.innerHTML;
-		},
-		extractContent: function()
-		{
-			var node = this.$editor.get(0);
-			var frag = this.document.createDocumentFragment(), child;
-			while ((child = node.firstChild))
-			{
-				frag.appendChild(child);
-			}
-
-			return frag;
-		},
-
-		// Save and Restore Selection
-		saveSelection: function()
-		{
-			this.$editor.focus();
-
-			this.savedSel = this.getOrigin();
-			this.savedSelObj = this.getFocus();
-		},
-		restoreSelection: function()
-		{
-			if (typeof this.savedSel !== 'undefined' && this.savedSel !== null && this.savedSelObj !== null && this.savedSel[0].tagName !== 'BODY')
-			{
-				if (this.opts.iframe === false && $(this.savedSel[0]).closest('.redactor_editor').size() == 0)
-				{
-					this.$editor.focus();
-				}
-				else
-				{
-					if (this.browser('opera'))
-					{
-						this.$editor.focus();
-					}
-
-					this.setSelection(this.savedSel[0], this.savedSel[1], this.savedSelObj[0], this.savedSelObj[1]);
-
-					if (this.browser('mozilla'))
-					{
-						this.$editor.focus();
-					}
-				}
-			}
-			else
-			{
-				this.$editor.focus();
-			}
-		},
-
-		// Selection
-		getSelection: function()
-		{
-			var doc = this.document;
-
-			if (this.window.getSelection)
-			{
-				return this.window.getSelection();
-			}
-			else if (doc.getSelection)
-			{
-				return doc.getSelection();
-			}
-			else // IE
-			{
-				return doc.selection.createRange();
-			}
-
-			return false;
-		},
-		hasSelection: function()
-		{
-			if (!this.oldIE())
-			{
-				var sel;
-				return (sel = this.getSelection()) && (sel.focusNode != null) && (sel.anchorNode != null);
-			}
-			else // IE8
-			{
-				var node = this.$editor.get(0);
-
-				var range;
-				node.focus();
-				if (!node.document.selection)
-				{
-					return false;
-				}
-
-				range = node.document.selection.createRange();
-				return range && range.parentElement().document === node.document;
-			}
-		},
-		getOrigin: function()
-		{
-			if (!this.oldIE())
-			{
-				var sel;
-				if (!((sel = this.getSelection()) && (sel.anchorNode != null)))
-				{
-					return null;
-				}
-
-				return [sel.anchorNode, sel.anchorOffset];
-			}
-			else
-			{
-				var node = this.$editor.get(0);
-
-				var range;
-				node.focus();
-				if (!this.hasSelection())
-				{
-					return null;
-				}
-
-				range = node.document.selection.createRange();
-				return this._getBoundary(node.document, range, true);
-			}
-		},
-		getFocus: function()
-		{
-			if (!this.oldIE())
-			{
-				var sel;
-				if (!((sel = this.getSelection()) && (sel.focusNode != null)))
-				{
-					return null;
-				}
-
-				return [sel.focusNode, sel.focusOffset];
-			}
-			else
-			{
-				var node = this.$editor.get(0);
-
-				var range;
-				node.focus();
-				if (!this.hasSelection())
-				{
-					return null;
-				}
-
-				range = node.document.selection.createRange();
-				return this._getBoundary(node.document, range, false);
-
-			}
-		},
-		setSelection: function (orgn, orgo, focn, foco)
-		{
-			if (focn == null)
-			{
-				focn = orgn;
-			}
-
-			if (foco == null)
-			{
-				foco = orgo;
-			}
-
-			if (!this.oldIE())
-			{
-				var sel = this.getSelection();
-				if (!sel)
-				{
-					return;
-				}
-
-				if (sel.collapse && sel.extend)
-				{
-					sel.collapse(orgn, orgo);
-					sel.extend(focn, foco);
-				}
-				else // IE9
-				{
-					r = this.document.createRange();
-					r.setStart(orgn, orgo);
-					r.setEnd(focn, foco);
-
-					try
-					{
-						sel.removeAllRanges();
-					}
-					catch (e) {}
-
-					sel.addRange(r);
-				}
-			}
-			else
-			{
-				var node = this.$editor.get(0);
-				var range = node.document.body.createTextRange();
-
-				this._moveBoundary(node.document, range, false, focn, foco);
-				this._moveBoundary(node.document, range, true, orgn, orgo);
-				return range.select();
-			}
-		},
-
-		// Get elements, html and text
-		getCurrentNode: function()
-		{
-			if (typeof this.window.getSelection !== 'undefined')
-			{
-				return this.getSelectedNode().parentNode;
-			}
-			else if (typeof this.document.selection !== 'undefined')
-			{
-				return this.getSelection().parentElement();
-			}
-		},
-		getParentNode: function()
-		{
-			return $(this.getCurrentNode()).parent()[0]
-		},
-		getSelectedNode: function()
-		{
-			if (this.oldIE())
-			{
-				return this.getSelection().parentElement();
-			}
-			else if (typeof this.window.getSelection !== 'undefined')
-			{
-				var s = this.window.getSelection();
-				if (s.rangeCount > 0)
-				{
-					return this.getSelection().getRangeAt(0).commonAncestorContainer;
-				}
-				else
-				{
-					return false;
-				}
-			}
-			else if (typeof this.document.selection !== 'undefined')
-			{
-				return this.getSelection();
-			}
-		},
-
-
-		// IE8 specific selection
-		_getBoundary: function(doc, textRange, bStart)
-		{
-			var cursor, cursorNode, node, offset, parent;
-
-			cursorNode = doc.createElement('a');
-			cursor = textRange.duplicate();
-			cursor.collapse(bStart);
-			parent = cursor.parentElement();
-			while (true)
-			{
-				parent.insertBefore(cursorNode, cursorNode.previousSibling);
-				cursor.moveToElementText(cursorNode);
-				if (!(cursor.compareEndPoints((bStart ? 'StartToStart' : 'StartToEnd'), textRange) > 0 && (cursorNode.previousSibling != null)))
-				{
-					break;
-				}
-			}
-
-			if (cursor.compareEndPoints((bStart ? 'StartToStart' : 'StartToEnd'), textRange) === -1 && cursorNode.nextSibling)
-			{
-				cursor.setEndPoint((bStart ? 'EndToStart' : 'EndToEnd'), textRange);
-				node = cursorNode.nextSibling;
-				offset = cursor.text.length;
-			}
-			else
-			{
-				node = cursorNode.parentNode;
-				offset = this._getChildIndex(cursorNode);
-			}
-
-			cursorNode.parentNode.removeChild(cursorNode);
-			return [node, offset];
-		},
-		_moveBoundary: function(doc, textRange, bStart, node, offset)
-		{
-			var anchorNode, anchorParent, cursor, cursorNode, textOffset;
-
-			textOffset = 0;
-			anchorNode = this._isText(node) ? node : node.childNodes[offset];
-			anchorParent = this._isText(node) ? node.parentNode : node;
-
-			if (this._isText(node))
-			{
-				textOffset = offset;
-			}
-
-			cursorNode = doc.createElement('a');
-			anchorParent.insertBefore(cursorNode, anchorNode || null);
-			cursor = doc.body.createTextRange();
-			cursor.moveToElementText(cursorNode);
-			cursorNode.parentNode.removeChild(cursorNode);
-
-			textRange.setEndPoint((bStart ? 'StartToStart' : 'EndToEnd'), cursor);
-			return textRange[bStart ? 'moveStart' : 'moveEnd']('character', textOffset);
-		},
-		_isText: function (d)
-		{
-			return (d != null ? d.nodeType == 3 : false);
-		},
-		_getChildIndex: function (e)
-		{
-			var k = 0;
-			while (e = e.previousSibling) {
-				k++;
-			}
-			return k;
-		},
-
-		insertNodeAfterCaret: function(node)
-		{
-			this.saveSelection();
-		    this.insertNodeAtCaret(node);
-			this.restoreSelection();
-		},
-
-		insertNodeAtCaret: function(node)
-		{
-			if (this.window.getSelection)
-			{
-				var sel = this.getSelection();
-				if (sel.rangeCount)
-				{
-					var range = sel.getRangeAt(0);
-					range.collapse(false);
-					range.insertNode(node);
-					range = range.cloneRange();
-					range.selectNodeContents(node);
-					range.collapse(false);
-					sel.removeAllRanges();
-					sel.addRange(range);
-				}
-			}
-			else if (this.document.selection)
-			{
-				var html = (node.nodeType === 1) ? node.outerHTML : node.data;
-				var id = "marker_" + ("" + Math.random()).slice(2);
-				html += '<span id="' + id + '"></span>';
-				var textRange = this.getSelection();
-				textRange.collapse(false);
-				textRange.pasteHTML(html);
-				var markerSpan = this.document.getElementById(id);
-				textRange.moveToElementText(markerSpan);
-				textRange.select();
-				markerSpan.parentNode.removeChild(markerSpan);
-			}
-		},
-		getSelectedHtml: function()
-		{
-			var html = '';
-			if (this.window.getSelection)
-			{
-				var sel = this.window.getSelection();
-				if (sel.rangeCount)
-				{
-					var container = this.document.createElement("div");
-					for (var i = 0, len = sel.rangeCount; i < len; ++i)
-					{
-						container.appendChild(sel.getRangeAt(i).cloneContents());
-					}
-
-					html = container.innerHTML;
-
-				}
-			}
-			else if (this.document.selection)
-			{
-				if (this.document.selection.type === "Text")
-				{
-					html = this.document.selection.createRange().htmlText;
-				}
-			}
-
-			return html;
-		},
-
-		// RESIZE IMAGES
-		resizeImage: function(resize)
-		{
-			var clicked = false;
-			var clicker = false;
-			var start_x;
-			var start_y;
-			var ratio = $(resize).width()/$(resize).height();
-			var min_w = 10;
-			var min_h = 10;
-
-			$(resize).off('hover mousedown mouseup click mousemove');
- 			$(resize).hover(function() { $(resize).css('cursor', 'nw-resize'); }, function() { $(resize).css('cursor',''); clicked = false; });
-
-			$(resize).mousedown(function(e)
-			{
-				e.preventDefault();
-
-				ratio = $(resize).width()/$(resize).height();
-
-				clicked = true;
-				clicker = true;
-
-				start_x = Math.round(e.pageX - $(resize).eq(0).offset().left);
-				start_y = Math.round(e.pageY - $(resize).eq(0).offset().top);
-			});
-
-			$(resize).mouseup($.proxy(function(e)
-			{
-				clicked = false;
-				$(resize).css('cursor','');
-				this.syncCode();
-
-			}, this));
-
-			$(resize).click($.proxy(function(e)
-			{
-				if (clicker)
-				{
-					this.imageEdit(e);
-				}
-
-			}, this));
-
-			$(resize).mousemove(function(e)
-			{
-				if (clicked)
-				{
-					clicker = false;
-
-					var mouse_x = Math.round(e.pageX - $(this).eq(0).offset().left) - start_x;
-					var mouse_y = Math.round(e.pageY - $(this).eq(0).offset().top) - start_y;
-
-					var div_h = $(resize).height();
-
-					var new_h = parseInt(div_h, 10) + mouse_y;
-					var new_w = new_h*ratio;
-
-					if (new_w > min_w)
-					{
-						$(resize).width(new_w);
-					}
-
-					if (new_h > min_h)
-					{
-						$(resize).height(new_h);
-					}
-
-					start_x = Math.round(e.pageX - $(this).eq(0).offset().left);
-					start_y = Math.round(e.pageY - $(this).eq(0).offset().top);
-				}
-			});
-		},
-
-		// TABLE
-		showTable: function()
-		{
-			this.saveSelection();
-
-			this.modalInit(RLANG.table, this.opts.modal_table, 300, $.proxy(function()
-				{
-					$('#redactor_insert_table_btn').click($.proxy(this.insertTable, this));
-
-					setTimeout(function()
-					{
-						$('#redactor_table_rows').focus();
-					}, 200);
-
-				}, this)
-			);
-		},
-		insertTable: function()
-		{
-			var rows = $('#redactor_table_rows').val();
-			var columns = $('#redactor_table_columns').val();
-
-			var table_box = $('<div></div>');
-
-			var tableid = Math.floor(Math.random() * 99999);
-			var table = $('<table id="table' + tableid + '"><tbody></tbody></table>');
-
-			for (var i = 0; i < rows; i++)
-			{
-				var row = $('<tr></tr>');
-				for (var z = 0; z < columns; z++)
-				{
-					var column = $('<td><br></td>');
-					$(row).append(column);
-				}
-				$(table).append(row);
-			}
-
-			$(table_box).append(table);
-			var html = $(table_box).html() + '<p></p>';
-
-			this.restoreSelection();
-			this.execCommand('inserthtml', html);
-			this.modalClose();
-			this.observeTables();
-
-		},
-		tableObserver: function(e)
-		{
-			this.$table = $(e.target).closest('table');
-
-			this.$table_tr = this.$table.find('tr');
-			this.$table_td = this.$table.find('td');
-
-			this.$tbody = $(e.target).closest('tbody');
-			this.$thead = $(this.$table).find('thead');
-
-			this.$current_td = $(e.target);
-			this.$current_tr = $(e.target).closest('tr');
-		},
-		deleteTable: function()
-		{
-			$(this.$table).remove();
-			this.$table = false;
-			this.syncCode();
-		},
-		deleteRow: function()
-		{
-			$(this.$current_tr).remove();
-			this.syncCode();
-		},
-		deleteColumn: function()
-		{
-			var index = $(this.$current_td).get(0).cellIndex;
-
-			$(this.$table).find('tr').each(function()
-			{
-				$(this).find('td').eq(index).remove();
-			});
-
-			this.syncCode();
-		},
-		addHead: function()
-		{
-			if ($(this.$table).find('thead').size() !== 0)
-			{
-				this.deleteHead();
-			}
-			else
-			{
-				var tr = $(this.$table).find('tr').first().clone();
-				tr.find('td').html('&nbsp;');
-				this.$thead = $('<thead></thead>');
-				this.$thead.append(tr);
-				$(this.$table).prepend(this.$thead);
-				this.syncCode();
-			}
-		},
-		deleteHead: function()
-		{
-			$(this.$thead).remove();
-			this.$thead = false;
-			this.syncCode();
-		},
-		insertRowAbove: function()
-		{
-			this.insertRow('before');
-		},
-		insertRowBelow: function()
-		{
-			this.insertRow('after');
-		},
-		insertColumnLeft: function()
-		{
-			this.insertColumn('before');
-		},
-		insertColumnRight: function()
-		{
-			this.insertColumn('after');
-		},
-		insertRow: function(type)
-		{
-			var new_tr = $(this.$current_tr).clone();
-			new_tr.find('td').html('&nbsp;');
-			if (type === 'after')
-			{
-				$(this.$current_tr).after(new_tr);
-			}
-			else
-			{
-				$(this.$current_tr).before(new_tr);
-			}
-
-			this.syncCode();
-		},
-		insertColumn: function(type)
-		{
-			var index = 0;
-
-			this.$current_tr.find('td').each($.proxy(function(i,s)
-			{
-				if ($(s)[0] === this.$current_td[0])
-				{
-					index = i;
-				}
-			}, this));
-
-			this.$table_tr.each(function(i,s)
-			{
-				var current = $(s).find('td').eq(index);
-
-				var td = current.clone();
-				td.html('&nbsp;');
-
-				if (type === 'after')
-				{
-					$(current).after(td);
-				}
-				else
-				{
-					$(current).before(td);
-				}
-
-			});
-
-			this.syncCode();
-		},
-
-		// INSERT VIDEO
-		showVideo: function()
-		{
-			this.saveSelection();
-			this.modalInit(RLANG.video, this.opts.modal_video, 600, $.proxy(function()
-				{
-					$('#redactor_insert_video_btn').click($.proxy(this.insertVideo, this));
-
-					setTimeout(function()
-					{
-						$('#redactor_insert_video_area').focus();
-					}, 200);
-
-				}, this)
-			);
-		},
-		insertVideo: function()
-		{
-			var data = $('#redactor_insert_video_area').val();
-			data = this.stripTags(data);
-
-			this.restoreSelection();
-			this.execCommand('inserthtml', data);
-			this.modalClose();
-		},
-
-		// INSERT IMAGE
-		imageEdit: function(e)
-		{
-			var $el = $(e.target);
-			var parent = $el.parent();
-
-			var callback = $.proxy(function()
-			{
-				$('#redactor_file_alt').val($el.attr('alt'));
-				$('#redactor_image_edit_src').attr('href', $el.attr('src'));
-				$('#redactor_form_image_align').val($el.css('float'));
-
-				if ($(parent).get(0).tagName === 'A')
-				{
-					$('#redactor_file_link').val($(parent).attr('href'));
-				}
-
-				$('#redactor_image_delete_btn').click($.proxy(function() { this.imageDelete($el); }, this));
-				$('#redactorSaveBtn').click($.proxy(function() { this.imageSave($el); }, this));
-
-			}, this);
-
-			this.modalInit(RLANG.image, this.opts.modal_image_edit, 380, callback);
-
-		},
-		imageDelete: function(el)
-		{
-			$(el).remove();
-			this.modalClose();
-			this.syncCode();
-		},
-		imageSave: function(el)
-		{
-			var parent = $(el).parent();
-
-			$(el).attr('alt', $('#redactor_file_alt').val());
-
-			var floating = $('#redactor_form_image_align').val();
-
-			if (floating === 'left')
-			{
-				$(el).css({ 'float': 'left', margin: '0 10px 10px 0' });
-			}
-			else if (floating === 'right')
-			{
-				$(el).css({ 'float': 'right', margin: '0 0 10px 10px' });
-			}
-			else
-			{
-				$(el).css({ 'float': 'none', margin: '0' });
-			}
-
-			// as link
-			var link = $.trim($('#redactor_file_link').val());
-			if (link !== '')
-			{
-				if ($(parent).get(0).tagName !== 'A')
-				{
-					$(el).replaceWith('<a href="' + link + '">' + this.outerHTML(el) + '</a>');
-				}
-				else
-				{
-					$(parent).attr('href', link);
-				}
-			}
-			else
-			{
-				if ($(parent).get(0).tagName === 'A')
-				{
-					$(parent).replaceWith(this.outerHTML(el));
-				}
-			}
-
-			this.modalClose();
-			this.observeImages();
-			this.syncCode();
-
-		},
-		showImage: function()
-		{
-			this.saveSelection();
-
-			var callback = $.proxy(function()
-			{
-				// json
-				if (this.opts.imageGetJson !== false)
-				{
-					$.getJSON(this.opts.imageGetJson, $.proxy(function(data) {
-
-						var folders = {};
-						var z = 0;
-
-						// folders
-						$.each(data, $.proxy(function(key, val)
-						{
-							if (typeof val.folder !== 'undefined')
-							{
-								z++;
-								folders[val.folder] = z;
-							}
-
-						}, this));
-
-						var folderclass = false;
-						$.each(data, $.proxy(function(key, val)
-						{
-							// title
-							var thumbtitle = '';
-							if (typeof val.title !== 'undefined')
-							{
-								thumbtitle = val.title;
-							}
-
-							var folderkey = 0;
-							if (!$.isEmptyObject(folders) && typeof val.folder !== 'undefined')
-							{
-								folderkey = folders[val.folder];
-								if (folderclass === false)
-								{
-									folderclass = '.redactorfolder' + folderkey;
-								}
-							}
-
-							var img = $('<img src="' + val.thumb + '" class="redactorfolder redactorfolder' + folderkey + '" rel="' + val.image + '" title="' + thumbtitle + '" />');
-							$('#redactor_image_box').append(img);
-							$(img).click($.proxy(this.imageSetThumb, this));
-
-
-						}, this));
-
-						// folders
-						if (!$.isEmptyObject(folders))
-						{
-							$('.redactorfolder').hide();
-							$(folderclass).show();
-
-							var onchangeFunc = function(e)
-							{
-								$('.redactorfolder').hide();
-								$('.redactorfolder' + $(e.target).val()).show();
-							}
-
-							var select = $('<select id="redactor_image_box_select">');
-							$.each(folders, function(k,v)
-							{
-								select.append($('<option value="' + v + '">' + k + '</option>'));
-							});
-
-							$('#redactor_image_box').before(select);
-							select.change(onchangeFunc);
-						}
-
-					}, this));
-				}
-				else
-				{
-					$('#redactor_tabs a').eq(1).remove();
-				}
-
-				if (this.opts.imageUpload !== false)
-				{
-
-					// dragupload
-					if (this.opts.uploadCrossDomain === false && this.isMobile() === false)
-					{
-
-						if ($('#redactor_file').size() !== 0)
-						{
-							$('#redactor_file').dragupload(
-							{
-								url: this.opts.imageUpload,
-								uploadFields: this.opts.uploadFields,
-								success: $.proxy(this.imageUploadCallback, this),
-								error: $.proxy(this.opts.imageUploadErrorCallback, this)
-							});
-						}
-					}
-
-					// ajax upload
-					this.uploadInit('redactor_file',
-					{
-						auto: true,
-						url: this.opts.imageUpload,
-						success: $.proxy(this.imageUploadCallback, this),
-						error: $.proxy(this.opts.imageUploadErrorCallback, this)
-					});
-				}
-				else
-				{
-					$('.redactor_tab').hide();
-					if (this.opts.imageGetJson === false)
-					{
-						$('#redactor_tabs').remove();
-						$('#redactor_tab3').show();
-					}
-					else
-					{
-						var tabs = $('#redactor_tabs a');
-						tabs.eq(0).remove();
-						tabs.eq(1).addClass('redactor_tabs_act');
-						$('#redactor_tab2').show();
-					}
-				}
-
-				$('#redactor_upload_btn').click($.proxy(this.imageUploadCallbackLink, this));
-
-				if (this.opts.imageUpload === false && this.opts.imageGetJson === false)
-				{
-					setTimeout(function()
-					{
-						$('#redactor_file_link').focus();
-					}, 200);
-
-				}
-
-			}, this);
-
-			this.modalInit(RLANG.image, this.opts.modal_image, 610, callback);
-
-		},
-		imageSetThumb: function(e)
-		{
-			this._imageSet('<img src="' + $(e.target).attr('rel') + '" alt="' + $(e.target).attr('title') + '" />', true);
-		},
-		imageUploadCallbackLink: function()
-		{
-			if ($('#redactor_file_link').val() !== '')
-			{
-				var data = '<img src="' + $('#redactor_file_link').val() + '" />';
-				this._imageSet(data, true);
-			}
-			else
-			{
-				this.modalClose();
-			}
-		},
-		imageUploadCallback: function(data)
-		{
-			this._imageSet(data);
-		},
-		_imageSet: function(json, link)
-		{
-			this.restoreSelection();
-
-			if (json !== false)
-			{
-				var html = '';
-				if (link !== true)
-				{
-					html = '<p><img src="' + json.filelink + '" /></p>';
-				}
-				else
-				{
-					html = json;
-				}
-
-				this.execCommand('inserthtml', html);
-
-				// upload image callback
-				if (link !== true && typeof this.opts.imageUploadCallback === 'function')
-				{
-					this.opts.imageUploadCallback(this, json);
-				}
-			}
-
-			this.modalClose();
-			this.observeImages();
-		},
-
-		// INSERT LINK
-		showLink: function()
-		{
-			this.saveSelection();
-
-			var callback = $.proxy(function()
-			{
-				this.insert_link_node = false;
-				var sel = this.getSelection();
-				var url = '', text = '', target = '';
-
-				if (this.browser('msie'))
-				{
-					var parent = this.getParentNode();
-					if (parent.nodeName === 'A')
-					{
-						this.insert_link_node = $(parent);
-						text = this.insert_link_node.text();
-						url = this.insert_link_node.attr('href');
-						target = this.insert_link_node.attr('target');
-					}
-					else
-					{
-						if (this.oldIE())
-						{
-							text = sel.text;
-						}
-						else
-						{
-							text = sel.toString();
-						}
-					}
-				}
-				else
-				{
-					if (sel && sel.anchorNode && sel.anchorNode.parentNode.tagName === 'A')
-					{
-						url = sel.anchorNode.parentNode.href;
-						text = sel.anchorNode.parentNode.text;
-						target = sel.anchorNode.parentNode.target;
-
-						if (sel.toString() === '')
-						{
-							this.insert_link_node = sel.anchorNode.parentNode;
-						}
-					}
-					else
-					{
-						text = sel.toString();
-					}
-				}
-
-				$('.redactor_link_text').val(text);
-
-				var thref = self.location.href.replace(/\/$/i, '');
-				var turl = url.replace(thref, '');
-
-				if (url.search('mailto:') === 0)
-				{
-					this.setModalTab(2);
-
-					$('#redactor_tab_selected').val(2);
-					$('#redactor_link_mailto').val(url.replace('mailto:', ''));
-				}
-				else if (turl.search(/^#/gi) === 0)
-				{
-					this.setModalTab(3);
-
-					$('#redactor_tab_selected').val(3);
-					$('#redactor_link_anchor').val(turl.replace(/^#/gi, ''));
-				}
-				else
-				{
-					$('#redactor_link_url').val(turl);
-				}
-
-				if (target === '_blank')
-				{
-					$('#redactor_link_blank').attr('checked', true);
-				}
-
-				$('#redactor_insert_link_btn').click($.proxy(this.insertLink, this));
-
-				setTimeout(function()
-				{
-					$('#redactor_link_url').focus();
-				}, 200);
-
-			}, this);
-
-			this.modalInit(RLANG.link, this.opts.modal_link, 460, callback);
-
-		},
-		insertLink: function()
-		{
-			var tab_selected = $('#redactor_tab_selected').val();
-			var link = '', text = '', target = '';
-
-			if (tab_selected === '1') // url
-			{
-				link = $('#redactor_link_url').val();
-				text = $('#redactor_link_url_text').val();
-
-				if ($('#redactor_link_blank').attr('checked'))
-				{
-					target = ' target="_blank"';
-				}
-
-				// test url
-				var pattern = '/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/';
-				//var pattern = '((xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}';
-				var re = new RegExp('^(http|ftp|https)://' + pattern,'i');
-				var re2 = new RegExp('^' + pattern,'i');
-				if (link.search(re) == -1 && link.search(re2) == 0 && this.opts.protocol !== false)
-				{
-					link = this.opts.protocol + link;
-				}
-
-			}
-			else if (tab_selected === '2') // mailto
-			{
-				link = 'mailto:' + $('#redactor_link_mailto').val();
-				text = $('#redactor_link_mailto_text').val();
-			}
-			else if (tab_selected === '3') // anchor
-			{
-				link = '#' + $('#redactor_link_anchor').val();
-				text = $('#redactor_link_anchor_text').val();
-			}
-
-			this._insertLink('<a href="' + link + '"' + target + '>' +  text + '</a>', $.trim(text), link, target);
-
-		},
-		_insertLink: function(a, text, link, target)
-		{
-			this.$editor.focus();
-			this.restoreSelection();
-
-			if (text !== '')
-			{
-				if (this.insert_link_node)
-				{
-					$(this.insert_link_node).text(text);
-					$(this.insert_link_node).attr('href', link);
-					if (target !== '')
-					{
-						$(this.insert_link_node).attr('target', target);
-					}
-					else
-					{
-						$(this.insert_link_node).removeAttr('target');
-					}
-
-					this.syncCode();
-				}
-				else
-				{
-					this.execCommand('inserthtml', a);
-				}
-			}
-
-			this.modalClose();
-		},
-
-		// INSERT FILE
-		showFile: function()
-		{
-			this.saveSelection();
-
-			var callback = $.proxy(function()
-			{
-				var sel = this.getSelection();
-
-				var text = '';
-
-				if (this.oldIE())
-				{
-					text = sel.text;
-				}
-				else
-				{
-					text = sel.toString();
-				}
-
-				$('#redactor_filename').val(text);
-
-				// dragupload
-				if (this.opts.uploadCrossDomain === false && this.isMobile() === false)
-				{
-					$('#redactor_file').dragupload(
-					{
-						url: this.opts.fileUpload,
-						uploadFields: this.opts.uploadFields,
-						success: $.proxy(this.fileUploadCallback, this),
-						error: $.proxy(this.opts.fileUploadErrorCallback, this)
-					});
-				}
-
-				this.uploadInit('redactor_file',
-				{
-					auto: true,
-					url: this.opts.fileUpload,
-					success: $.proxy(this.fileUploadCallback, this),
-					error: $.proxy(this.opts.fileUploadErrorCallback, this)
-				});
-
-			}, this);
-
-			this.modalInit(RLANG.file, this.opts.modal_file, 500, callback);
-		},
-		fileUploadCallback: function(json)
-		{
-			this.restoreSelection();
-
-			if (json !== false)
-			{
-				var text = $('#redactor_filename').val();
-
-				if (text === '')
-				{
-					text = json.filename;
-				}
-
-				var link = '<a href="' + json.filelink + '">' + text + '</a>';
-
-				// chrome fix
-				if (this.browser('webkit') && !!this.window.chrome)
-				{
-					link = link + '&nbsp;';
-				}
-
-				this.execCommand('inserthtml', link);
-
-				// file upload callback
-				if (typeof this.opts.fileUploadCallback === 'function')
-				{
-					this.opts.fileUploadCallback(this, json);
-				}
-			}
-
-			this.modalClose();
-		},
-
-
-
-		// MODAL
-		modalInit: function(title, content, width, callback)
-		{
-			// modal overlay
-			if ($('#redactor_modal_overlay').size() === 0)
-			{
-				this.overlay = $('<div id="redactor_modal_overlay" style="display: none;"></div>');
-				$('body').prepend(this.overlay);
-			}
-
-			if (this.opts.overlay)
-			{
-				$('#redactor_modal_overlay').show();
-				$('#redactor_modal_overlay').click($.proxy(this.modalClose, this));
-			}
-
-			if ($('#redactor_modal').size() === 0)
-			{
-				this.modal = $('<div id="redactor_modal" style="display: none;"><div id="redactor_modal_close">&times;</div><div id="redactor_modal_header"></div><div id="redactor_modal_inner"></div></div>');
-				$('body').append(this.modal);
-			}
-
-			$('#redactor_modal_close').click($.proxy(this.modalClose, this));
-
-			this.hdlModalClose = $.proxy(function(e) { if ( e.keyCode === 27) { this.modalClose(); return false; } }, this);
-
-			$(document).keyup(this.hdlModalClose);
-			this.$editor.keyup(this.hdlModalClose);
-
-			// set content
-			if (content.indexOf('#') == 0)
-			{
-				$('#redactor_modal_inner').empty().append($(content).html());
-			}
-			else
-			{
-				$('#redactor_modal_inner').empty().append(content);
-			}
-
-
-			$('#redactor_modal_header').html(title);
-
-			// draggable
-			if (typeof $.fn.draggable !== 'undefined')
-			{
-				$('#redactor_modal').draggable({ handle: '#redactor_modal_header' });
-				$('#redactor_modal_header').css('cursor', 'move');
-			}
-
-			// tabs
-			if ($('#redactor_tabs').size() !== 0)
-			{
-				var that = this;
-				$('#redactor_tabs a').each(function(i,s)
-				{
-					i++;
-					$(s).click(function()
-					{
-						$('#redactor_tabs a').removeClass('redactor_tabs_act');
-						$(this).addClass('redactor_tabs_act');
-						$('.redactor_tab').hide();
-						$('#redactor_tab' + i).show();
-						$('#redactor_tab_selected').val(i);
-
-						if (that.isMobile() === false)
-						{
-							var height = $('#redactor_modal').outerHeight();
-							$('#redactor_modal').css('margin-top', '-' + (height+10)/2 + 'px');
-						}
-					});
-				});
-			}
-
-			$('#redactor_modal .redactor_btn_modal_close').click($.proxy(this.modalClose, this));
-
-			if (this.isMobile() === false)
-			{
-				$('#redactor_modal').css({ position: 'fixed', top: '-2000px', left: '50%', width: width + 'px', marginLeft: '-' + (width+60)/2 + 'px' }).show();
-
-				this.modalSaveBodyOveflow = $(document.body).css('overflow');
-				$(document.body).css('overflow', 'hidden');
-			}
-			else
-			{
-				$('#redactor_modal').css({ position: 'fixed', width: '100%', height: '100%', top: '0', left: '0', margin: '0', minHeight: '300px' }).show();
-			}
-
-			// callback
-			if (typeof callback === 'function')
-			{
-				callback();
-			}
-
-			if (this.isMobile() === false)
-			{
-				setTimeout(function()
-				{
-					var height = $('#redactor_modal').outerHeight();
-					$('#redactor_modal').css({ top: '50%', height: 'auto', minHeight: 'auto', marginTop: '-' + (height+10)/2 + 'px' });
-
-				}, 20);
-			}
-
-		},
-		modalClose: function()
-		{
-			$('#redactor_modal_close').unbind('click', this.modalClose);
-			$('#redactor_modal').fadeOut('fast', $.proxy(function()
-			{
-				$('#redactor_modal_inner').html('');
-
-				if (this.opts.overlay)
-				{
-					$('#redactor_modal_overlay').hide();
-					$('#redactor_modal_overlay').unbind('click', this.modalClose);
-				}
-
-				$(document).unbind('keyup', this.hdlModalClose);
-				this.$editor.unbind('keyup', this.hdlModalClose);
-
-			}, this));
-
-
-			if (this.isMobile() === false)
-			{
-				$(document.body).css('overflow', this.modalSaveBodyOveflow ? this.modalSaveBodyOveflow : 'visible');
-			}
-
-			return false;
-
-		},
-		setModalTab: function(num)
-		{
-			$('.redactor_tab').hide();
-			var tabs = $('#redactor_tabs a');
-			tabs.removeClass('redactor_tabs_act');
-			tabs.eq(num-1).addClass('redactor_tabs_act');
-			$('#redactor_tab' + num).show();
-		},
-
-		// UPLOAD
-		uploadInit: function(element, options)
-		{
-			// Upload Options
-			this.uploadOptions = {
-				url: false,
-				success: false,
-				error: false,
-				start: false,
-				trigger: false,
-				auto: false,
-				input: false
-			};
-
-			$.extend(this.uploadOptions, options);
-
-			// Test input or form
-			if ($('#' + element).size() !== 0 && $('#' + element).get(0).tagName === 'INPUT')
-			{
-				this.uploadOptions.input = $('#' + element);
-				this.element = $($('#' + element).get(0).form);
-			}
-			else
-			{
-				this.element = $('#' + element);
-			}
-
-			this.element_action = this.element.attr('action');
-
-			// Auto or trigger
-			if (this.uploadOptions.auto)
-			{
-				$(this.uploadOptions.input).change($.proxy(function()
-				{
-					this.element.submit(function(e) { return false; });
-					this.uploadSubmit();
-				}, this));
-
-			}
-			else if (this.uploadOptions.trigger)
-			{
-				$('#' + this.uploadOptions.trigger).click($.proxy(this.uploadSubmit, this));
-			}
-		},
-		uploadSubmit : function()
-		{
-			this.uploadForm(this.element, this.uploadFrame());
-		},
-		uploadFrame : function()
-		{
-			this.id = 'f' + Math.floor(Math.random() * 99999);
-
-			var d = this.document.createElement('div');
-			var iframe = '<iframe style="display:none" id="'+this.id+'" name="'+this.id+'"></iframe>';
-			d.innerHTML = iframe;
-			$(d).appendTo("body");
-
-			// Start
-			if (this.uploadOptions.start)
-			{
-				this.uploadOptions.start();
-			}
-
-			$('#' + this.id).load($.proxy(this.uploadLoaded, this));
-
-			return this.id;
-		},
-		uploadForm : function(f, name)
-		{
-			if (this.uploadOptions.input)
-			{
-				var formId = 'redactorUploadForm' + this.id;
-				var fileId = 'redactorUploadFile' + this.id;
-				this.form = $('<form  action="' + this.uploadOptions.url + '" method="POST" target="' + name + '" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');
-
-				// append hidden fields
-				if (this.opts.uploadFields !== false && typeof this.opts.uploadFields === 'object')
-				{
-					$.each(this.opts.uploadFields, $.proxy(function(k,v)
-					{
-						if (v.toString().indexOf('#') === 0)
-						{
-							v = $(v).val();
-						}
-
-						var hidden = $('<input/>', {'type': "hidden", 'name': k, 'value': v});
-						$(this.form).append(hidden);
-
-					}, this));
-				}
-
-				var oldElement = this.uploadOptions.input;
-				var newElement = $(oldElement).clone();
-				$(oldElement).attr('id', fileId);
-				$(oldElement).before(newElement);
-				$(oldElement).appendTo(this.form);
-				$(this.form).css('position', 'absolute');
-				$(this.form).css('top', '-2000px');
-				$(this.form).css('left', '-2000px');
-				$(this.form).appendTo('body');
-
-				this.form.submit();
-			}
-			else
-			{
-				f.attr('target', name);
-				f.attr('method', 'POST');
-				f.attr('enctype', 'multipart/form-data');
-				f.attr('action', this.uploadOptions.url);
-
-				this.element.submit();
-			}
-
-		},
-		uploadLoaded : function()
-		{
-			var i = $('#' + this.id)[0];
-			var d;
-
-			if (i.contentDocument)
-			{
-				d = i.contentDocument;
-			}
-			else if (i.contentWindow)
-			{
-				d = i.contentWindow.document;
-			}
-			else
-			{
-				d = window.frames[this.id].document;
-			}
-
-			// Success
-			if (this.uploadOptions.success)
-			{
-				if (typeof d !== 'undefined')
-				{
-					// Remove bizarre <pre> tag wrappers around our json data:
-					var rawString = d.body.innerHTML;
-					var jsonString = rawString.match(/\{(.|\n)*\}/)[0];
-					var json = $.parseJSON(jsonString);
-
-					if (typeof json.error == 'undefined')
-					{
-						this.uploadOptions.success(json);
-					}
-					else
-					{
-						this.uploadOptions.error(this, json);
-						this.modalClose();
-					}
-				}
-				else
-				{
-					alert('Upload failed!');
-					this.modalClose();
-				}
-			}
-
-			this.element.attr('action', this.element_action);
-			this.element.attr('target', '');
-
-		},
-
-		// UTILITY
-		browser: function(browser)
-		{
-			var ua = navigator.userAgent.toLowerCase();
-			var match = /(chrome)[ \/]([\w.]+)/.exec(ua) || /(webkit)[ \/]([\w.]+)/.exec(ua) || /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) || /(msie) ([\w.]+)/.exec(ua) || ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) || [];
-
-			if (browser == 'version')
-			{
-				return match[2];
-			}
-
-			if (browser == 'webkit')
-			{
-				return (match[1] == 'chrome' || match[1] == 'webkit');
-			}
-
-			return match[1] == browser;
-		},
-		oldIE: function()
-		{
-			if (this.browser('msie') && parseInt(this.browser('version'), 10) < 9)
-			{
-				return true;
-			}
-
-			return false;
-		},
-		outerHTML: function(s)
-		{
-			return $("<p>").append($(s).eq(0).clone()).html();
-		},
-		normalize: function(str)
-		{
-			return parseInt(str.replace('px',''), 10);
-		},
-		isMobile: function(ipad)
-		{
-			if (ipad === true && /(iPhone|iPod|iPad|BlackBerry|Android)/.test(navigator.userAgent))
-			{
-				return true;
-			}
-			else if (/(iPhone|iPod|BlackBerry|Android)/.test(navigator.userAgent))
-			{
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-
-	};
-
-
-	// API
-	$.fn.getObject = function()
-	{
-		return this.data('redactor');
-	};
-
-	$.fn.getEditor = function()
-	{
-		return this.data('redactor').$editor;
-	};
-
-	$.fn.getCode = function()
-	{
-		return $.trim(this.data('redactor').getCode());
-	};
-
-	$.fn.getText = function()
-	{
-		return this.data('redactor').$editor.text();
-	};
-
-	$.fn.getSelected = function()
-	{
-		return this.data('redactor').getSelectedHtml();
-	};
-
-	$.fn.setCode = function(html)
-	{
-		this.data('redactor').setCode(html);
-	};
-
-	$.fn.insertHtml = function(html)
-	{
-		this.data('redactor').insertHtml(html);
-	};
-
-	$.fn.destroyEditor = function()
-	{
-		this.each(function()
-		{
-			if (typeof $(this).data('redactor') != 'undefined')
-			{
-				$(this).data('redactor').destroy();
-				$(this).removeData('redactor');
-			}
-		});
-	};
-
-	$.fn.setFocus = function()
-	{
-		this.data('redactor').$editor.focus();
-	};
-
-	$.fn.execCommand = function(cmd, param)
-	{
-		this.data('redactor').execCommand(cmd, param);
-	};
-
-})(jQuery);
-
-/*
-	Plugin Drag and drop Upload v1.0.2
-	http://imperavi.com/
-	Copyright 2012, Imperavi Inc.
-*/
-(function($){
-
-	"use strict";
-
-	// Initialization
-	$.fn.dragupload = function(options)
-	{
-		return this.each(function() {
-			var obj = new Construct(this, options);
-			obj.init();
-		});
-	};
-
-	// Options and variables
-	function Construct(el, options) {
-
-		this.opts = $.extend({
-
-			url: false,
-			success: false,
-			error: false,
-			preview: false,
-			uploadFields: false,
-
-			text: RLANG.drop_file_here,
-			atext: RLANG.or_choose
-
-		}, options);
-
-		this.$el = $(el);
-	}
-
-	// Functionality
-	Construct.prototype = {
-		init: function()
-		{
-			if (navigator.userAgent.search("MSIE") === -1)
-			{
-				this.droparea = $('<div class="redactor_droparea"></div>');
-				this.dropareabox = $('<div class="redactor_dropareabox">' + this.opts.text + '</div>');
-				this.dropalternative = $('<div class="redactor_dropalternative">' + this.opts.atext + '</div>');
-
-				this.droparea.append(this.dropareabox);
-
-				this.$el.before(this.droparea);
-				this.$el.before(this.dropalternative);
-
-				// drag over
-				this.dropareabox.bind('dragover', $.proxy(function() { return this.ondrag(); }, this));
-
-				// drag leave
-				this.dropareabox.bind('dragleave', $.proxy(function() { return this.ondragleave(); }, this));
-
-				var uploadProgress = $.proxy(function(e)
-				{
-					var percent = parseInt(e.loaded / e.total * 100, 10);
-					this.dropareabox.text('Loading ' + percent + '%');
-
-				}, this);
-
-				var xhr = jQuery.ajaxSettings.xhr();
-
-				if (xhr.upload)
-				{
-					xhr.upload.addEventListener('progress', uploadProgress, false);
-				}
-
-				var provider = function () { return xhr; };
-
-				// drop
-				this.dropareabox.get(0).ondrop = $.proxy(function(event)
-				{
-					event.preventDefault();
-
-					this.dropareabox.removeClass('hover').addClass('drop');
-
-					var file = event.dataTransfer.files[0];
-					var fd = new FormData();
-
-					// append hidden fields
-					if (this.opts.uploadFields !== false && typeof this.opts.uploadFields === 'object')
-					{
-						$.each(this.opts.uploadFields, $.proxy(function(k,v)
-						{
-							if (v.toString().indexOf('#') === 0)
-							{
-								v = $(v).val();
-							}
-
-							fd.append(k, v);
-
-						}, this));
-					}
-
-					// append file data
-					fd.append('file', file);
-
-					$.ajax({
-						url: this.opts.url,
-						dataType: 'html',
-						data: fd,
-						xhr: provider,
-						cache: false,
-						contentType: false,
-						processData: false,
-						type: 'POST',
-						success: $.proxy(function(data)
-						{
-							var json = $.parseJSON(data);
-
-							if (typeof json.error == 'undefined')
-							{
-								this.opts.success(json);
-							}
-							else
-							{
-								this.opts.error(this, json);
-								this.opts.success(false);
-							}
-
-						}, this)
-					});
-
-
-				}, this);
-			}
-		},
-		ondrag: function()
-		{
-			this.dropareabox.addClass('hover');
-			return false;
-		},
-		ondragleave: function()
-		{
-			this.dropareabox.removeClass('hover');
-			return false;
-		}
-	};
-
-})(jQuery);
-
-
-
-// Define: Linkify plugin from stackoverflow
-(function($){
-
-	"use strict";
-
-	var protocol = 'http://';
-	var url1 = /(^|&lt;|\s)(www\..+?\..+?)(\s|&gt;|$)/g,
-	url2 = /(^|&lt;|\s)(((https?|ftp):\/\/|mailto:).+?)(\s|&gt;|$)/g,
-
-		linkifyThis = function ()
-		{
-			var childNodes = this.childNodes,
-			i = childNodes.length;
-			while(i--)
-			{
-				var n = childNodes[i];
-				if (n.nodeType === 3)
-				{
-					var html = n.nodeValue;
-					if (html)
-					{
-						html = html.replace(/&/g, '&amp;')
-									.replace(/</g, '&lt;')
-									.replace(/>/g, '&gt;')
-									.replace(url1, '$1<a href="' + protocol + '$2">$2</a>$3')
-									.replace(url2, '$1<a href="$2">$2</a>$5');
-
-						$(n).after(html).remove();
-					}
-				}
-				else if (n.nodeType === 1  &&  !/^(a|button|textarea)$/i.test(n.tagName))
-				{
-					linkifyThis.call(n);
-				}
-			}
-		};
-
-	$.fn.linkify = function ()
-	{
-		this.each(linkifyThis);
-	};
-
-})(jQuery);
-
-
-/* jQuery plugin textselect
- * version: 0.9
- * author: Josef Moravec, josef.moravec@gmail.com
- * updated: Imperavi Inc.
- *
- */
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(5($){$.1.4.7={t:5(0,v){$(2).0("8",c);$(2).0("r",0);$(2).l(\'g\',$.1.4.7.b)},u:5(0){$(2).w(\'g\',$.1.4.7.b)},b:5(1){9 0=$(2).0("r");9 3=$.1.4.7.f(0).h();6(3!=\'\'){$(2).0("8",x);1.j="7";1.3=3;$.1.i.m(2,k)}},f:5(0){9 3=\'\';6(q.e){3=q.e()}o 6(d.e){3=d.e()}o 6(d.p){3=d.p.B().3}A 3}};$.1.4.a={t:5(0,v){$(2).0("n",0);$(2).0("8",c);$(2).l(\'g\',$.1.4.a.b);$(2).l(\'D\',$.1.4.a.s)},u:5(0){$(2).w(\'g\',$.1.4.a.b)},b:5(1){6($(2).0("8")){9 0=$(2).0("n");9 3=$.1.4.7.f(0).h();6(3==\'\'){$(2).0("8",c);1.j="a";$.1.i.m(2,k)}}},s:5(1){6($(2).0("8")){9 0=$(2).0("n");9 3=$.1.4.7.f(0).h();6((1.y=z)&&(3==\'\')){$(2).0("8",c);1.j="a";$.1.i.m(2,k)}}}}})(C);',40,40,'data|event|this|text|special|function|if|textselect|textselected|var|textunselect|handler|false|rdocument|getSelection|getSelectedText|mouseup|toString|handle|type|arguments|bind|apply|rttt|else|selection|rwindow|ttt|handlerKey|setup|teardown|namespaces|unbind|true|keyCode|27|return|createRange|jQuery|keyup'.split('|'),0,{}))
\ No newline at end of file
diff --git a/app/assets/javascripts/bootstrap.js b/app/assets/javascripts/bootstrap.js
new file mode 100644
index 0000000..3f2bca0
--- /dev/null
+++ b/app/assets/javascripts/bootstrap.js
@@ -0,0 +1,13 @@
+//= require bootstrap/affix
+//= require bootstrap/alert
+//= require bootstrap/button
+//= require bootstrap/carousel
+
+//= require bootstrap/dropdown
+//= require bootstrap/tab
+//= require bootstrap/transition
+//= require bootstrap/scrollspy
+//= require bootstrap/modal
+//= require bootstrap/tooltip
+//= require bootstrap/popover
+//= require bootstrap/datetimepicker
diff --git a/app/assets/javascripts/bootstrap/affix.js b/app/assets/javascripts/bootstrap/affix.js
new file mode 100644
index 0000000..05c909e
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/affix.js
@@ -0,0 +1,137 @@
+/* ========================================================================
+ * Bootstrap: affix.js v3.1.1
+ * http://getbootstrap.com/javascript/#affix
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // AFFIX CLASS DEFINITION
+  // ======================
+
+  var Affix = function (element, options) {
+    this.options = $.extend({}, Affix.DEFAULTS, options)
+    this.$window = $(window)
+      .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
+      .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
+
+    this.$element     = $(element)
+    this.affixed      =
+    this.unpin        =
+    this.pinnedOffset = null
+
+    this.checkPosition()
+  }
+
+  Affix.RESET = 'affix affix-top affix-bottom'
+
+  Affix.DEFAULTS = {
+    offset: 0
+  }
+
+  Affix.prototype.getPinnedOffset = function () {
+    if (this.pinnedOffset) return this.pinnedOffset
+    this.$element.removeClass(Affix.RESET).addClass('affix')
+    var scrollTop = this.$window.scrollTop()
+    var position  = this.$element.offset()
+    return (this.pinnedOffset = position.top - scrollTop)
+  }
+
+  Affix.prototype.checkPositionWithEventLoop = function () {
+    setTimeout($.proxy(this.checkPosition, this), 1)
+  }
+
+  Affix.prototype.checkPosition = function () {
+    if (!this.$element.is(':visible')) return
+
+    var scrollHeight = $(document).height()
+    var scrollTop    = this.$window.scrollTop()
+    var position     = this.$element.offset()
+    var offset       = this.options.offset
+    var offsetTop    = offset.top
+    var offsetBottom = offset.bottom
+
+    if (this.affixed == 'top') position.top += scrollTop
+
+    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
+    if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
+    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
+
+    var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
+                offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
+                offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false
+
+    if (this.affixed === affix) return
+    if (this.unpin) this.$element.css('top', '')
+
+    var affixType = 'affix' + (affix ? '-' + affix : '')
+    var e         = $.Event(affixType + '.bs.affix')
+
+    this.$element.trigger(e)
+
+    if (e.isDefaultPrevented()) return
+
+    this.affixed = affix
+    this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
+
+    this.$element
+      .removeClass(Affix.RESET)
+      .addClass(affixType)
+      .trigger($.Event(affixType.replace('affix', 'affixed')))
+
+    if (affix == 'bottom') {
+      this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() })
+    }
+  }
+
+
+  // AFFIX PLUGIN DEFINITION
+  // =======================
+
+  var old = $.fn.affix
+
+  $.fn.affix = function (option) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.affix')
+      var options = typeof option == 'object' && option
+
+      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.affix.Constructor = Affix
+
+
+  // AFFIX NO CONFLICT
+  // =================
+
+  $.fn.affix.noConflict = function () {
+    $.fn.affix = old
+    return this
+  }
+
+
+  // AFFIX DATA-API
+  // ==============
+
+  $(window).on('load', function () {
+    $('[data-spy="affix"]').each(function () {
+      var $spy = $(this)
+      var data = $spy.data()
+
+      data.offset = data.offset || {}
+
+      if (data.offsetBottom) data.offset.bottom = data.offsetBottom
+      if (data.offsetTop)    data.offset.top    = data.offsetTop
+
+      $spy.affix(data)
+    })
+  })
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/alert.js b/app/assets/javascripts/bootstrap/alert.js
new file mode 100644
index 0000000..516fe4f
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/alert.js
@@ -0,0 +1,88 @@
+/* ========================================================================
+ * Bootstrap: alert.js v3.1.1
+ * http://getbootstrap.com/javascript/#alerts
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // ALERT CLASS DEFINITION
+  // ======================
+
+  var dismiss = '[data-dismiss="alert"]'
+  var Alert   = function (el) {
+    $(el).on('click', dismiss, this.close)
+  }
+
+  Alert.prototype.close = function (e) {
+    var $this    = $(this)
+    var selector = $this.attr('data-target')
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+    }
+
+    var $parent = $(selector)
+
+    if (e) e.preventDefault()
+
+    if (!$parent.length) {
+      $parent = $this.hasClass('alert') ? $this : $this.parent()
+    }
+
+    $parent.trigger(e = $.Event('close.bs.alert'))
+
+    if (e.isDefaultPrevented()) return
+
+    $parent.removeClass('in')
+
+    function removeElement() {
+      $parent.trigger('closed.bs.alert').remove()
+    }
+
+    $.support.transition && $parent.hasClass('fade') ?
+      $parent
+        .one($.support.transition.end, removeElement)
+        .emulateTransitionEnd(150) :
+      removeElement()
+  }
+
+
+  // ALERT PLUGIN DEFINITION
+  // =======================
+
+  var old = $.fn.alert
+
+  $.fn.alert = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+      var data  = $this.data('bs.alert')
+
+      if (!data) $this.data('bs.alert', (data = new Alert(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.alert.Constructor = Alert
+
+
+  // ALERT NO CONFLICT
+  // =================
+
+  $.fn.alert.noConflict = function () {
+    $.fn.alert = old
+    return this
+  }
+
+
+  // ALERT DATA-API
+  // ==============
+
+  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/button.js b/app/assets/javascripts/bootstrap/button.js
new file mode 100644
index 0000000..f4d8d8b
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/button.js
@@ -0,0 +1,107 @@
+/* ========================================================================
+ * Bootstrap: button.js v3.1.1
+ * http://getbootstrap.com/javascript/#buttons
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // BUTTON PUBLIC CLASS DEFINITION
+  // ==============================
+
+  var Button = function (element, options) {
+    this.$element  = $(element)
+    this.options   = $.extend({}, Button.DEFAULTS, options)
+    this.isLoading = false
+  }
+
+  Button.DEFAULTS = {
+    loadingText: 'loading...'
+  }
+
+  Button.prototype.setState = function (state) {
+    var d    = 'disabled'
+    var $el  = this.$element
+    var val  = $el.is('input') ? 'val' : 'html'
+    var data = $el.data()
+
+    state = state + 'Text'
+
+    if (!data.resetText) $el.data('resetText', $el[val]())
+
+    $el[val](data[state] || this.options[state])
+
+    // push to event loop to allow forms to submit
+    setTimeout($.proxy(function () {
+      if (state == 'loadingText') {
+        this.isLoading = true
+        $el.addClass(d).attr(d, d)
+      } else if (this.isLoading) {
+        this.isLoading = false
+        $el.removeClass(d).removeAttr(d)
+      }
+    }, this), 0)
+  }
+
+  Button.prototype.toggle = function () {
+    var changed = true
+    var $parent = this.$element.closest('[data-toggle="buttons"]')
+
+    if ($parent.length) {
+      var $input = this.$element.find('input')
+      if ($input.prop('type') == 'radio') {
+        if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
+        else $parent.find('.active').removeClass('active')
+      }
+      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
+    }
+
+    if (changed) this.$element.toggleClass('active')
+  }
+
+
+  // BUTTON PLUGIN DEFINITION
+  // ========================
+
+  var old = $.fn.button
+
+  $.fn.button = function (option) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.button')
+      var options = typeof option == 'object' && option
+
+      if (!data) $this.data('bs.button', (data = new Button(this, options)))
+
+      if (option == 'toggle') data.toggle()
+      else if (option) data.setState(option)
+    })
+  }
+
+  $.fn.button.Constructor = Button
+
+
+  // BUTTON NO CONFLICT
+  // ==================
+
+  $.fn.button.noConflict = function () {
+    $.fn.button = old
+    return this
+  }
+
+
+  // BUTTON DATA-API
+  // ===============
+
+  $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) {
+    var $btn = $(e.target)
+    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+    $btn.button('toggle')
+    e.preventDefault()
+  })
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/carousel.js b/app/assets/javascripts/bootstrap/carousel.js
new file mode 100644
index 0000000..19e9af1
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/carousel.js
@@ -0,0 +1,205 @@
+/* ========================================================================
+ * Bootstrap: carousel.js v3.1.1
+ * http://getbootstrap.com/javascript/#carousel
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // CAROUSEL CLASS DEFINITION
+  // =========================
+
+  var Carousel = function (element, options) {
+    this.$element    = $(element)
+    this.$indicators = this.$element.find('.carousel-indicators')
+    this.options     = options
+    this.paused      =
+    this.sliding     =
+    this.interval    =
+    this.$active     =
+    this.$items      = null
+
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter', $.proxy(this.pause, this))
+      .on('mouseleave', $.proxy(this.cycle, this))
+  }
+
+  Carousel.DEFAULTS = {
+    interval: 5000,
+    pause: 'hover',
+    wrap: true
+  }
+
+  Carousel.prototype.cycle =  function (e) {
+    e || (this.paused = false)
+
+    this.interval && clearInterval(this.interval)
+
+    this.options.interval
+      && !this.paused
+      && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+
+    return this
+  }
+
+  Carousel.prototype.getActiveIndex = function () {
+    this.$active = this.$element.find('.item.active')
+    this.$items  = this.$active.parent().children()
+
+    return this.$items.index(this.$active)
+  }
+
+  Carousel.prototype.to = function (pos) {
+    var that        = this
+    var activeIndex = this.getActiveIndex()
+
+    if (pos > (this.$items.length - 1) || pos < 0) return
+
+    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
+    if (activeIndex == pos) return this.pause().cycle()
+
+    return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
+  }
+
+  Carousel.prototype.pause = function (e) {
+    e || (this.paused = true)
+
+    if (this.$element.find('.next, .prev').length && $.support.transition) {
+      this.$element.trigger($.support.transition.end)
+      this.cycle(true)
+    }
+
+    this.interval = clearInterval(this.interval)
+
+    return this
+  }
+
+  Carousel.prototype.next = function () {
+    if (this.sliding) return
+    return this.slide('next')
+  }
+
+  Carousel.prototype.prev = function () {
+    if (this.sliding) return
+    return this.slide('prev')
+  }
+
+  Carousel.prototype.slide = function (type, next) {
+    var $active   = this.$element.find('.item.active')
+    var $next     = next || $active[type]()
+    var isCycling = this.interval
+    var direction = type == 'next' ? 'left' : 'right'
+    var fallback  = type == 'next' ? 'first' : 'last'
+    var that      = this
+
+    if (!$next.length) {
+      if (!this.options.wrap) return
+      $next = this.$element.find('.item')[fallback]()
+    }
+
+    if ($next.hasClass('active')) return this.sliding = false
+
+    var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
+    this.$element.trigger(e)
+    if (e.isDefaultPrevented()) return
+
+    this.sliding = true
+
+    isCycling && this.pause()
+
+    if (this.$indicators.length) {
+      this.$indicators.find('.active').removeClass('active')
+      this.$element.one('slid.bs.carousel', function () {
+        var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
+        $nextIndicator && $nextIndicator.addClass('active')
+      })
+    }
+
+    if ($.support.transition && this.$element.hasClass('slide')) {
+      $next.addClass(type)
+      $next[0].offsetWidth // force reflow
+      $active.addClass(direction)
+      $next.addClass(direction)
+      $active
+        .one($.support.transition.end, function () {
+          $next.removeClass([type, direction].join(' ')).addClass('active')
+          $active.removeClass(['active', direction].join(' '))
+          that.sliding = false
+          setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
+        })
+        .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
+    } else {
+      $active.removeClass('active')
+      $next.addClass('active')
+      this.sliding = false
+      this.$element.trigger('slid.bs.carousel')
+    }
+
+    isCycling && this.cycle()
+
+    return this
+  }
+
+
+  // CAROUSEL PLUGIN DEFINITION
+  // ==========================
+
+  var old = $.fn.carousel
+
+  $.fn.carousel = function (option) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.carousel')
+      var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
+      var action  = typeof option == 'string' ? option : options.slide
+
+      if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
+      if (typeof option == 'number') data.to(option)
+      else if (action) data[action]()
+      else if (options.interval) data.pause().cycle()
+    })
+  }
+
+  $.fn.carousel.Constructor = Carousel
+
+
+  // CAROUSEL NO CONFLICT
+  // ====================
+
+  $.fn.carousel.noConflict = function () {
+    $.fn.carousel = old
+    return this
+  }
+
+
+  // CAROUSEL DATA-API
+  // =================
+
+  $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+    var $this   = $(this), href
+    var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+    var options = $.extend({}, $target.data(), $this.data())
+    var slideIndex = $this.attr('data-slide-to')
+    if (slideIndex) options.interval = false
+
+    $target.carousel(options)
+
+    if (slideIndex = $this.attr('data-slide-to')) {
+      $target.data('bs.carousel').to(slideIndex)
+    }
+
+    e.preventDefault()
+  })
+
+  $(window).on('load', function () {
+    $('[data-ride="carousel"]').each(function () {
+      var $carousel = $(this)
+      $carousel.carousel($carousel.data())
+    })
+  })
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/collapse.js b/app/assets/javascripts/bootstrap/collapse.js
new file mode 100644
index 0000000..7130282
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/collapse.js
@@ -0,0 +1,170 @@
+/* ========================================================================
+ * Bootstrap: collapse.js v3.1.1
+ * http://getbootstrap.com/javascript/#collapse
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // COLLAPSE PUBLIC CLASS DEFINITION
+  // ================================
+
+  var Collapse = function (element, options) {
+    this.$element      = $(element)
+    this.options       = $.extend({}, Collapse.DEFAULTS, options)
+    this.transitioning = null
+
+    if (this.options.parent) this.$parent = $(this.options.parent)
+    if (this.options.toggle) this.toggle()
+  }
+
+  Collapse.DEFAULTS = {
+    toggle: true
+  }
+
+  Collapse.prototype.dimension = function () {
+    var hasWidth = this.$element.hasClass('width')
+    return hasWidth ? 'width' : 'height'
+  }
+
+  Collapse.prototype.show = function () {
+    if (this.transitioning || this.$element.hasClass('in')) return
+
+    var startEvent = $.Event('show.bs.collapse')
+    this.$element.trigger(startEvent)
+    if (startEvent.isDefaultPrevented()) return
+
+    var actives = this.$parent && this.$parent.find('> .panel > .in')
+
+    if (actives && actives.length) {
+      var hasData = actives.data('bs.collapse')
+      if (hasData && hasData.transitioning) return
+      actives.collapse('hide')
+      hasData || actives.data('bs.collapse', null)
+    }
+
+    var dimension = this.dimension()
+
+    this.$element
+      .removeClass('collapse')
+      .addClass('collapsing')
+      [dimension](0)
+
+    this.transitioning = 1
+
+    var complete = function () {
+      this.$element
+        .removeClass('collapsing')
+        .addClass('collapse in')
+        [dimension]('auto')
+      this.transitioning = 0
+      this.$element.trigger('shown.bs.collapse')
+    }
+
+    if (!$.support.transition) return complete.call(this)
+
+    var scrollSize = $.camelCase(['scroll', dimension].join('-'))
+
+    this.$element
+      .one($.support.transition.end, $.proxy(complete, this))
+      .emulateTransitionEnd(350)
+      [dimension](this.$element[0][scrollSize])
+  }
+
+  Collapse.prototype.hide = function () {
+    if (this.transitioning || !this.$element.hasClass('in')) return
+
+    var startEvent = $.Event('hide.bs.collapse')
+    this.$element.trigger(startEvent)
+    if (startEvent.isDefaultPrevented()) return
+
+    var dimension = this.dimension()
+
+    this.$element
+      [dimension](this.$element[dimension]())
+      [0].offsetHeight
+
+    this.$element
+      .addClass('collapsing')
+      .removeClass('collapse')
+      .removeClass('in')
+
+    this.transitioning = 1
+
+    var complete = function () {
+      this.transitioning = 0
+      this.$element
+        .trigger('hidden.bs.collapse')
+        .removeClass('collapsing')
+        .addClass('collapse')
+    }
+
+    if (!$.support.transition) return complete.call(this)
+
+    this.$element
+      [dimension](0)
+      .one($.support.transition.end, $.proxy(complete, this))
+      .emulateTransitionEnd(350)
+  }
+
+  Collapse.prototype.toggle = function () {
+    this[this.$element.hasClass('in') ? 'hide' : 'show']()
+  }
+
+
+  // COLLAPSE PLUGIN DEFINITION
+  // ==========================
+
+  var old = $.fn.collapse
+
+  $.fn.collapse = function (option) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.collapse')
+      var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
+
+      if (!data && options.toggle && option == 'show') option = !option
+      if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.collapse.Constructor = Collapse
+
+
+  // COLLAPSE NO CONFLICT
+  // ====================
+
+  $.fn.collapse.noConflict = function () {
+    $.fn.collapse = old
+    return this
+  }
+
+
+  // COLLAPSE DATA-API
+  // =================
+
+  $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) {
+    var $this   = $(this), href
+    var target  = $this.attr('data-target')
+        || e.preventDefault()
+        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+    var $target = $(target)
+    var data    = $target.data('bs.collapse')
+    var option  = data ? 'toggle' : $this.data()
+    var parent  = $this.attr('data-parent')
+    var $parent = parent && $(parent)
+
+    if (!data || !data.transitioning) {
+      if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed')
+      $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+    }
+
+    $target.collapse(option)
+  })
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/datetimepicker.js b/app/assets/javascripts/bootstrap/datetimepicker.js
new file mode 100755
index 0000000..7465e36
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/datetimepicker.js
@@ -0,0 +1,3652 @@
+//! moment.js
+//! version : 2.5.1
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+
+(function (undefined) {
+
+    /************************************
+        Constants
+    ************************************/
+
+    var moment,
+        VERSION = "2.5.1",
+        global = this,
+        round = Math.round,
+        i,
+
+        YEAR = 0,
+        MONTH = 1,
+        DATE = 2,
+        HOUR = 3,
+        MINUTE = 4,
+        SECOND = 5,
+        MILLISECOND = 6,
+
+        // internal storage for language config files
+        languages = {},
+
+        // moment internal properties
+        momentProperties = {
+            _isAMomentObject: null,
+            _i : null,
+            _f : null,
+            _l : null,
+            _strict : null,
+            _isUTC : null,
+            _offset : null,  // optional. Combine with _isUTC
+            _pf : null,
+            _lang : null  // optional
+        },
+
+        // check for nodeJS
+        hasModule = (typeof module !== 'undefined' && module.exports && typeof require !== 'undefined'),
+
+        // ASP.NET json date format regex
+        aspNetJsonRegex = /^\/?Date\((\-?\d+)/i,
+        aspNetTimeSpanJsonRegex = /(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,
+
+        // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
+        // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
+        isoDurationRegex = /^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/,
+
+        // format tokens
+        formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|X|zz?|ZZ?|.)/g,
+        localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,
+
+        // parsing token regexes
+        parseTokenOneOrTwoDigits = /\d\d?/, // 0 - 99
+        parseTokenOneToThreeDigits = /\d{1,3}/, // 0 - 999
+        parseTokenOneToFourDigits = /\d{1,4}/, // 0 - 9999
+        parseTokenOneToSixDigits = /[+\-]?\d{1,6}/, // -999,999 - 999,999
+        parseTokenDigits = /\d+/, // nonzero number of digits
+        parseTokenWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i, // any word (or two) characters or numbers including two/three word month in arabic.
+        parseTokenTimezone = /Z|[\+\-]\d\d:?\d\d/gi, // +00:00 -00:00 +0000 -0000 or Z
+        parseTokenT = /T/i, // T (ISO separator)
+        parseTokenTimestampMs = /[\+\-]?\d+(\.\d{1,3})?/, // 123456789 123456789.123
+
+        //strict parsing regexes
+        parseTokenOneDigit = /\d/, // 0 - 9
+        parseTokenTwoDigits = /\d\d/, // 00 - 99
+        parseTokenThreeDigits = /\d{3}/, // 000 - 999
+        parseTokenFourDigits = /\d{4}/, // 0000 - 9999
+        parseTokenSixDigits = /[+-]?\d{6}/, // -999,999 - 999,999
+        parseTokenSignedNumber = /[+-]?\d+/, // -inf - inf
+
+        // iso 8601 regex
+        // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
+        isoRegex = /^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,
+
+        isoFormat = 'YYYY-MM-DDTHH:mm:ssZ',
+
+        isoDates = [
+            ['YYYYYY-MM-DD', /[+-]\d{6}-\d{2}-\d{2}/],
+            ['YYYY-MM-DD', /\d{4}-\d{2}-\d{2}/],
+            ['GGGG-[W]WW-E', /\d{4}-W\d{2}-\d/],
+            ['GGGG-[W]WW', /\d{4}-W\d{2}/],
+            ['YYYY-DDD', /\d{4}-\d{3}/]
+        ],
+
+        // iso time formats and regexes
+        isoTimes = [
+            ['HH:mm:ss.SSSS', /(T| )\d\d:\d\d:\d\d\.\d{1,3}/],
+            ['HH:mm:ss', /(T| )\d\d:\d\d:\d\d/],
+            ['HH:mm', /(T| )\d\d:\d\d/],
+            ['HH', /(T| )\d\d/]
+        ],
+
+        // timezone chunker "+10:00" > ["10", "00"] or "-1530" > ["-15", "30"]
+        parseTimezoneChunker = /([\+\-]|\d\d)/gi,
+
+        // getter and setter names
+        proxyGettersAndSetters = 'Date|Hours|Minutes|Seconds|Milliseconds'.split('|'),
+        unitMillisecondFactors = {
+            'Milliseconds' : 1,
+            'Seconds' : 1e3,
+            'Minutes' : 6e4,
+            'Hours' : 36e5,
+            'Days' : 864e5,
+            'Months' : 2592e6,
+            'Years' : 31536e6
+        },
+
+        unitAliases = {
+            ms : 'millisecond',
+            s : 'second',
+            m : 'minute',
+            h : 'hour',
+            d : 'day',
+            D : 'date',
+            w : 'week',
+            W : 'isoWeek',
+            M : 'month',
+            y : 'year',
+            DDD : 'dayOfYear',
+            e : 'weekday',
+            E : 'isoWeekday',
+            gg: 'weekYear',
+            GG: 'isoWeekYear'
+        },
+
+        camelFunctions = {
+            dayofyear : 'dayOfYear',
+            isoweekday : 'isoWeekday',
+            isoweek : 'isoWeek',
+            weekyear : 'weekYear',
+            isoweekyear : 'isoWeekYear'
+        },
+
+        // format function strings
+        formatFunctions = {},
+
+        // tokens to ordinalize and pad
+        ordinalizeTokens = 'DDD w W M D d'.split(' '),
+        paddedTokens = 'M D H h m s w W'.split(' '),
+
+        formatTokenFunctions = {
+            M    : function () {
+                return this.month() + 1;
+            },
+            MMM  : function (format) {
+                return this.lang().monthsShort(this, format);
+            },
+            MMMM : function (format) {
+                return this.lang().months(this, format);
+            },
+            D    : function () {
+                return this.date();
+            },
+            DDD  : function () {
+                return this.dayOfYear();
+            },
+            d    : function () {
+                return this.day();
+            },
+            dd   : function (format) {
+                return this.lang().weekdaysMin(this, format);
+            },
+            ddd  : function (format) {
+                return this.lang().weekdaysShort(this, format);
+            },
+            dddd : function (format) {
+                return this.lang().weekdays(this, format);
+            },
+            w    : function () {
+                return this.week();
+            },
+            W    : function () {
+                return this.isoWeek();
+            },
+            YY   : function () {
+                return leftZeroFill(this.year() % 100, 2);
+            },
+            YYYY : function () {
+                return leftZeroFill(this.year(), 4);
+            },
+            YYYYY : function () {
+                return leftZeroFill(this.year(), 5);
+            },
+            YYYYYY : function () {
+                var y = this.year(), sign = y >= 0 ? '+' : '-';
+                return sign + leftZeroFill(Math.abs(y), 6);
+            },
+            gg   : function () {
+                return leftZeroFill(this.weekYear() % 100, 2);
+            },
+            gggg : function () {
+                return leftZeroFill(this.weekYear(), 4);
+            },
+            ggggg : function () {
+                return leftZeroFill(this.weekYear(), 5);
+            },
+            GG   : function () {
+                return leftZeroFill(this.isoWeekYear() % 100, 2);
+            },
+            GGGG : function () {
+                return leftZeroFill(this.isoWeekYear(), 4);
+            },
+            GGGGG : function () {
+                return leftZeroFill(this.isoWeekYear(), 5);
+            },
+            e : function () {
+                return this.weekday();
+            },
+            E : function () {
+                return this.isoWeekday();
+            },
+            a    : function () {
+                return this.lang().meridiem(this.hours(), this.minutes(), true);
+            },
+            A    : function () {
+                return this.lang().meridiem(this.hours(), this.minutes(), false);
+            },
+            H    : function () {
+                return this.hours();
+            },
+            h    : function () {
+                return this.hours() % 12 || 12;
+            },
+            m    : function () {
+                return this.minutes();
+            },
+            s    : function () {
+                return this.seconds();
+            },
+            S    : function () {
+                return toInt(this.milliseconds() / 100);
+            },
+            SS   : function () {
+                return leftZeroFill(toInt(this.milliseconds() / 10), 2);
+            },
+            SSS  : function () {
+                return leftZeroFill(this.milliseconds(), 3);
+            },
+            SSSS : function () {
+                return leftZeroFill(this.milliseconds(), 3);
+            },
+            Z    : function () {
+                var a = -this.zone(),
+                    b = "+";
+                if (a < 0) {
+                    a = -a;
+                    b = "-";
+                }
+                return b + leftZeroFill(toInt(a / 60), 2) + ":" + leftZeroFill(toInt(a) % 60, 2);
+            },
+            ZZ   : function () {
+                var a = -this.zone(),
+                    b = "+";
+                if (a < 0) {
+                    a = -a;
+                    b = "-";
+                }
+                return b + leftZeroFill(toInt(a / 60), 2) + leftZeroFill(toInt(a) % 60, 2);
+            },
+            z : function () {
+                return this.zoneAbbr();
+            },
+            zz : function () {
+                return this.zoneName();
+            },
+            X    : function () {
+                return this.unix();
+            },
+            Q : function () {
+                return this.quarter();
+            }
+        },
+
+        lists = ['months', 'monthsShort', 'weekdays', 'weekdaysShort', 'weekdaysMin'];
+
+    function defaultParsingFlags() {
+        // We need to deep clone this object, and es5 standard is not very
+        // helpful.
+        return {
+            empty : false,
+            unusedTokens : [],
+            unusedInput : [],
+            overflow : -2,
+            charsLeftOver : 0,
+            nullInput : false,
+            invalidMonth : null,
+            invalidFormat : false,
+            userInvalidated : false,
+            iso: false
+        };
+    }
+
+    function padToken(func, count) {
+        return function (a) {
+            return leftZeroFill(func.call(this, a), count);
+        };
+    }
+    function ordinalizeToken(func, period) {
+        return function (a) {
+            return this.lang().ordinal(func.call(this, a), period);
+        };
+    }
+
+    while (ordinalizeTokens.length) {
+        i = ordinalizeTokens.pop();
+        formatTokenFunctions[i + 'o'] = ordinalizeToken(formatTokenFunctions[i], i);
+    }
+    while (paddedTokens.length) {
+        i = paddedTokens.pop();
+        formatTokenFunctions[i + i] = padToken(formatTokenFunctions[i], 2);
+    }
+    formatTokenFunctions.DDDD = padToken(formatTokenFunctions.DDD, 3);
+
+
+    /************************************
+        Constructors
+    ************************************/
+
+    function Language() {
+
+    }
+
+    // Moment prototype object
+    function Moment(config) {
+        checkOverflow(config);
+        extend(this, config);
+    }
+
+    // Duration Constructor
+    function Duration(duration) {
+        var normalizedInput = normalizeObjectUnits(duration),
+            years = normalizedInput.year || 0,
+            months = normalizedInput.month || 0,
+            weeks = normalizedInput.week || 0,
+            days = normalizedInput.day || 0,
+            hours = normalizedInput.hour || 0,
+            minutes = normalizedInput.minute || 0,
+            seconds = normalizedInput.second || 0,
+            milliseconds = normalizedInput.millisecond || 0;
+
+        // representation for dateAddRemove
+        this._milliseconds = +milliseconds +
+            seconds * 1e3 + // 1000
+            minutes * 6e4 + // 1000 * 60
+            hours * 36e5; // 1000 * 60 * 60
+        // Because of dateAddRemove treats 24 hours as different from a
+        // day when working around DST, we need to store them separately
+        this._days = +days +
+            weeks * 7;
+        // It is impossible translate months into days without knowing
+        // which months you are are talking about, so we have to store
+        // it separately.
+        this._months = +months +
+            years * 12;
+
+        this._data = {};
+
+        this._bubble();
+    }
+
+    /************************************
+        Helpers
+    ************************************/
+
+
+    function extend(a, b) {
+        for (var i in b) {
+            if (b.hasOwnProperty(i)) {
+                a[i] = b[i];
+            }
+        }
+
+        if (b.hasOwnProperty("toString")) {
+            a.toString = b.toString;
+        }
+
+        if (b.hasOwnProperty("valueOf")) {
+            a.valueOf = b.valueOf;
+        }
+
+        return a;
+    }
+
+    function cloneMoment(m) {
+        var result = {}, i;
+        for (i in m) {
+            if (m.hasOwnProperty(i) && momentProperties.hasOwnProperty(i)) {
+                result[i] = m[i];
+            }
+        }
+
+        return result;
+    }
+
+    function absRound(number) {
+        if (number < 0) {
+            return Math.ceil(number);
+        } else {
+            return Math.floor(number);
+        }
+    }
+
+    // left zero fill a number
+    // see http://jsperf.com/left-zero-filling for performance comparison
+    function leftZeroFill(number, targetLength, forceSign) {
+        var output = '' + Math.abs(number),
+            sign = number >= 0;
+
+        while (output.length < targetLength) {
+            output = '0' + output;
+        }
+        return (sign ? (forceSign ? '+' : '') : '-') + output;
+    }
+
+    // helper function for _.addTime and _.subtractTime
+    function addOrSubtractDurationFromMoment(mom, duration, isAdding, ignoreUpdateOffset) {
+        var milliseconds = duration._milliseconds,
+            days = duration._days,
+            months = duration._months,
+            minutes,
+            hours;
+
+        if (milliseconds) {
+            mom._d.setTime(+mom._d + milliseconds * isAdding);
+        }
+        // store the minutes and hours so we can restore them
+        if (days || months) {
+            minutes = mom.minute();
+            hours = mom.hour();
+        }
+        if (days) {
+            mom.date(mom.date() + days * isAdding);
+        }
+        if (months) {
+            mom.month(mom.month() + months * isAdding);
+        }
+        if (milliseconds && !ignoreUpdateOffset) {
+            moment.updateOffset(mom);
+        }
+        // restore the minutes and hours after possibly changing dst
+        if (days || months) {
+            mom.minute(minutes);
+            mom.hour(hours);
+        }
+    }
+
+    // check if is an array
+    function isArray(input) {
+        return Object.prototype.toString.call(input) === '[object Array]';
+    }
+
+    function isDate(input) {
+        return  Object.prototype.toString.call(input) === '[object Date]' ||
+                input instanceof Date;
+    }
+
+    // compare two arrays, return the number of differences
+    function compareArrays(array1, array2, dontConvert) {
+        var len = Math.min(array1.length, array2.length),
+            lengthDiff = Math.abs(array1.length - array2.length),
+            diffs = 0,
+            i;
+        for (i = 0; i < len; i++) {
+            if ((dontConvert && array1[i] !== array2[i]) ||
+                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
+                diffs++;
+            }
+        }
+        return diffs + lengthDiff;
+    }
+
+    function normalizeUnits(units) {
+        if (units) {
+            var lowered = units.toLowerCase().replace(/(.)s$/, '$1');
+            units = unitAliases[units] || camelFunctions[lowered] || lowered;
+        }
+        return units;
+    }
+
+    function normalizeObjectUnits(inputObject) {
+        var normalizedInput = {},
+            normalizedProp,
+            prop;
+
+        for (prop in inputObject) {
+            if (inputObject.hasOwnProperty(prop)) {
+                normalizedProp = normalizeUnits(prop);
+                if (normalizedProp) {
+                    normalizedInput[normalizedProp] = inputObject[prop];
+                }
+            }
+        }
+
+        return normalizedInput;
+    }
+
+    function makeList(field) {
+        var count, setter;
+
+        if (field.indexOf('week') === 0) {
+            count = 7;
+            setter = 'day';
+        }
+        else if (field.indexOf('month') === 0) {
+            count = 12;
+            setter = 'month';
+        }
+        else {
+            return;
+        }
+
+        moment[field] = function (format, index) {
+            var i, getter,
+                method = moment.fn._lang[field],
+                results = [];
+
+            if (typeof format === 'number') {
+                index = format;
+                format = undefined;
+            }
+
+            getter = function (i) {
+                var m = moment().utc().set(setter, i);
+                return method.call(moment.fn._lang, m, format || '');
+            };
+
+            if (index != null) {
+                return getter(index);
+            }
+            else {
+                for (i = 0; i < count; i++) {
+                    results.push(getter(i));
+                }
+                return results;
+            }
+        };
+    }
+
+    function toInt(argumentForCoercion) {
+        var coercedNumber = +argumentForCoercion,
+            value = 0;
+
+        if (coercedNumber !== 0 && isFinite(coercedNumber)) {
+            if (coercedNumber >= 0) {
+                value = Math.floor(coercedNumber);
+            } else {
+                value = Math.ceil(coercedNumber);
+            }
+        }
+
+        return value;
+    }
+
+    function daysInMonth(year, month) {
+        return new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
+    }
+
+    function daysInYear(year) {
+        return isLeapYear(year) ? 366 : 365;
+    }
+
+    function isLeapYear(year) {
+        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+    }
+
+    function checkOverflow(m) {
+        var overflow;
+        if (m._a && m._pf.overflow === -2) {
+            overflow =
+                m._a[MONTH] < 0 || m._a[MONTH] > 11 ? MONTH :
+                m._a[DATE] < 1 || m._a[DATE] > daysInMonth(m._a[YEAR], m._a[MONTH]) ? DATE :
+                m._a[HOUR] < 0 || m._a[HOUR] > 23 ? HOUR :
+                m._a[MINUTE] < 0 || m._a[MINUTE] > 59 ? MINUTE :
+                m._a[SECOND] < 0 || m._a[SECOND] > 59 ? SECOND :
+                m._a[MILLISECOND] < 0 || m._a[MILLISECOND] > 999 ? MILLISECOND :
+                -1;
+
+            if (m._pf._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
+                overflow = DATE;
+            }
+
+            m._pf.overflow = overflow;
+        }
+    }
+
+    function isValid(m) {
+        if (m._isValid == null) {
+            m._isValid = !isNaN(m._d.getTime()) &&
+                m._pf.overflow < 0 &&
+                !m._pf.empty &&
+                !m._pf.invalidMonth &&
+                !m._pf.nullInput &&
+                !m._pf.invalidFormat &&
+                !m._pf.userInvalidated;
+
+            if (m._strict) {
+                m._isValid = m._isValid &&
+                    m._pf.charsLeftOver === 0 &&
+                    m._pf.unusedTokens.length === 0;
+            }
+        }
+        return m._isValid;
+    }
+
+    function normalizeLanguage(key) {
+        return key ? key.toLowerCase().replace('_', '-') : key;
+    }
+
+    // Return a moment from input, that is local/utc/zone equivalent to model.
+    function makeAs(input, model) {
+        return model._isUTC ? moment(input).zone(model._offset || 0) :
+            moment(input).local();
+    }
+
+    /************************************
+        Languages
+    ************************************/
+
+
+    extend(Language.prototype, {
+
+        set : function (config) {
+            var prop, i;
+            for (i in config) {
+                prop = config[i];
+                if (typeof prop === 'function') {
+                    this[i] = prop;
+                } else {
+                    this['_' + i] = prop;
+                }
+            }
+        },
+
+        _months : "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
+        months : function (m) {
+            return this._months[m.month()];
+        },
+
+        _monthsShort : "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
+        monthsShort : function (m) {
+            return this._monthsShort[m.month()];
+        },
+
+        monthsParse : function (monthName) {
+            var i, mom, regex;
+
+            if (!this._monthsParse) {
+                this._monthsParse = [];
+            }
+
+            for (i = 0; i < 12; i++) {
+                // make the regex if we don't have it already
+                if (!this._monthsParse[i]) {
+                    mom = moment.utc([2000, i]);
+                    regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
+                    this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
+                }
+                // test the regex
+                if (this._monthsParse[i].test(monthName)) {
+                    return i;
+                }
+            }
+        },
+
+        _weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
+        weekdays : function (m) {
+            return this._weekdays[m.day()];
+        },
+
+        _weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
+        weekdaysShort : function (m) {
+            return this._weekdaysShort[m.day()];
+        },
+
+        _weekdaysMin : "Su_Mo_Tu_We_Th_Fr_Sa".split("_"),
+        weekdaysMin : function (m) {
+            return this._weekdaysMin[m.day()];
+        },
+
+        weekdaysParse : function (weekdayName) {
+            var i, mom, regex;
+
+            if (!this._weekdaysParse) {
+                this._weekdaysParse = [];
+            }
+
+            for (i = 0; i < 7; i++) {
+                // make the regex if we don't have it already
+                if (!this._weekdaysParse[i]) {
+                    mom = moment([2000, 1]).day(i);
+                    regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
+                    this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
+                }
+                // test the regex
+                if (this._weekdaysParse[i].test(weekdayName)) {
+                    return i;
+                }
+            }
+        },
+
+        _longDateFormat : {
+            LT : "h:mm A",
+            L : "MM/DD/YYYY",
+            LL : "MMMM D YYYY",
+            LLL : "MMMM D YYYY LT",
+            LLLL : "dddd, MMMM D YYYY LT"
+        },
+        longDateFormat : function (key) {
+            var output = this._longDateFormat[key];
+            if (!output && this._longDateFormat[key.toUpperCase()]) {
+                output = this._longDateFormat[key.toUpperCase()].replace(/MMMM|MM|DD|dddd/g, function (val) {
+                    return val.slice(1);
+                });
+                this._longDateFormat[key] = output;
+            }
+            return output;
+        },
+
+        isPM : function (input) {
+            // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
+            // Using charAt should be more compatible.
+            return ((input + '').toLowerCase().charAt(0) === 'p');
+        },
+
+        _meridiemParse : /[ap]\.?m?\.?/i,
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'pm' : 'PM';
+            } else {
+                return isLower ? 'am' : 'AM';
+            }
+        },
+
+        _calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        calendar : function (key, mom) {
+            var output = this._calendar[key];
+            return typeof output === 'function' ? output.apply(mom) : output;
+        },
+
+        _relativeTime : {
+            future : "in %s",
+            past : "%s ago",
+            s : "a few seconds",
+            m : "a minute",
+            mm : "%d minutes",
+            h : "an hour",
+            hh : "%d hours",
+            d : "a day",
+            dd : "%d days",
+            M : "a month",
+            MM : "%d months",
+            y : "a year",
+            yy : "%d years"
+        },
+        relativeTime : function (number, withoutSuffix, string, isFuture) {
+            var output = this._relativeTime[string];
+            return (typeof output === 'function') ?
+                output(number, withoutSuffix, string, isFuture) :
+                output.replace(/%d/i, number);
+        },
+        pastFuture : function (diff, output) {
+            var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
+            return typeof format === 'function' ? format(output) : format.replace(/%s/i, output);
+        },
+
+        ordinal : function (number) {
+            return this._ordinal.replace("%d", number);
+        },
+        _ordinal : "%d",
+
+        preparse : function (string) {
+            return string;
+        },
+
+        postformat : function (string) {
+            return string;
+        },
+
+        week : function (mom) {
+            return weekOfYear(mom, this._week.dow, this._week.doy).week;
+        },
+
+        _week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        },
+
+        _invalidDate: 'Invalid date',
+        invalidDate: function () {
+            return this._invalidDate;
+        }
+    });
+
+    // Loads a language definition into the `languages` cache.  The function
+    // takes a key and optionally values.  If not in the browser and no values
+    // are provided, it will load the language file module.  As a convenience,
+    // this function also returns the language values.
+    function loadLang(key, values) {
+        values.abbr = key;
+        if (!languages[key]) {
+            languages[key] = new Language();
+        }
+        languages[key].set(values);
+        return languages[key];
+    }
+
+    // Remove a language from the `languages` cache. Mostly useful in tests.
+    function unloadLang(key) {
+        delete languages[key];
+    }
+
+    // Determines which language definition to use and returns it.
+    //
+    // With no parameters, it will return the global language.  If you
+    // pass in a language key, such as 'en', it will return the
+    // definition for 'en', so long as 'en' has already been loaded using
+    // moment.lang.
+    function getLangDefinition(key) {
+        var i = 0, j, lang, next, split,
+            get = function (k) {
+                if (!languages[k] && hasModule) {
+                    try {
+                        require('./lang/' + k);
+                    } catch (e) { }
+                }
+                return languages[k];
+            };
+
+        if (!key) {
+            return moment.fn._lang;
+        }
+
+        if (!isArray(key)) {
+            //short-circuit everything else
+            lang = get(key);
+            if (lang) {
+                return lang;
+            }
+            key = [key];
+        }
+
+        //pick the language from the array
+        //try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
+        //substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
+        while (i < key.length) {
+            split = normalizeLanguage(key[i]).split('-');
+            j = split.length;
+            next = normalizeLanguage(key[i + 1]);
+            next = next ? next.split('-') : null;
+            while (j > 0) {
+                lang = get(split.slice(0, j).join('-'));
+                if (lang) {
+                    return lang;
+                }
+                if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
+                    //the next array item is better than a shallower substring of this one
+                    break;
+                }
+                j--;
+            }
+            i++;
+        }
+        return moment.fn._lang;
+    }
+
+    /************************************
+        Formatting
+    ************************************/
+
+
+    function removeFormattingTokens(input) {
+        if (input.match(/\[[\s\S]/)) {
+            return input.replace(/^\[|\]$/g, "");
+        }
+        return input.replace(/\\/g, "");
+    }
+
+    function makeFormatFunction(format) {
+        var array = format.match(formattingTokens), i, length;
+
+        for (i = 0, length = array.length; i < length; i++) {
+            if (formatTokenFunctions[array[i]]) {
+                array[i] = formatTokenFunctions[array[i]];
+            } else {
+                array[i] = removeFormattingTokens(array[i]);
+            }
+        }
+
+        return function (mom) {
+            var output = "";
+            for (i = 0; i < length; i++) {
+                output += array[i] instanceof Function ? array[i].call(mom, format) : array[i];
+            }
+            return output;
+        };
+    }
+
+    // format date using native date object
+    function formatMoment(m, format) {
+
+        if (!m.isValid()) {
+            return m.lang().invalidDate();
+        }
+
+        format = expandFormat(format, m.lang());
+
+        if (!formatFunctions[format]) {
+            formatFunctions[format] = makeFormatFunction(format);
+        }
+
+        return formatFunctions[format](m);
+    }
+
+    function expandFormat(format, lang) {
+        var i = 5;
+
+        function replaceLongDateFormatTokens(input) {
+            return lang.longDateFormat(input) || input;
+        }
+
+        localFormattingTokens.lastIndex = 0;
+        while (i >= 0 && localFormattingTokens.test(format)) {
+            format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
+            localFormattingTokens.lastIndex = 0;
+            i -= 1;
+        }
+
+        return format;
+    }
+
+
+    /************************************
+        Parsing
+    ************************************/
+
+
+    // get the regex to find the next token
+    function getParseRegexForToken(token, config) {
+        var a, strict = config._strict;
+        switch (token) {
+        case 'DDDD':
+            return parseTokenThreeDigits;
+        case 'YYYY':
+        case 'GGGG':
+        case 'gggg':
+            return strict ? parseTokenFourDigits : parseTokenOneToFourDigits;
+        case 'Y':
+        case 'G':
+        case 'g':
+            return parseTokenSignedNumber;
+        case 'YYYYYY':
+        case 'YYYYY':
+        case 'GGGGG':
+        case 'ggggg':
+            return strict ? parseTokenSixDigits : parseTokenOneToSixDigits;
+        case 'S':
+            if (strict) { return parseTokenOneDigit; }
+            /* falls through */
+        case 'SS':
+            if (strict) { return parseTokenTwoDigits; }
+            /* falls through */
+        case 'SSS':
+            if (strict) { return parseTokenThreeDigits; }
+            /* falls through */
+        case 'DDD':
+            return parseTokenOneToThreeDigits;
+        case 'MMM':
+        case 'MMMM':
+        case 'dd':
+        case 'ddd':
+        case 'dddd':
+            return parseTokenWord;
+        case 'a':
+        case 'A':
+            return getLangDefinition(config._l)._meridiemParse;
+        case 'X':
+            return parseTokenTimestampMs;
+        case 'Z':
+        case 'ZZ':
+            return parseTokenTimezone;
+        case 'T':
+            return parseTokenT;
+        case 'SSSS':
+            return parseTokenDigits;
+        case 'MM':
+        case 'DD':
+        case 'YY':
+        case 'GG':
+        case 'gg':
+        case 'HH':
+        case 'hh':
+        case 'mm':
+        case 'ss':
+        case 'ww':
+        case 'WW':
+            return strict ? parseTokenTwoDigits : parseTokenOneOrTwoDigits;
+        case 'M':
+        case 'D':
+        case 'd':
+        case 'H':
+        case 'h':
+        case 'm':
+        case 's':
+        case 'w':
+        case 'W':
+        case 'e':
+        case 'E':
+            return parseTokenOneOrTwoDigits;
+        default :
+            a = new RegExp(regexpEscape(unescapeFormat(token.replace('\\', '')), "i"));
+            return a;
+        }
+    }
+
+    function timezoneMinutesFromString(string) {
+        string = string || "";
+        var possibleTzMatches = (string.match(parseTokenTimezone) || []),
+            tzChunk = possibleTzMatches[possibleTzMatches.length - 1] || [],
+            parts = (tzChunk + '').match(parseTimezoneChunker) || ['-', 0, 0],
+            minutes = +(parts[1] * 60) + toInt(parts[2]);
+
+        return parts[0] === '+' ? -minutes : minutes;
+    }
+
+    // function to convert string input to date
+    function addTimeToArrayFromToken(token, input, config) {
+        var a, datePartArray = config._a;
+
+        switch (token) {
+        // MONTH
+        case 'M' : // fall through to MM
+        case 'MM' :
+            if (input != null) {
+                datePartArray[MONTH] = toInt(input) - 1;
+            }
+            break;
+        case 'MMM' : // fall through to MMMM
+        case 'MMMM' :
+            a = getLangDefinition(config._l).monthsParse(input);
+            // if we didn't find a month name, mark the date as invalid.
+            if (a != null) {
+                datePartArray[MONTH] = a;
+            } else {
+                config._pf.invalidMonth = input;
+            }
+            break;
+        // DAY OF MONTH
+        case 'D' : // fall through to DD
+        case 'DD' :
+            if (input != null) {
+                datePartArray[DATE] = toInt(input);
+            }
+            break;
+        // DAY OF YEAR
+        case 'DDD' : // fall through to DDDD
+        case 'DDDD' :
+            if (input != null) {
+                config._dayOfYear = toInt(input);
+            }
+
+            break;
+        // YEAR
+        case 'YY' :
+            datePartArray[YEAR] = toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
+            break;
+        case 'YYYY' :
+        case 'YYYYY' :
+        case 'YYYYYY' :
+            datePartArray[YEAR] = toInt(input);
+            break;
+        // AM / PM
+        case 'a' : // fall through to A
+        case 'A' :
+            config._isPm = getLangDefinition(config._l).isPM(input);
+            break;
+        // 24 HOUR
+        case 'H' : // fall through to hh
+        case 'HH' : // fall through to hh
+        case 'h' : // fall through to hh
+        case 'hh' :
+            datePartArray[HOUR] = toInt(input);
+            break;
+        // MINUTE
+        case 'm' : // fall through to mm
+        case 'mm' :
+            datePartArray[MINUTE] = toInt(input);
+            break;
+        // SECOND
+        case 's' : // fall through to ss
+        case 'ss' :
+            datePartArray[SECOND] = toInt(input);
+            break;
+        // MILLISECOND
+        case 'S' :
+        case 'SS' :
+        case 'SSS' :
+        case 'SSSS' :
+            datePartArray[MILLISECOND] = toInt(('0.' + input) * 1000);
+            break;
+        // UNIX TIMESTAMP WITH MS
+        case 'X':
+            config._d = new Date(parseFloat(input) * 1000);
+            break;
+        // TIMEZONE
+        case 'Z' : // fall through to ZZ
+        case 'ZZ' :
+            config._useUTC = true;
+            config._tzm = timezoneMinutesFromString(input);
+            break;
+        case 'w':
+        case 'ww':
+        case 'W':
+        case 'WW':
+        case 'd':
+        case 'dd':
+        case 'ddd':
+        case 'dddd':
+        case 'e':
+        case 'E':
+            token = token.substr(0, 1);
+            /* falls through */
+        case 'gg':
+        case 'gggg':
+        case 'GG':
+        case 'GGGG':
+        case 'GGGGG':
+            token = token.substr(0, 2);
+            if (input) {
+                config._w = config._w || {};
+                config._w[token] = input;
+            }
+            break;
+        }
+    }
+
+    // convert an array to a date.
+    // the array should mirror the parameters below
+    // note: all values past the year are optional and will default to the lowest possible value.
+    // [year, month, day , hour, minute, second, millisecond]
+    function dateFromConfig(config) {
+        var i, date, input = [], currentDate,
+            yearToUse, fixYear, w, temp, lang, weekday, week;
+
+        if (config._d) {
+            return;
+        }
+
+        currentDate = currentDateArray(config);
+
+        //compute day of the year from weeks and weekdays
+        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
+            fixYear = function (val) {
+                var int_val = parseInt(val, 10);
+                return val ?
+                  (val.length < 3 ? (int_val > 68 ? 1900 + int_val : 2000 + int_val) : int_val) :
+                  (config._a[YEAR] == null ? moment().weekYear() : config._a[YEAR]);
+            };
+
+            w = config._w;
+            if (w.GG != null || w.W != null || w.E != null) {
+                temp = dayOfYearFromWeeks(fixYear(w.GG), w.W || 1, w.E, 4, 1);
+            }
+            else {
+                lang = getLangDefinition(config._l);
+                weekday = w.d != null ?  parseWeekday(w.d, lang) :
+                  (w.e != null ?  parseInt(w.e, 10) + lang._week.dow : 0);
+
+                week = parseInt(w.w, 10) || 1;
+
+                //if we're parsing 'd', then the low day numbers may be next week
+                if (w.d != null && weekday < lang._week.dow) {
+                    week++;
+                }
+
+                temp = dayOfYearFromWeeks(fixYear(w.gg), week, weekday, lang._week.doy, lang._week.dow);
+            }
+
+            config._a[YEAR] = temp.year;
+            config._dayOfYear = temp.dayOfYear;
+        }
+
+        //if the day of the year is set, figure out what it is
+        if (config._dayOfYear) {
+            yearToUse = config._a[YEAR] == null ? currentDate[YEAR] : config._a[YEAR];
+
+            if (config._dayOfYear > daysInYear(yearToUse)) {
+                config._pf._overflowDayOfYear = true;
+            }
+
+            date = makeUTCDate(yearToUse, 0, config._dayOfYear);
+            config._a[MONTH] = date.getUTCMonth();
+            config._a[DATE] = date.getUTCDate();
+        }
+
+        // Default to current date.
+        // * if no year, month, day of month are given, default to today
+        // * if day of month is given, default month and year
+        // * if month is given, default only year
+        // * if year is given, don't default anything
+        for (i = 0; i < 3 && config._a[i] == null; ++i) {
+            config._a[i] = input[i] = currentDate[i];
+        }
+
+        // Zero out whatever was not defaulted, including time
+        for (; i < 7; i++) {
+            config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
+        }
+
+        // add the offsets to the time to be parsed so that we can have a clean array for checking isValid
+        input[HOUR] += toInt((config._tzm || 0) / 60);
+        input[MINUTE] += toInt((config._tzm || 0) % 60);
+
+        config._d = (config._useUTC ? makeUTCDate : makeDate).apply(null, input);
+    }
+
+    function dateFromObject(config) {
+        var normalizedInput;
+
+        if (config._d) {
+            return;
+        }
+
+        normalizedInput = normalizeObjectUnits(config._i);
+        config._a = [
+            normalizedInput.year,
+            normalizedInput.month,
+            normalizedInput.day,
+            normalizedInput.hour,
+            normalizedInput.minute,
+            normalizedInput.second,
+            normalizedInput.millisecond
+        ];
+
+        dateFromConfig(config);
+    }
+
+    function currentDateArray(config) {
+        var now = new Date();
+        if (config._useUTC) {
+            return [
+                now.getUTCFullYear(),
+                now.getUTCMonth(),
+                now.getUTCDate()
+            ];
+        } else {
+            return [now.getFullYear(), now.getMonth(), now.getDate()];
+        }
+    }
+
+    // date from string and format string
+    function makeDateFromStringAndFormat(config) {
+
+        config._a = [];
+        config._pf.empty = true;
+
+        // This array is used to make a Date, either with `new Date` or `Date.UTC`
+        var lang = getLangDefinition(config._l),
+            string = '' + config._i,
+            i, parsedInput, tokens, token, skipped,
+            stringLength = string.length,
+            totalParsedInputLength = 0;
+
+        tokens = expandFormat(config._f, lang).match(formattingTokens) || [];
+
+        for (i = 0; i < tokens.length; i++) {
+            token = tokens[i];
+            parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
+            if (parsedInput) {
+                skipped = string.substr(0, string.indexOf(parsedInput));
+                if (skipped.length > 0) {
+                    config._pf.unusedInput.push(skipped);
+                }
+                string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
+                totalParsedInputLength += parsedInput.length;
+            }
+            // don't parse if it's not a known token
+            if (formatTokenFunctions[token]) {
+                if (parsedInput) {
+                    config._pf.empty = false;
+                }
+                else {
+                    config._pf.unusedTokens.push(token);
+                }
+                addTimeToArrayFromToken(token, parsedInput, config);
+            }
+            else if (config._strict && !parsedInput) {
+                config._pf.unusedTokens.push(token);
+            }
+        }
+
+        // add remaining unparsed input length to the string
+        config._pf.charsLeftOver = stringLength - totalParsedInputLength;
+        if (string.length > 0) {
+            config._pf.unusedInput.push(string);
+        }
+
+        // handle am pm
+        if (config._isPm && config._a[HOUR] < 12) {
+            config._a[HOUR] += 12;
+        }
+        // if is 12 am, change hours to 0
+        if (config._isPm === false && config._a[HOUR] === 12) {
+            config._a[HOUR] = 0;
+        }
+
+        dateFromConfig(config);
+        checkOverflow(config);
+    }
+
+    function unescapeFormat(s) {
+        return s.replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
+            return p1 || p2 || p3 || p4;
+        });
+    }
+
+    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
+    function regexpEscape(s) {
+        return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+    }
+
+    // date from string and array of format strings
+    function makeDateFromStringAndArray(config) {
+        var tempConfig,
+            bestMoment,
+
+            scoreToBeat,
+            i,
+            currentScore;
+
+        if (config._f.length === 0) {
+            config._pf.invalidFormat = true;
+            config._d = new Date(NaN);
+            return;
+        }
+
+        for (i = 0; i < config._f.length; i++) {
+            currentScore = 0;
+            tempConfig = extend({}, config);
+            tempConfig._pf = defaultParsingFlags();
+            tempConfig._f = config._f[i];
+            makeDateFromStringAndFormat(tempConfig);
+
+            if (!isValid(tempConfig)) {
+                continue;
+            }
+
+            // if there is any input that was not parsed add a penalty for that format
+            currentScore += tempConfig._pf.charsLeftOver;
+
+            //or tokens
+            currentScore += tempConfig._pf.unusedTokens.length * 10;
+
+            tempConfig._pf.score = currentScore;
+
+            if (scoreToBeat == null || currentScore < scoreToBeat) {
+                scoreToBeat = currentScore;
+                bestMoment = tempConfig;
+            }
+        }
+
+        extend(config, bestMoment || tempConfig);
+    }
+
+    // date from iso format
+    function makeDateFromString(config) {
+        var i, l,
+            string = config._i,
+            match = isoRegex.exec(string);
+
+        if (match) {
+            config._pf.iso = true;
+            for (i = 0, l = isoDates.length; i < l; i++) {
+                if (isoDates[i][1].exec(string)) {
+                    // match[5] should be "T" or undefined
+                    config._f = isoDates[i][0] + (match[6] || " ");
+                    break;
+                }
+            }
+            for (i = 0, l = isoTimes.length; i < l; i++) {
+                if (isoTimes[i][1].exec(string)) {
+                    config._f += isoTimes[i][0];
+                    break;
+                }
+            }
+            if (string.match(parseTokenTimezone)) {
+                config._f += "Z";
+            }
+            makeDateFromStringAndFormat(config);
+        }
+        else {
+            config._d = new Date(string);
+        }
+    }
+
+    function makeDateFromInput(config) {
+        var input = config._i,
+            matched = aspNetJsonRegex.exec(input);
+
+        if (input === undefined) {
+            config._d = new Date();
+        } else if (matched) {
+            config._d = new Date(+matched[1]);
+        } else if (typeof input === 'string') {
+            makeDateFromString(config);
+        } else if (isArray(input)) {
+            config._a = input.slice(0);
+            dateFromConfig(config);
+        } else if (isDate(input)) {
+            config._d = new Date(+input);
+        } else if (typeof(input) === 'object') {
+            dateFromObject(config);
+        } else {
+            config._d = new Date(input);
+        }
+    }
+
+    function makeDate(y, m, d, h, M, s, ms) {
+        //can't just apply() to create a date:
+        //http://stackoverflow.com/questions/181348/instantiating-a-javascript-object-by-calling-prototype-constructor-apply
+        var date = new Date(y, m, d, h, M, s, ms);
+
+        //the date constructor doesn't accept years < 1970
+        if (y < 1970) {
+            date.setFullYear(y);
+        }
+        return date;
+    }
+
+    function makeUTCDate(y) {
+        var date = new Date(Date.UTC.apply(null, arguments));
+        if (y < 1970) {
+            date.setUTCFullYear(y);
+        }
+        return date;
+    }
+
+    function parseWeekday(input, language) {
+        if (typeof input === 'string') {
+            if (!isNaN(input)) {
+                input = parseInt(input, 10);
+            }
+            else {
+                input = language.weekdaysParse(input);
+                if (typeof input !== 'number') {
+                    return null;
+                }
+            }
+        }
+        return input;
+    }
+
+    /************************************
+        Relative Time
+    ************************************/
+
+
+    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
+    function substituteTimeAgo(string, number, withoutSuffix, isFuture, lang) {
+        return lang.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
+    }
+
+    function relativeTime(milliseconds, withoutSuffix, lang) {
+        var seconds = round(Math.abs(milliseconds) / 1000),
+            minutes = round(seconds / 60),
+            hours = round(minutes / 60),
+            days = round(hours / 24),
+            years = round(days / 365),
+            args = seconds < 45 && ['s', seconds] ||
+                minutes === 1 && ['m'] ||
+                minutes < 45 && ['mm', minutes] ||
+                hours === 1 && ['h'] ||
+                hours < 22 && ['hh', hours] ||
+                days === 1 && ['d'] ||
+                days <= 25 && ['dd', days] ||
+                days <= 45 && ['M'] ||
+                days < 345 && ['MM', round(days / 30)] ||
+                years === 1 && ['y'] || ['yy', years];
+        args[2] = withoutSuffix;
+        args[3] = milliseconds > 0;
+        args[4] = lang;
+        return substituteTimeAgo.apply({}, args);
+    }
+
+
+    /************************************
+        Week of Year
+    ************************************/
+
+
+    // firstDayOfWeek       0 = sun, 6 = sat
+    //                      the day of the week that starts the week
+    //                      (usually sunday or monday)
+    // firstDayOfWeekOfYear 0 = sun, 6 = sat
+    //                      the first week is the week that contains the first
+    //                      of this day of the week
+    //                      (eg. ISO weeks use thursday (4))
+    function weekOfYear(mom, firstDayOfWeek, firstDayOfWeekOfYear) {
+        var end = firstDayOfWeekOfYear - firstDayOfWeek,
+            daysToDayOfWeek = firstDayOfWeekOfYear - mom.day(),
+            adjustedMoment;
+
+
+        if (daysToDayOfWeek > end) {
+            daysToDayOfWeek -= 7;
+        }
+
+        if (daysToDayOfWeek < end - 7) {
+            daysToDayOfWeek += 7;
+        }
+
+        adjustedMoment = moment(mom).add('d', daysToDayOfWeek);
+        return {
+            week: Math.ceil(adjustedMoment.dayOfYear() / 7),
+            year: adjustedMoment.year()
+        };
+    }
+
+    //http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
+    function dayOfYearFromWeeks(year, week, weekday, firstDayOfWeekOfYear, firstDayOfWeek) {
+        var d = makeUTCDate(year, 0, 1).getUTCDay(), daysToAdd, dayOfYear;
+
+        weekday = weekday != null ? weekday : firstDayOfWeek;
+        daysToAdd = firstDayOfWeek - d + (d > firstDayOfWeekOfYear ? 7 : 0) - (d < firstDayOfWeek ? 7 : 0);
+        dayOfYear = 7 * (week - 1) + (weekday - firstDayOfWeek) + daysToAdd + 1;
+
+        return {
+            year: dayOfYear > 0 ? year : year - 1,
+            dayOfYear: dayOfYear > 0 ?  dayOfYear : daysInYear(year - 1) + dayOfYear
+        };
+    }
+
+    /************************************
+        Top Level Functions
+    ************************************/
+
+    function makeMoment(config) {
+        var input = config._i,
+            format = config._f;
+
+        if (input === null) {
+            return moment.invalid({nullInput: true});
+        }
+
+        if (typeof input === 'string') {
+            config._i = input = getLangDefinition().preparse(input);
+        }
+
+        if (moment.isMoment(input)) {
+            config = cloneMoment(input);
+
+            config._d = new Date(+input._d);
+        } else if (format) {
+            if (isArray(format)) {
+                makeDateFromStringAndArray(config);
+            } else {
+                makeDateFromStringAndFormat(config);
+            }
+        } else {
+            makeDateFromInput(config);
+        }
+
+        return new Moment(config);
+    }
+
+    moment = function (input, format, lang, strict) {
+        var c;
+
+        if (typeof(lang) === "boolean") {
+            strict = lang;
+            lang = undefined;
+        }
+        // object construction must be done this way.
+        // https://github.com/moment/moment/issues/1423
+        c = {};
+        c._isAMomentObject = true;
+        c._i = input;
+        c._f = format;
+        c._l = lang;
+        c._strict = strict;
+        c._isUTC = false;
+        c._pf = defaultParsingFlags();
+
+        return makeMoment(c);
+    };
+
+    // creating with utc
+    moment.utc = function (input, format, lang, strict) {
+        var c;
+
+        if (typeof(lang) === "boolean") {
+            strict = lang;
+            lang = undefined;
+        }
+        // object construction must be done this way.
+        // https://github.com/moment/moment/issues/1423
+        c = {};
+        c._isAMomentObject = true;
+        c._useUTC = true;
+        c._isUTC = true;
+        c._l = lang;
+        c._i = input;
+        c._f = format;
+        c._strict = strict;
+        c._pf = defaultParsingFlags();
+
+        return makeMoment(c).utc();
+    };
+
+    // creating with unix timestamp (in seconds)
+    moment.unix = function (input) {
+        return moment(input * 1000);
+    };
+
+    // duration
+    moment.duration = function (input, key) {
+        var duration = input,
+            // matching against regexp is expensive, do it on demand
+            match = null,
+            sign,
+            ret,
+            parseIso;
+
+        if (moment.isDuration(input)) {
+            duration = {
+                ms: input._milliseconds,
+                d: input._days,
+                M: input._months
+            };
+        } else if (typeof input === 'number') {
+            duration = {};
+            if (key) {
+                duration[key] = input;
+            } else {
+                duration.milliseconds = input;
+            }
+        } else if (!!(match = aspNetTimeSpanJsonRegex.exec(input))) {
+            sign = (match[1] === "-") ? -1 : 1;
+            duration = {
+                y: 0,
+                d: toInt(match[DATE]) * sign,
+                h: toInt(match[HOUR]) * sign,
+                m: toInt(match[MINUTE]) * sign,
+                s: toInt(match[SECOND]) * sign,
+                ms: toInt(match[MILLISECOND]) * sign
+            };
+        } else if (!!(match = isoDurationRegex.exec(input))) {
+            sign = (match[1] === "-") ? -1 : 1;
+            parseIso = function (inp) {
+                // We'd normally use ~~inp for this, but unfortunately it also
+                // converts floats to ints.
+                // inp may be undefined, so careful calling replace on it.
+                var res = inp && parseFloat(inp.replace(',', '.'));
+                // apply sign while we're at it
+                return (isNaN(res) ? 0 : res) * sign;
+            };
+            duration = {
+                y: parseIso(match[2]),
+                M: parseIso(match[3]),
+                d: parseIso(match[4]),
+                h: parseIso(match[5]),
+                m: parseIso(match[6]),
+                s: parseIso(match[7]),
+                w: parseIso(match[8])
+            };
+        }
+
+        ret = new Duration(duration);
+
+        if (moment.isDuration(input) && input.hasOwnProperty('_lang')) {
+            ret._lang = input._lang;
+        }
+
+        return ret;
+    };
+
+    // version number
+    moment.version = VERSION;
+
+    // default format
+    moment.defaultFormat = isoFormat;
+
+    // This function will be called whenever a moment is mutated.
+    // It is intended to keep the offset in sync with the timezone.
+    moment.updateOffset = function () {};
+
+    // This function will load languages and then set the global language.  If
+    // no arguments are passed in, it will simply return the current global
+    // language key.
+    moment.lang = function (key, values) {
+        var r;
+        if (!key) {
+            return moment.fn._lang._abbr;
+        }
+        if (values) {
+            loadLang(normalizeLanguage(key), values);
+        } else if (values === null) {
+            unloadLang(key);
+            key = 'en';
+        } else if (!languages[key]) {
+            getLangDefinition(key);
+        }
+        r = moment.duration.fn._lang = moment.fn._lang = getLangDefinition(key);
+        return r._abbr;
+    };
+
+    // returns language data
+    moment.langData = function (key) {
+        if (key && key._lang && key._lang._abbr) {
+            key = key._lang._abbr;
+        }
+        return getLangDefinition(key);
+    };
+
+    // compare moment object
+    moment.isMoment = function (obj) {
+        return obj instanceof Moment ||
+            (obj != null &&  obj.hasOwnProperty('_isAMomentObject'));
+    };
+
+    // for typechecking Duration objects
+    moment.isDuration = function (obj) {
+        return obj instanceof Duration;
+    };
+
+    for (i = lists.length - 1; i >= 0; --i) {
+        makeList(lists[i]);
+    }
+
+    moment.normalizeUnits = function (units) {
+        return normalizeUnits(units);
+    };
+
+    moment.invalid = function (flags) {
+        var m = moment.utc(NaN);
+        if (flags != null) {
+            extend(m._pf, flags);
+        }
+        else {
+            m._pf.userInvalidated = true;
+        }
+
+        return m;
+    };
+
+    moment.parseZone = function (input) {
+        return moment(input).parseZone();
+    };
+
+    /************************************
+        Moment Prototype
+    ************************************/
+
+
+    extend(moment.fn = Moment.prototype, {
+
+        clone : function () {
+            return moment(this);
+        },
+
+        valueOf : function () {
+            return +this._d + ((this._offset || 0) * 60000);
+        },
+
+        unix : function () {
+            return Math.floor(+this / 1000);
+        },
+
+        toString : function () {
+            return this.clone().lang('en').format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ");
+        },
+
+        toDate : function () {
+            return this._offset ? new Date(+this) : this._d;
+        },
+
+        toISOString : function () {
+            var m = moment(this).utc();
+            if (0 < m.year() && m.year() <= 9999) {
+                return formatMoment(m, 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
+            } else {
+                return formatMoment(m, 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
+            }
+        },
+
+        toArray : function () {
+            var m = this;
+            return [
+                m.year(),
+                m.month(),
+                m.date(),
+                m.hours(),
+                m.minutes(),
+                m.seconds(),
+                m.milliseconds()
+            ];
+        },
+
+        isValid : function () {
+            return isValid(this);
+        },
+
+        isDSTShifted : function () {
+
+            if (this._a) {
+                return this.isValid() && compareArrays(this._a, (this._isUTC ? moment.utc(this._a) : moment(this._a)).toArray()) > 0;
+            }
+
+            return false;
+        },
+
+        parsingFlags : function () {
+            return extend({}, this._pf);
+        },
+
+        invalidAt: function () {
+            return this._pf.overflow;
+        },
+
+        utc : function () {
+            return this.zone(0);
+        },
+
+        local : function () {
+            this.zone(0);
+            this._isUTC = false;
+            return this;
+        },
+
+        format : function (inputString) {
+            var output = formatMoment(this, inputString || moment.defaultFormat);
+            return this.lang().postformat(output);
+        },
+
+        add : function (input, val) {
+            var dur;
+            // switch args to support add('s', 1) and add(1, 's')
+            if (typeof input === 'string') {
+                dur = moment.duration(+val, input);
+            } else {
+                dur = moment.duration(input, val);
+            }
+            addOrSubtractDurationFromMoment(this, dur, 1);
+            return this;
+        },
+
+        subtract : function (input, val) {
+            var dur;
+            // switch args to support subtract('s', 1) and subtract(1, 's')
+            if (typeof input === 'string') {
+                dur = moment.duration(+val, input);
+            } else {
+                dur = moment.duration(input, val);
+            }
+            addOrSubtractDurationFromMoment(this, dur, -1);
+            return this;
+        },
+
+        diff : function (input, units, asFloat) {
+            var that = makeAs(input, this),
+                zoneDiff = (this.zone() - that.zone()) * 6e4,
+                diff, output;
+
+            units = normalizeUnits(units);
+
+            if (units === 'year' || units === 'month') {
+                // average number of days in the months in the given dates
+                diff = (this.daysInMonth() + that.daysInMonth()) * 432e5; // 24 * 60 * 60 * 1000 / 2
+                // difference in months
+                output = ((this.year() - that.year()) * 12) + (this.month() - that.month());
+                // adjust by taking difference in days, average number of days
+                // and dst in the given months.
+                output += ((this - moment(this).startOf('month')) -
+                        (that - moment(that).startOf('month'))) / diff;
+                // same as above but with zones, to negate all dst
+                output -= ((this.zone() - moment(this).startOf('month').zone()) -
+                        (that.zone() - moment(that).startOf('month').zone())) * 6e4 / diff;
+                if (units === 'year') {
+                    output = output / 12;
+                }
+            } else {
+                diff = (this - that);
+                output = units === 'second' ? diff / 1e3 : // 1000
+                    units === 'minute' ? diff / 6e4 : // 1000 * 60
+                    units === 'hour' ? diff / 36e5 : // 1000 * 60 * 60
+                    units === 'day' ? (diff - zoneDiff) / 864e5 : // 1000 * 60 * 60 * 24, negate dst
+                    units === 'week' ? (diff - zoneDiff) / 6048e5 : // 1000 * 60 * 60 * 24 * 7, negate dst
+                    diff;
+            }
+            return asFloat ? output : absRound(output);
+        },
+
+        from : function (time, withoutSuffix) {
+            return moment.duration(this.diff(time)).lang(this.lang()._abbr).humanize(!withoutSuffix);
+        },
+
+        fromNow : function (withoutSuffix) {
+            return this.from(moment(), withoutSuffix);
+        },
+
+        calendar : function () {
+            // We want to compare the start of today, vs this.
+            // Getting start-of-today depends on whether we're zone'd or not.
+            var sod = makeAs(moment(), this).startOf('day'),
+                diff = this.diff(sod, 'days', true),
+                format = diff < -6 ? 'sameElse' :
+                    diff < -1 ? 'lastWeek' :
+                    diff < 0 ? 'lastDay' :
+                    diff < 1 ? 'sameDay' :
+                    diff < 2 ? 'nextDay' :
+                    diff < 7 ? 'nextWeek' : 'sameElse';
+            return this.format(this.lang().calendar(format, this));
+        },
+
+        isLeapYear : function () {
+            return isLeapYear(this.year());
+        },
+
+        isDST : function () {
+            return (this.zone() < this.clone().month(0).zone() ||
+                this.zone() < this.clone().month(5).zone());
+        },
+
+        day : function (input) {
+            var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
+            if (input != null) {
+                input = parseWeekday(input, this.lang());
+                return this.add({ d : input - day });
+            } else {
+                return day;
+            }
+        },
+
+        month : function (input) {
+            var utc = this._isUTC ? 'UTC' : '',
+                dayOfMonth;
+
+            if (input != null) {
+                if (typeof input === 'string') {
+                    input = this.lang().monthsParse(input);
+                    if (typeof input !== 'number') {
+                        return this;
+                    }
+                }
+
+                dayOfMonth = this.date();
+                this.date(1);
+                this._d['set' + utc + 'Month'](input);
+                this.date(Math.min(dayOfMonth, this.daysInMonth()));
+
+                moment.updateOffset(this);
+                return this;
+            } else {
+                return this._d['get' + utc + 'Month']();
+            }
+        },
+
+        startOf: function (units) {
+            units = normalizeUnits(units);
+            // the following switch intentionally omits break keywords
+            // to utilize falling through the cases.
+            switch (units) {
+            case 'year':
+                this.month(0);
+                /* falls through */
+            case 'month':
+                this.date(1);
+                /* falls through */
+            case 'week':
+            case 'isoWeek':
+            case 'day':
+                this.hours(0);
+                /* falls through */
+            case 'hour':
+                this.minutes(0);
+                /* falls through */
+            case 'minute':
+                this.seconds(0);
+                /* falls through */
+            case 'second':
+                this.milliseconds(0);
+                /* falls through */
+            }
+
+            // weeks are a special case
+            if (units === 'week') {
+                this.weekday(0);
+            } else if (units === 'isoWeek') {
+                this.isoWeekday(1);
+            }
+
+            return this;
+        },
+
+        endOf: function (units) {
+            units = normalizeUnits(units);
+            return this.startOf(units).add((units === 'isoWeek' ? 'week' : units), 1).subtract('ms', 1);
+        },
+
+        isAfter: function (input, units) {
+            units = typeof units !== 'undefined' ? units : 'millisecond';
+            return +this.clone().startOf(units) > +moment(input).startOf(units);
+        },
+
+        isBefore: function (input, units) {
+            units = typeof units !== 'undefined' ? units : 'millisecond';
+            return +this.clone().startOf(units) < +moment(input).startOf(units);
+        },
+
+        isSame: function (input, units) {
+            units = units || 'ms';
+            return +this.clone().startOf(units) === +makeAs(input, this).startOf(units);
+        },
+
+        min: function (other) {
+            other = moment.apply(null, arguments);
+            return other < this ? this : other;
+        },
+
+        max: function (other) {
+            other = moment.apply(null, arguments);
+            return other > this ? this : other;
+        },
+
+        zone : function (input) {
+            var offset = this._offset || 0;
+            if (input != null) {
+                if (typeof input === "string") {
+                    input = timezoneMinutesFromString(input);
+                }
+                if (Math.abs(input) < 16) {
+                    input = input * 60;
+                }
+                this._offset = input;
+                this._isUTC = true;
+                if (offset !== input) {
+                    addOrSubtractDurationFromMoment(this, moment.duration(offset - input, 'm'), 1, true);
+                }
+            } else {
+                return this._isUTC ? offset : this._d.getTimezoneOffset();
+            }
+            return this;
+        },
+
+        zoneAbbr : function () {
+            return this._isUTC ? "UTC" : "";
+        },
+
+        zoneName : function () {
+            return this._isUTC ? "Coordinated Universal Time" : "";
+        },
+
+        parseZone : function () {
+            if (this._tzm) {
+                this.zone(this._tzm);
+            } else if (typeof this._i === 'string') {
+                this.zone(this._i);
+            }
+            return this;
+        },
+
+        hasAlignedHourOffset : function (input) {
+            if (!input) {
+                input = 0;
+            }
+            else {
+                input = moment(input).zone();
+            }
+
+            return (this.zone() - input) % 60 === 0;
+        },
+
+        daysInMonth : function () {
+            return daysInMonth(this.year(), this.month());
+        },
+
+        dayOfYear : function (input) {
+            var dayOfYear = round((moment(this).startOf('day') - moment(this).startOf('year')) / 864e5) + 1;
+            return input == null ? dayOfYear : this.add("d", (input - dayOfYear));
+        },
+
+        quarter : function () {
+            return Math.ceil((this.month() + 1.0) / 3.0);
+        },
+
+        weekYear : function (input) {
+            var year = weekOfYear(this, this.lang()._week.dow, this.lang()._week.doy).year;
+            return input == null ? year : this.add("y", (input - year));
+        },
+
+        isoWeekYear : function (input) {
+            var year = weekOfYear(this, 1, 4).year;
+            return input == null ? year : this.add("y", (input - year));
+        },
+
+        week : function (input) {
+            var week = this.lang().week(this);
+            return input == null ? week : this.add("d", (input - week) * 7);
+        },
+
+        isoWeek : function (input) {
+            var week = weekOfYear(this, 1, 4).week;
+            return input == null ? week : this.add("d", (input - week) * 7);
+        },
+
+        weekday : function (input) {
+            var weekday = (this.day() + 7 - this.lang()._week.dow) % 7;
+            return input == null ? weekday : this.add("d", input - weekday);
+        },
+
+        isoWeekday : function (input) {
+            // behaves the same as moment#day except
+            // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
+            // as a setter, sunday should belong to the previous week.
+            return input == null ? this.day() || 7 : this.day(this.day() % 7 ? input : input - 7);
+        },
+
+        get : function (units) {
+            units = normalizeUnits(units);
+            return this[units]();
+        },
+
+        set : function (units, value) {
+            units = normalizeUnits(units);
+            if (typeof this[units] === 'function') {
+                this[units](value);
+            }
+            return this;
+        },
+
+        // If passed a language key, it will set the language for this
+        // instance.  Otherwise, it will return the language configuration
+        // variables for this instance.
+        lang : function (key) {
+            if (key === undefined) {
+                return this._lang;
+            } else {
+                this._lang = getLangDefinition(key);
+                return this;
+            }
+        }
+    });
+
+    // helper for adding shortcuts
+    function makeGetterAndSetter(name, key) {
+        moment.fn[name] = moment.fn[name + 's'] = function (input) {
+            var utc = this._isUTC ? 'UTC' : '';
+            if (input != null) {
+                this._d['set' + utc + key](input);
+                moment.updateOffset(this);
+                return this;
+            } else {
+                return this._d['get' + utc + key]();
+            }
+        };
+    }
+
+    // loop through and add shortcuts (Month, Date, Hours, Minutes, Seconds, Milliseconds)
+    for (i = 0; i < proxyGettersAndSetters.length; i ++) {
+        makeGetterAndSetter(proxyGettersAndSetters[i].toLowerCase().replace(/s$/, ''), proxyGettersAndSetters[i]);
+    }
+
+    // add shortcut for year (uses different syntax than the getter/setter 'year' == 'FullYear')
+    makeGetterAndSetter('year', 'FullYear');
+
+    // add plural methods
+    moment.fn.days = moment.fn.day;
+    moment.fn.months = moment.fn.month;
+    moment.fn.weeks = moment.fn.week;
+    moment.fn.isoWeeks = moment.fn.isoWeek;
+
+    // add aliased format methods
+    moment.fn.toJSON = moment.fn.toISOString;
+
+    /************************************
+        Duration Prototype
+    ************************************/
+
+
+    extend(moment.duration.fn = Duration.prototype, {
+
+        _bubble : function () {
+            var milliseconds = this._milliseconds,
+                days = this._days,
+                months = this._months,
+                data = this._data,
+                seconds, minutes, hours, years;
+
+            // The following code bubbles up values, see the tests for
+            // examples of what that means.
+            data.milliseconds = milliseconds % 1000;
+
+            seconds = absRound(milliseconds / 1000);
+            data.seconds = seconds % 60;
+
+            minutes = absRound(seconds / 60);
+            data.minutes = minutes % 60;
+
+            hours = absRound(minutes / 60);
+            data.hours = hours % 24;
+
+            days += absRound(hours / 24);
+            data.days = days % 30;
+
+            months += absRound(days / 30);
+            data.months = months % 12;
+
+            years = absRound(months / 12);
+            data.years = years;
+        },
+
+        weeks : function () {
+            return absRound(this.days() / 7);
+        },
+
+        valueOf : function () {
+            return this._milliseconds +
+              this._days * 864e5 +
+              (this._months % 12) * 2592e6 +
+              toInt(this._months / 12) * 31536e6;
+        },
+
+        humanize : function (withSuffix) {
+            var difference = +this,
+                output = relativeTime(difference, !withSuffix, this.lang());
+
+            if (withSuffix) {
+                output = this.lang().pastFuture(difference, output);
+            }
+
+            return this.lang().postformat(output);
+        },
+
+        add : function (input, val) {
+            // supports only 2.0-style add(1, 's') or add(moment)
+            var dur = moment.duration(input, val);
+
+            this._milliseconds += dur._milliseconds;
+            this._days += dur._days;
+            this._months += dur._months;
+
+            this._bubble();
+
+            return this;
+        },
+
+        subtract : function (input, val) {
+            var dur = moment.duration(input, val);
+
+            this._milliseconds -= dur._milliseconds;
+            this._days -= dur._days;
+            this._months -= dur._months;
+
+            this._bubble();
+
+            return this;
+        },
+
+        get : function (units) {
+            units = normalizeUnits(units);
+            return this[units.toLowerCase() + 's']();
+        },
+
+        as : function (units) {
+            units = normalizeUnits(units);
+            return this['as' + units.charAt(0).toUpperCase() + units.slice(1) + 's']();
+        },
+
+        lang : moment.fn.lang,
+
+        toIsoString : function () {
+            // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
+            var years = Math.abs(this.years()),
+                months = Math.abs(this.months()),
+                days = Math.abs(this.days()),
+                hours = Math.abs(this.hours()),
+                minutes = Math.abs(this.minutes()),
+                seconds = Math.abs(this.seconds() + this.milliseconds() / 1000);
+
+            if (!this.asSeconds()) {
+                // this is the same as C#'s (Noda) and python (isodate)...
+                // but not other JS (goog.date)
+                return 'P0D';
+            }
+
+            return (this.asSeconds() < 0 ? '-' : '') +
+                'P' +
+                (years ? years + 'Y' : '') +
+                (months ? months + 'M' : '') +
+                (days ? days + 'D' : '') +
+                ((hours || minutes || seconds) ? 'T' : '') +
+                (hours ? hours + 'H' : '') +
+                (minutes ? minutes + 'M' : '') +
+                (seconds ? seconds + 'S' : '');
+        }
+    });
+
+    function makeDurationGetter(name) {
+        moment.duration.fn[name] = function () {
+            return this._data[name];
+        };
+    }
+
+    function makeDurationAsGetter(name, factor) {
+        moment.duration.fn['as' + name] = function () {
+            return +this / factor;
+        };
+    }
+
+    for (i in unitMillisecondFactors) {
+        if (unitMillisecondFactors.hasOwnProperty(i)) {
+            makeDurationAsGetter(i, unitMillisecondFactors[i]);
+            makeDurationGetter(i.toLowerCase());
+        }
+    }
+
+    makeDurationAsGetter('Weeks', 6048e5);
+    moment.duration.fn.asMonths = function () {
+        return (+this - this.years() * 31536e6) / 2592e6 + this.years() * 12;
+    };
+
+
+    /************************************
+        Default Lang
+    ************************************/
+
+
+    // Set default language, other languages will inherit from English.
+    moment.lang('en', {
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (toInt(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
+
+    /* EMBED_LANGUAGES */
+
+    /************************************
+        Exposing Moment
+    ************************************/
+
+    function makeGlobal(deprecate) {
+        var warned = false, local_moment = moment;
+        /*global ender:false */
+        if (typeof ender !== 'undefined') {
+            return;
+        }
+        // here, `this` means `window` in the browser, or `global` on the server
+        // add `moment` as a global object via a string identifier,
+        // for Closure Compiler "advanced" mode
+        if (deprecate) {
+            global.moment = function () {
+                if (!warned && console && console.warn) {
+                    warned = true;
+                    console.warn(
+                            "Accessing Moment through the global scope is " +
+                            "deprecated, and will be removed in an upcoming " +
+                            "release.");
+                }
+                return local_moment.apply(null, arguments);
+            };
+            extend(global.moment, local_moment);
+        } else {
+            global['moment'] = moment;
+        }
+    }
+
+    // CommonJS module is defined
+    if (hasModule) {
+        module.exports = moment;
+        makeGlobal(true);
+    } else if (typeof define === "function" && define.amd) {
+        define("moment", function (require, exports, module) {
+            if (module.config && module.config() && module.config().noGlobal !== true) {
+                // If user provided noGlobal, he is aware of global
+                makeGlobal(module.config().noGlobal === undefined);
+            }
+
+            return moment;
+        });
+    } else {
+        makeGlobal();
+    }
+}).call(this);
+
+
+/*
+Version 3.0.0
+=========================================================
+bootstrap-datetimepicker.js
+https://github.com/Eonasdan/bootstrap-datetimepicker
+=========================================================
+The MIT License (MIT)
+
+Copyright (c) 2014 Jonathan Peterson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+; (function (factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD is used - Register as an anonymous module.
+        define(['jquery', 'moment'], factory);
+    } else {
+        // AMD is not used - Attempt to fetch dependencies from scope.
+        if (!jQuery) {
+            throw 'bootstrap-datetimepicker requires jQuery to be loaded first';
+        } else if (!moment) {
+            throw 'bootstrap-datetimepicker requires moment.js to be loaded first';
+        } else {
+            factory(jQuery, moment);
+        }
+    }
+}
+
+(function ($, moment) {
+    if (typeof moment === 'undefined') {
+        alert("momentjs is requried");
+        throw new Error('momentjs is required');
+    };
+
+    var dpgId = 0,
+
+    pMoment = moment,
+
+// ReSharper disable once InconsistentNaming
+    DateTimePicker = function (element, options) {
+        var defaults = $.fn.datetimepicker.defaults,
+
+  icons = {
+      time: 'fa fa-clock-o',
+      date: 'fa fa-calendar',
+      up: 'fa fa-chevron-up',
+      down: 'fa fa-chevron-down'
+  },
+
+        picker = this,
+
+        init = function () {
+
+            var icon = false, i, dDate, longDateFormat;
+            picker.options = $.extend({}, defaults, options);
+            picker.options.icons = $.extend({}, icons, picker.options.icons);
+
+            picker.element = $(element);
+
+            dataToOptions();
+
+            if (!(picker.options.pickTime || picker.options.pickDate))
+                throw new Error('Must choose at least one picker');
+
+            picker.id = dpgId++;
+            pMoment.lang(picker.options.language);
+            picker.date = pMoment();
+            picker.unset = false;
+            picker.isInput = picker.element.is('input');
+            picker.component = false;
+
+            if (picker.element.hasClass('input-group')) {
+                if (picker.element.find('.datepickerbutton').size() == 0) {//in case there is more then one 'input-group-addon' Issue #48
+                    picker.component = picker.element.find("[class^='input-group-']");
+                }
+                else {
+                    picker.component = picker.element.find('.datepickerbutton');
+                }
+            }
+            picker.format = picker.options.format;
+
+            longDateFormat = pMoment()._lang._longDateFormat;
+
+            if (!picker.format) {
+                picker.format = (picker.options.pickDate ? longDateFormat.L : '');
+                if (picker.options.pickDate && picker.options.pickTime) picker.format += ' ';
+                picker.format += (picker.options.pickTime ? longDateFormat.LT : '');
+                if (picker.options.useSeconds) {
+                    if (~longDateFormat.LT.indexOf(' A')) {
+                        picker.format = picker.format.split(" A")[0] + ":ss A";
+                    }
+                    else {
+                        picker.format += ':ss';
+                    }
+                }
+            }
+            picker.use24hours = picker.format.toLowerCase().indexOf("a") < 1;
+
+            if (picker.component) icon = picker.component.find('span');
+
+            if (picker.options.pickTime) {
+                if (icon) icon.addClass(picker.options.icons.time);
+            }
+            if (picker.options.pickDate) {
+                if (icon) {
+                    icon.removeClass(picker.options.icons.time);
+                    icon.addClass(picker.options.icons.date);
+                }
+            }
+
+            picker.widget = $(getTemplate()).appendTo('body');
+
+            if (picker.options.useSeconds && !picker.use24hours) {
+                picker.widget.width(300);
+            }
+
+            picker.minViewMode = picker.options.minViewMode || 0;
+            if (typeof picker.minViewMode === 'string') {
+                switch (picker.minViewMode) {
+                    case 'months':
+                        picker.minViewMode = 1;
+                        break;
+                    case 'years':
+                        picker.minViewMode = 2;
+                        break;
+                    default:
+                        picker.minViewMode = 0;
+                        break;
+                }
+            }
+            picker.viewMode = picker.options.viewMode || 0;
+            if (typeof picker.viewMode === 'string') {
+                switch (picker.viewMode) {
+                    case 'months':
+                        picker.viewMode = 1;
+                        break;
+                    case 'years':
+                        picker.viewMode = 2;
+                        break;
+                    default:
+                        picker.viewMode = 0;
+                        break;
+                }
+            }
+
+            picker.options.disabledDates = indexGivenDates(picker.options.disabledDates);
+            picker.options.enabledDates = indexGivenDates(picker.options.enabledDates);
+
+            picker.startViewMode = picker.viewMode;
+            picker.setMinDate(picker.options.minDate);
+            picker.setMaxDate(picker.options.maxDate);
+            fillDow();
+            fillMonths();
+            fillHours();
+            fillMinutes();
+            fillSeconds();
+            update();
+            showMode();
+            attachDatePickerEvents();
+            if (picker.options.defaultDate !== "" && getPickerInput().val() == "") picker.setValue(picker.options.defaultDate);
+            if (picker.options.minuteStepping !== 1) {
+                var rInterval = picker.options.minuteStepping;
+                picker.date.minutes((Math.round(picker.date.minutes() / rInterval) * rInterval) % 60).seconds(0);
+            }
+        },
+
+        getPickerInput = function () {
+            if (picker.isInput) {
+                return picker.element;
+            } else {
+                return dateStr = picker.element.find('input');
+            }
+        },
+
+        dataToOptions = function () {
+            var eData
+            if (picker.element.is('input')) {
+                eData = picker.element.data();
+            }
+            else {
+                eData = picker.element.data();
+            }
+            if (eData.dateFormat !== undefined) picker.options.format = eData.dateFormat;
+            if (eData.datePickdate !== undefined) picker.options.pickDate = eData.datePickdate;
+            if (eData.datePicktime !== undefined) picker.options.pickTime = eData.datePicktime;
+            if (eData.dateUseminutes !== undefined) picker.options.useMinutes = eData.dateUseminutes;
+            if (eData.dateUseseconds !== undefined) picker.options.useSeconds = eData.dateUseseconds;
+            if (eData.dateUsecurrent !== undefined) picker.options.useCurrent = eData.dateUsecurrent;
+            if (eData.dateMinutestepping !== undefined) picker.options.minuteStepping = eData.dateMinutestepping;
+            if (eData.dateMindate !== undefined) picker.options.minDate = eData.dateMindate;
+            if (eData.dateMaxdate !== undefined) picker.options.maxDate = eData.dateMaxdate;
+            if (eData.dateShowtoday !== undefined) picker.options.showToday = eData.dateShowtoday;
+            if (eData.dateCollapse !== undefined) picker.options.collapse = eData.dateCollapse;
+            if (eData.dateLanguage !== undefined) picker.options.language = eData.dateLanguage;
+            if (eData.dateDefaultdate !== undefined) picker.options.defaultDate = eData.dateDefaultdate;
+            if (eData.dateDisableddates !== undefined) picker.options.disabledDates = eData.dateDisableddates;
+            if (eData.dateEnableddates !== undefined) picker.options.enabledDates = eData.dateEnableddates;
+            if (eData.dateIcons !== undefined) picker.options.icons = eData.dateIcons;
+            if (eData.dateUsestrict !== undefined) picker.options.useStrict = eData.dateUsestrict;
+            if (eData.dateDirection !== undefined) picker.options.direction = eData.dateDirection;
+            if (eData.dateSidebyside !== undefined) picker.options.sideBySide = eData.dateSidebyside;
+        },
+
+        place = function () {
+            var position = 'absolute',
+            offset = picker.component ? picker.component.offset() : picker.element.offset(), $window = $(window);
+            picker.width = picker.component ? picker.component.outerWidth() : picker.element.outerWidth();
+            offset.top = offset.top + picker.element.outerHeight();
+
+            var placePosition;
+            if (picker.options.direction === 'up') {
+                placePosition = 'top'
+            } else if (picker.options.direction === 'bottom') {
+                placePosition = 'bottom'
+            } else if (picker.options.direction === 'auto') {
+                if (offset.top + picker.widget.height() > $window.height() + $window.scrollTop() && picker.widget.height() + picker.element.outerHeight() < offset.top) {
+                    placePosition = 'top';
+                } else {
+                    placePosition = 'bottom';
+                }
+            };
+            if (placePosition === 'top') {
+                offset.top -= picker.widget.height() + picker.element.outerHeight() + 15;
+                picker.widget.addClass('top').removeClass('bottom');
+            } else {
+                offset.top += 1;
+                picker.widget.addClass('bottom').removeClass('top');
+            }
+
+            if (picker.options.width !== undefined) {
+                picker.widget.width(picker.options.width);
+            }
+
+            if (picker.options.orientation === 'left') {
+                picker.widget.addClass('left-oriented');
+                offset.left = offset.left - picker.widget.width() + 20;
+            }
+
+            if (isInFixed()) {
+                position = 'fixed';
+                offset.top -= $window.scrollTop();
+                offset.left -= $window.scrollLeft();
+            }
+
+            if ($window.width() < offset.left + picker.widget.outerWidth()) {
+                offset.right = $window.width() - offset.left - picker.width;
+                offset.left = 'auto';
+                picker.widget.addClass('pull-right');
+            } else {
+                offset.right = 'auto';
+                picker.widget.removeClass('pull-right');
+            }
+
+            picker.widget.css({
+                position: position,
+                top: offset.top,
+                left: offset.left,
+                right: offset.right
+            });
+        },
+
+        notifyChange = function (oldDate, eventType) {
+            if (pMoment(picker.date).isSame(pMoment(oldDate))) return;
+            picker.element.trigger({
+                type: 'dp.change',
+                date: pMoment(picker.date),
+                oldDate: pMoment(oldDate)
+            });
+
+            if (eventType !== 'change')
+                picker.element.change();
+        },
+
+    notifyError = function (date) {
+        picker.element.trigger({
+            type: 'dp.error',
+            date: pMoment(date)
+        });
+    },
+
+        update = function (newDate) {
+            pMoment.lang(picker.options.language);
+            var dateStr = newDate;
+            if (!dateStr) {
+                dateStr = getPickerInput().val();
+                if (dateStr) picker.date = pMoment(dateStr, picker.format, picker.options.useStrict);
+                if (!picker.date) picker.date = pMoment();
+            }
+            picker.viewDate = pMoment(picker.date).startOf("month");
+            fillDate();
+            fillTime();
+        },
+
+    fillDow = function () {
+        pMoment.lang(picker.options.language);
+        var html = $('<tr>'), weekdaysMin = pMoment.weekdaysMin(), i;
+        if (pMoment()._lang._week.dow == 0) { // starts on Sunday
+            for (i = 0; i < 7; i++) {
+                html.append('<th class="dow">' + weekdaysMin[i] + '</th>');
+            }
+        } else {
+            for (i = 1; i < 8; i++) {
+                if (i == 7) {
+                    html.append('<th class="dow">' + weekdaysMin[0] + '</th>');
+                } else {
+                    html.append('<th class="dow">' + weekdaysMin[i] + '</th>');
+                }
+            }
+        }
+        picker.widget.find('.datepicker-days thead').append(html);
+    },
+
+        fillMonths = function () {
+            pMoment.lang(picker.options.language);
+            var html = '', i = 0, monthsShort = pMoment.monthsShort();
+            while (i < 12) {
+                html += '<span class="month">' + monthsShort[i++] + '</span>';
+            }
+            picker.widget.find('.datepicker-months td').append(html);
+        },
+
+        fillDate = function () {
+            if(!picker.options.pickDate) return;
+            pMoment.lang(picker.options.language);
+            var year = picker.viewDate.year(),
+                month = picker.viewDate.month(),
+                startYear = picker.options.minDate.year(),
+                startMonth = picker.options.minDate.month(),
+                endYear = picker.options.maxDate.year(),
+                endMonth = picker.options.maxDate.month(),
+                currentDate,
+                prevMonth, nextMonth, html = [], row, clsName, i, days, yearCont, currentYear, months = pMoment.months();
+
+            picker.widget.find('.datepicker-days').find('.disabled').removeClass('disabled');
+            picker.widget.find('.datepicker-months').find('.disabled').removeClass('disabled');
+            picker.widget.find('.datepicker-years').find('.disabled').removeClass('disabled');
+
+            picker.widget.find('.datepicker-days th:eq(1)').text(
+                months[month] + ' ' + year);
+
+            prevMonth = pMoment(picker.viewDate).subtract("months", 1);
+            days = prevMonth.daysInMonth();
+            prevMonth.date(days).startOf('week');
+            if ((year == startYear && month <= startMonth) || year < startYear) {
+                picker.widget.find('.datepicker-days th:eq(0)').addClass('disabled');
+            }
+            if ((year == endYear && month >= endMonth) || year > endYear) {
+                picker.widget.find('.datepicker-days th:eq(2)').addClass('disabled');
+            }
+
+            nextMonth = pMoment(prevMonth).add(42, "d");
+            while (prevMonth.isBefore(nextMonth)) {
+                if (prevMonth.weekday() === pMoment().startOf('week').weekday()) {
+                    row = $('<tr>');
+                    html.push(row);
+                }
+                clsName = '';
+                if (prevMonth.year() < year || (prevMonth.year() == year && prevMonth.month() < month)) {
+                    clsName += ' old';
+                } else if (prevMonth.year() > year || (prevMonth.year() == year && prevMonth.month() > month)) {
+                    clsName += ' new';
+                }
+                if (prevMonth.isSame(pMoment({ y: picker.date.year(), M: picker.date.month(), d: picker.date.date() }))) {
+                    clsName += ' active';
+                }
+                if (isInDisableDates(prevMonth) || !isInEnableDates(prevMonth)) {
+                    clsName += ' disabled';
+                }
+                if (picker.options.showToday === true) {
+                    if (prevMonth.isSame(pMoment(), 'day')) {
+                        clsName += ' today';
+                    }
+                }
+                if (picker.options.daysOfWeekDisabled) {
+                    for (i in picker.options.daysOfWeekDisabled) {
+                        if (prevMonth.day() == picker.options.daysOfWeekDisabled[i]) {
+                            clsName += ' disabled';
+                            break;
+                        }
+                    }
+                }
+                row.append('<td class="day' + clsName + '">' + prevMonth.date() + '</td>');
+
+                currentDate = prevMonth.date();
+                prevMonth.add(1, "d");
+
+                if (currentDate == prevMonth.date()) {
+                  prevMonth.add(1, "d");
+                }
+            }
+            picker.widget.find('.datepicker-days tbody').empty().append(html);
+            currentYear = picker.date.year(), months = picker.widget.find('.datepicker-months')
+        .find('th:eq(1)').text(year).end().find('span').removeClass('active');
+            if (currentYear === year) {
+                months.eq(picker.date.month()).addClass('active');
+            }
+            if (currentYear - 1 < startYear) {
+                picker.widget.find('.datepicker-months th:eq(0)').addClass('disabled');
+            }
+            if (currentYear + 1 > endYear) {
+                picker.widget.find('.datepicker-months th:eq(2)').addClass('disabled');
+            }
+            for (i = 0; i < 12; i++) {
+                if ((year == startYear && startMonth > i) || (year < startYear)) {
+                    $(months[i]).addClass('disabled');
+                } else if ((year == endYear && endMonth < i) || (year > endYear)) {
+                    $(months[i]).addClass('disabled');
+                }
+            }
+
+            html = '';
+            year = parseInt(year / 10, 10) * 10;
+            yearCont = picker.widget.find('.datepicker-years').find(
+                'th:eq(1)').text(year + '-' + (year + 9)).end().find('td');
+            picker.widget.find('.datepicker-years').find('th').removeClass('disabled');
+            if (startYear > year) {
+                picker.widget.find('.datepicker-years').find('th:eq(0)').addClass('disabled');
+            }
+            if (endYear < year + 9) {
+                picker.widget.find('.datepicker-years').find('th:eq(2)').addClass('disabled');
+            }
+            year -= 1;
+            for (i = -1; i < 11; i++) {
+                html += '<span class="year' + (i === -1 || i === 10 ? ' old' : '') + (currentYear === year ? ' active' : '') + ((year < startYear || year > endYear) ? ' disabled' : '') + '">' + year + '</span>';
+                year += 1;
+            }
+            yearCont.html(html);
+        },
+
+        fillHours = function () {
+            pMoment.lang(picker.options.language);
+            var table = picker.widget.find('.timepicker .timepicker-hours table'), html = '', current, i, j;
+            table.parent().hide();
+            if (picker.use24hours) {
+                current = 0;
+                for (i = 0; i < 6; i += 1) {
+                    html += '<tr>';
+                    for (j = 0; j < 4; j += 1) {
+                        html += '<td class="hour">' + padLeft(current.toString()) + '</td>';
+                        current++;
+                    }
+                    html += '</tr>';
+                }
+            }
+            else {
+                current = 1;
+                for (i = 0; i < 3; i += 1) {
+                    html += '<tr>';
+                    for (j = 0; j < 4; j += 1) {
+                        html += '<td class="hour">' + padLeft(current.toString()) + '</td>';
+                        current++;
+                    }
+                    html += '</tr>';
+                }
+            }
+            table.html(html);
+        },
+
+        fillMinutes = function () {
+            var table = picker.widget.find('.timepicker .timepicker-minutes table'), html = '', current = 0, i, j, step = picker.options.minuteStepping;
+            table.parent().hide();
+            if (step == 1) step = 5;
+            for (i = 0; i < Math.ceil(60 / step / 4) ; i++) {
+                html += '<tr>';
+                for (j = 0; j < 4; j += 1) {
+                    if (current < 60) {
+                        html += '<td class="minute">' + padLeft(current.toString()) + '</td>';
+                        current += step;
+                    } else {
+                        html += '<td></td>';
+                    }
+                }
+                html += '</tr>';
+            }
+            table.html(html);
+        },
+
+        fillSeconds = function () {
+            var table = picker.widget.find('.timepicker .timepicker-seconds table'), html = '', current = 0, i, j;
+            table.parent().hide();
+            for (i = 0; i < 3; i++) {
+                html += '<tr>';
+                for (j = 0; j < 4; j += 1) {
+                    html += '<td class="second">' + padLeft(current.toString()) + '</td>';
+                    current += 5;
+                }
+                html += '</tr>';
+            }
+            table.html(html);
+        },
+
+        fillTime = function () {
+            if (!picker.date) return;
+            var timeComponents = picker.widget.find('.timepicker span[data-time-component]'),
+            hour = picker.date.hours(),
+            period = 'AM';
+            if (!picker.use24hours) {
+                if (hour >= 12) period = 'PM';
+                if (hour === 0) hour = 12;
+                else if (hour != 12) hour = hour % 12;
+                picker.widget.find('.timepicker [data-action=togglePeriod]').text(period);
+            }
+            timeComponents.filter('[data-time-component=hours]').text(padLeft(hour));
+            timeComponents.filter('[data-time-component=minutes]').text(padLeft(picker.date.minutes()));
+            timeComponents.filter('[data-time-component=seconds]').text(padLeft(picker.date.second()));
+        },
+
+        click = function (e) {
+            e.stopPropagation();
+            e.preventDefault();
+            picker.unset = false;
+            var target = $(e.target).closest('span, td, th'), month, year, step, day, oldDate = pMoment(picker.date);
+            if (target.length === 1) {
+                if (!target.is('.disabled')) {
+                    switch (target[0].nodeName.toLowerCase()) {
+                        case 'th':
+                            switch (target[0].className) {
+                                case 'switch':
+                                    showMode(1);
+                                    break;
+                                case 'prev':
+                                case 'next':
+                                    step = dpGlobal.modes[picker.viewMode].navStep;
+                                    if (target[0].className === 'prev') step = step * -1;
+                                    picker.viewDate.add(step, dpGlobal.modes[picker.viewMode].navFnc);
+                                    fillDate();
+                                    break;
+                            }
+                            break;
+                        case 'span':
+                            if (target.is('.month')) {
+                                month = target.parent().find('span').index(target);
+                                picker.viewDate.month(month);
+                            } else {
+                                year = parseInt(target.text(), 10) || 0;
+                                picker.viewDate.year(year);
+                            }
+                            if (picker.viewMode === picker.minViewMode) {
+                                picker.date = pMoment({
+                                    y: picker.viewDate.year(),
+                                    M: picker.viewDate.month(),
+                                    d: picker.viewDate.date(),
+                                    h: picker.date.hours(),
+                                    m: picker.date.minutes(),
+                                    s: picker.date.seconds()
+                                });
+                                notifyChange(oldDate, e.type);
+                                set();
+                            }
+                            showMode(-1);
+                            fillDate();
+                            break;
+                        case 'td':
+                            if (target.is('.day')) {
+                                day = parseInt(target.text(), 10) || 1;
+                                month = picker.viewDate.month();
+                                year = picker.viewDate.year();
+                                if (target.is('.old')) {
+                                    if (month === 0) {
+                                        month = 11;
+                                        year -= 1;
+                                    } else {
+                                        month -= 1;
+                                    }
+                                } else if (target.is('.new')) {
+                                    if (month == 11) {
+                                        month = 0;
+                                        year += 1;
+                                    } else {
+                                        month += 1;
+                                    }
+                                }
+                                picker.date = pMoment({
+                                    y: year,
+                                    M: month,
+                                    d: day,
+                                    h: picker.date.hours(),
+                                    m: picker.date.minutes(),
+                                    s: picker.date.seconds()
+                                }
+                                );
+                                picker.viewDate = pMoment({
+                                    y: year, M: month, d: Math.min(28, day)
+                                });
+                                fillDate();
+                                set();
+                                notifyChange(oldDate, e.type);
+                            }
+                            break;
+                    }
+                }
+            }
+        },
+
+    actions = {
+        incrementHours: function () {
+            checkDate("add", "hours", 1);
+        },
+
+        incrementMinutes: function () {
+            checkDate("add", "minutes", picker.options.minuteStepping);
+        },
+
+        incrementSeconds: function () {
+            checkDate("add", "seconds", 1);
+        },
+
+        decrementHours: function () {
+            checkDate("subtract", "hours", 1);
+        },
+
+        decrementMinutes: function () {
+            checkDate("subtract", "minutes", picker.options.minuteStepping);
+        },
+
+        decrementSeconds: function () {
+            checkDate("subtract", "seconds", 1);
+        },
+
+        togglePeriod: function () {
+            var hour = picker.date.hours();
+            if (hour >= 12) hour -= 12;
+            else hour += 12;
+            picker.date.hours(hour);
+        },
+
+        showPicker: function () {
+            picker.widget.find('.timepicker > div:not(.timepicker-picker)').hide();
+            picker.widget.find('.timepicker .timepicker-picker').show();
+        },
+
+        showHours: function () {
+            picker.widget.find('.timepicker .timepicker-picker').hide();
+            picker.widget.find('.timepicker .timepicker-hours').show();
+        },
+
+        showMinutes: function () {
+            picker.widget.find('.timepicker .timepicker-picker').hide();
+            picker.widget.find('.timepicker .timepicker-minutes').show();
+        },
+
+        showSeconds: function () {
+            picker.widget.find('.timepicker .timepicker-picker').hide();
+            picker.widget.find('.timepicker .timepicker-seconds').show();
+        },
+
+        selectHour: function (e) {
+            var period = picker.widget.find('.timepicker [data-action=togglePeriod]').text(), hour = parseInt($(e.target).text(), 10);
+            if (period == "PM") hour += 12
+            picker.date.hours(hour);
+            actions.showPicker.call(picker);
+        },
+
+        selectMinute: function (e) {
+            picker.date.minutes(parseInt($(e.target).text(), 10));
+            actions.showPicker.call(picker);
+        },
+
+        selectSecond: function (e) {
+            picker.date.seconds(parseInt($(e.target).text(), 10));
+            actions.showPicker.call(picker);
+        }
+    },
+
+      doAction = function (e) {
+          var oldDate = pMoment(picker.date), action = $(e.currentTarget).data('action'), rv = actions[action].apply(picker, arguments);
+          stopEvent(e);
+          if (!picker.date) picker.date = pMoment({ y: 1970 });
+          set();
+          fillTime();
+          notifyChange(oldDate, e.type);
+          return rv;
+      },
+
+        stopEvent = function (e) {
+            e.stopPropagation();
+            e.preventDefault();
+        },
+
+        change = function (e) {
+            pMoment.lang(picker.options.language);
+            var input = $(e.target), oldDate = pMoment(picker.date), newDate = pMoment(input.val(), picker.format, picker.options.useStrict);
+            if (newDate.isValid() && !isInDisableDates(newDate) && isInEnableDates(newDate)) {
+                update();
+                picker.setValue(newDate);
+                notifyChange(oldDate, e.type);
+                set();
+            }
+            else {
+                picker.viewDate = oldDate;
+                notifyChange(oldDate, e.type);
+                notifyError(newDate);
+                picker.unset = true;
+            }
+        },
+
+        showMode = function (dir) {
+            if (dir) {
+                picker.viewMode = Math.max(picker.minViewMode, Math.min(2, picker.viewMode + dir));
+            }
+            var f = dpGlobal.modes[picker.viewMode].clsName;
+            picker.widget.find('.datepicker > div').hide().filter('.datepicker-' + dpGlobal.modes[picker.viewMode].clsName).show();
+        },
+
+        attachDatePickerEvents = function () {
+            var $this, $parent, expanded, closed, collapseData;
+            picker.widget.on('click', '.datepicker *', $.proxy(click, this)); // this handles date picker clicks
+            picker.widget.on('click', '[data-action]', $.proxy(doAction, this)); // this handles time picker clicks
+            picker.widget.on('mousedown', $.proxy(stopEvent, this));
+            if (picker.options.pickDate && picker.options.pickTime) {
+                picker.widget.on('click.togglePicker', '.accordion-toggle', function (e) {
+                    e.stopPropagation();
+                    $this = $(this);
+                    $parent = $this.closest('ul');
+                    expanded = $parent.find('.in');
+                    closed = $parent.find('.collapse:not(.in)');
+
+                    if (expanded && expanded.length) {
+                        collapseData = expanded.data('collapse');
+                        if (collapseData && collapseData.date - transitioning) return;
+                        expanded.collapse('hide');
+                        closed.collapse('show');
+                        $this.find('span').toggleClass(picker.options.icons.time + ' ' + picker.options.icons.date);
+                        picker.element.find('.input-group-addon span').toggleClass(picker.options.icons.time + ' ' + picker.options.icons.date);
+                    }
+                });
+            }
+            if (picker.isInput) {
+                picker.element.on({
+                    'focus': $.proxy(picker.show, this),
+                    'change': $.proxy(change, this),
+                    'blur': $.proxy(picker.hide, this)
+                });
+            } else {
+                picker.element.on({
+                    'change': $.proxy(change, this)
+                }, 'input');
+                if (picker.component) {
+                    picker.component.on('click', $.proxy(picker.show, this));
+                } else {
+                    picker.element.on('click', $.proxy(picker.show, this));
+                }
+            }
+        },
+
+        attachDatePickerGlobalEvents = function () {
+            $(window).on(
+                'resize.datetimepicker' + picker.id, $.proxy(place, this));
+            if (!picker.isInput) {
+                $(document).on(
+                    'mousedown.datetimepicker' + picker.id, $.proxy(picker.hide, this));
+            }
+        },
+
+        detachDatePickerEvents = function () {
+            picker.widget.off('click', '.datepicker *', picker.click);
+            picker.widget.off('click', '[data-action]');
+            picker.widget.off('mousedown', picker.stopEvent);
+            if (picker.options.pickDate && picker.options.pickTime) {
+                picker.widget.off('click.togglePicker');
+            }
+            if (picker.isInput) {
+                picker.element.off({
+                    'focus': picker.show,
+                    'change': picker.change
+                });
+            } else {
+                picker.element.off({
+                    'change': picker.change
+                }, 'input');
+                if (picker.component) {
+                    picker.component.off('click', picker.show);
+                } else {
+                    picker.element.off('click', picker.show);
+                }
+            }
+        },
+
+        detachDatePickerGlobalEvents = function () {
+            $(window).off('resize.datetimepicker' + picker.id);
+            if (!picker.isInput) {
+                $(document).off('mousedown.datetimepicker' + picker.id);
+            }
+        },
+
+        isInFixed = function () {
+            if (picker.element) {
+                var parents = picker.element.parents(), inFixed = false, i;
+                for (i = 0; i < parents.length; i++) {
+                    if ($(parents[i]).css('position') == 'fixed') {
+                        inFixed = true;
+                        break;
+                    }
+                }
+                ;
+                return inFixed;
+            } else {
+                return false;
+            }
+        },
+
+        set = function () {
+            pMoment.lang(picker.options.language);
+            var formatted = '', input;
+            if (!picker.unset) formatted = pMoment(picker.date).format(picker.format);
+            getPickerInput().val(formatted);
+            picker.element.data('date', formatted);
+            if (!picker.options.pickTime) picker.hide();
+        },
+
+    checkDate = function (direction, unit, amount) {
+        pMoment.lang(picker.options.language);
+        var newDate;
+        if (direction == "add") {
+            newDate = pMoment(picker.date);
+            if (newDate.hours() == 23) newDate.add(amount, unit);
+            newDate.add(amount, unit);
+        }
+        else {
+            newDate = pMoment(picker.date).subtract(amount, unit);
+        }
+        if (isInDisableDates(pMoment(newDate.subtract(amount, unit))) || isInDisableDates(newDate)) {
+            notifyError(newDate.format(picker.format));
+            return;
+        }
+
+        if (direction == "add") {
+            picker.date.add(amount, unit);
+        }
+        else {
+            picker.date.subtract(amount, unit);
+        }
+        picker.unset = false;
+    },
+
+        isInDisableDates = function (date) {
+            pMoment.lang(picker.options.language);
+            if (date.isAfter(picker.options.maxDate) || date.isBefore(picker.options.minDate)) return true;
+            if (picker.options.disabledDates === false) {
+                return false;
+            }
+            return picker.options.disabledDates[pMoment(date).format("YYYY-MM-DD")] === true;
+        },
+        isInEnableDates = function (date) {
+            pMoment.lang(picker.options.language);
+            if (picker.options.enabledDates === false) {
+                return true;
+            }
+            return picker.options.enabledDates[pMoment(date).format("YYYY-MM-DD")] === true;
+        },
+
+        indexGivenDates = function (givenDatesArray) {
+            // Store given enabledDates and disabledDates as keys.
+            // This way we can check their existence in O(1) time instead of looping through whole array.
+            // (for example: picker.options.enabledDates['2014-02-27'] === true)
+            var givenDatesIndexed = {};
+            var givenDatesCount = 0;
+            for (i = 0; i < givenDatesArray.length; i++) {
+                dDate = pMoment(givenDatesArray[i]);
+                if (dDate.isValid()) {
+                    givenDatesIndexed[dDate.format("YYYY-MM-DD")] = true;
+                    givenDatesCount++;
+                }
+            }
+            if (givenDatesCount > 0) {
+                return givenDatesIndexed;
+            }
+            return false;
+        },
+
+        padLeft = function (string) {
+            string = string.toString();
+            if (string.length >= 2) return string;
+            else return '0' + string;
+        },
+
+        getTemplate = function () {
+            if (picker.options.pickDate && picker.options.pickTime) {
+                var ret = '';
+                ret = '<div class="bootstrap-datetimepicker-widget' + (picker.options.sideBySide ? ' timepicker-sbs' : '') + ' dropdown-menu" style="z-index:9999 !important;">';
+                if (picker.options.sideBySide) {
+                    ret += '<div class="row">' +
+                       '<div class="col-sm-6 datepicker">' + dpGlobal.template + '</div>' +
+                       '<div class="col-sm-6 timepicker">' + tpGlobal.getTemplate() + '</div>' +
+                     '</div>';
+                } else {
+                    ret += '<ul class="list-unstyled">' +
+                        '<li' + (picker.options.collapse ? ' class="collapse in"' : '') + '>' +
+                            '<div class="datepicker">' + dpGlobal.template + '</div>' +
+                        '</li>' +
+                        '<li class="picker-switch accordion-toggle"><a class="btn" style="width:100%"><span class="' + picker.options.icons.time + '"></span></a></li>' +
+                        '<li' + (picker.options.collapse ? ' class="collapse"' : '') + '>' +
+                            '<div class="timepicker">' + tpGlobal.getTemplate() + '</div>' +
+                        '</li>' +
+                   '</ul>';
+                }
+                ret += '</div>';
+                return ret;
+            } else if (picker.options.pickTime) {
+                return (
+                    '<div class="bootstrap-datetimepicker-widget dropdown-menu">' +
+                        '<div class="timepicker">' + tpGlobal.getTemplate() + '</div>' +
+                    '</div>'
+                );
+            } else {
+                return (
+                    '<div class="bootstrap-datetimepicker-widget dropdown-menu">' +
+                        '<div class="datepicker">' + dpGlobal.template + '</div>' +
+                    '</div>'
+                );
+            }
+        },
+
+    dpGlobal = {
+        modes: [
+                {
+                    clsName: 'days',
+                    navFnc: 'month',
+                    navStep: 1
+                },
+                {
+                    clsName: 'months',
+                    navFnc: 'year',
+                    navStep: 1
+                },
+                {
+                    clsName: 'years',
+                    navFnc: 'year',
+                    navStep: 10
+                }],
+        headTemplate:
+                    '<thead>' +
+            '<tr>' +
+              '<th class="prev">&lsaquo;</th><th colspan="5" class="switch"></th><th class="next">&rsaquo;</th>' +
+            '</tr>' +
+                    '</thead>',
+        contTemplate:
+        '<tbody><tr><td colspan="7"></td></tr></tbody>'
+    },
+
+        tpGlobal = {
+            hourTemplate: '<span data-action="showHours"   data-time-component="hours"   class="timepicker-hour"></span>',
+            minuteTemplate: '<span data-action="showMinutes" data-time-component="minutes" class="timepicker-minute"></span>',
+            secondTemplate: '<span data-action="showSeconds"  data-time-component="seconds" class="timepicker-second"></span>'
+        };
+
+        dpGlobal.template =
+            '<div class="datepicker-days">' +
+                '<table class="table-condensed">' + dpGlobal.headTemplate + '<tbody></tbody></table>' +
+            '</div>' +
+            '<div class="datepicker-months">' +
+                '<table class="table-condensed">' + dpGlobal.headTemplate + dpGlobal.contTemplate + '</table>' +
+            '</div>' +
+            '<div class="datepicker-years">' +
+        '<table class="table-condensed">' + dpGlobal.headTemplate + dpGlobal.contTemplate + '</table>' +
+            '</div>';
+
+        tpGlobal.getTemplate = function () {
+            return (
+                '<div class="timepicker-picker">' +
+                    '<table class="table-condensed">' +
+            '<tr>' +
+              '<td><a href="#" class="btn" data-action="incrementHours"><span class="' + picker.options.icons.up + '"></span></a></td>' +
+              '<td class="separator"></td>' +
+              '<td>' + (picker.options.useMinutes ? '<a href="#" class="btn" data-action="incrementMinutes"><span class="' + picker.options.icons.up + '"></span></a>' : '') + '</td>' +
+                            (picker.options.useSeconds ?
+                                '<td class="separator"></td><td><a href="#" class="btn" data-action="incrementSeconds"><span class="' + picker.options.icons.up + '"></span></a></td>' : '') +
+              (picker.use24hours ? '' : '<td class="separator"></td>') +
+            '</tr>' +
+            '<tr>' +
+              '<td>' + tpGlobal.hourTemplate + '</td> ' +
+              '<td class="separator">:</td>' +
+              '<td>' + (picker.options.useMinutes ? tpGlobal.minuteTemplate : '<span class="timepicker-minute">00</span>') + '</td> ' +
+                            (picker.options.useSeconds ?
+                                '<td class="separator">:</td><td>' + tpGlobal.secondTemplate + '</td>' : '') +
+              (picker.use24hours ? '' : '<td class="separator"></td>' +
+              '<td><button type="button" class="btn btn-primary" data-action="togglePeriod"></button></td>') +
+            '</tr>' +
+            '<tr>' +
+              '<td><a href="#" class="btn" data-action="decrementHours"><span class="' + picker.options.icons.down + '"></span></a></td>' +
+              '<td class="separator"></td>' +
+              '<td>' + (picker.options.useMinutes ? '<a href="#" class="btn" data-action="decrementMinutes"><span class="' + picker.options.icons.down + '"></span></a>' : '') + '</td>' +
+                            (picker.options.useSeconds ?
+                                '<td class="separator"></td><td><a href="#" class="btn" data-action="decrementSeconds"><span class="' + picker.options.icons.down + '"></span></a></td>' : '') +
+              (picker.use24hours ? '' : '<td class="separator"></td>') +
+            '</tr>' +
+                    '</table>' +
+                '</div>' +
+                '<div class="timepicker-hours" data-action="selectHour">' +
+                    '<table class="table-condensed"></table>' +
+                '</div>' +
+                '<div class="timepicker-minutes" data-action="selectMinute">' +
+                    '<table class="table-condensed"></table>' +
+                '</div>' +
+                (picker.options.useSeconds ?
+                    '<div class="timepicker-seconds" data-action="selectSecond"><table class="table-condensed"></table></div>' : '')
+            );
+        };
+
+        picker.destroy = function () {
+            detachDatePickerEvents();
+            detachDatePickerGlobalEvents();
+            picker.widget.remove();
+            picker.element.removeData('DateTimePicker');
+            if (picker.component)
+                picker.component.removeData('DateTimePicker');
+        };
+
+        picker.show = function (e) {
+            if (picker.options.useCurrent) {
+                if (getPickerInput().val() == '') {
+                    if (picker.options.minuteStepping !== 1) {
+                        var mDate = pMoment(),
+                        rInterval = picker.options.minuteStepping;
+                        mDate.minutes((Math.round(mDate.minutes() / rInterval) * rInterval) % 60)
+                            .seconds(0);
+                        picker.setValue(mDate.format(picker.format))
+                    } else {
+                        picker.setValue(pMoment().format(picker.format))
+                    }
+                };
+            }
+            if (picker.widget.hasClass("picker-open")) {
+              picker.widget.hide();
+              picker.widget.removeClass("picker-open");
+            }
+            else {
+              picker.widget.show();
+              picker.widget.addClass("picker-open");
+            }
+            picker.height = picker.component ? picker.component.outerHeight() : picker.element.outerHeight();
+            place();
+            picker.element.trigger({
+                type: 'dp.show',
+                date: pMoment(picker.date)
+            });
+            attachDatePickerGlobalEvents();
+            if (e) {
+                stopEvent(e);
+            }
+        },
+
+        picker.disable = function () {
+            var input = picker.element.find('input');
+            if (input.prop('disabled')) return;
+
+            input.prop('disabled', true);
+            detachDatePickerEvents();
+        },
+
+        picker.enable = function () {
+            var input = picker.element.find('input');
+            if (!input.prop('disabled')) return;
+
+            input.prop('disabled', false);
+            attachDatePickerEvents();
+        },
+
+        picker.hide = function (event) {
+            if (event && $(event.target).is(picker.element.attr("id")))
+                return;
+            // Ignore event if in the middle of a picker transition
+            var collapse = picker.widget.find('.collapse'), i, collapseData;
+            for (i = 0; i < collapse.length; i++) {
+                collapseData = collapse.eq(i).data('collapse');
+                if (collapseData && collapseData.date - transitioning)
+                    return;
+            }
+            picker.widget.hide();
+            picker.widget.removeClass("picker-open");
+            picker.viewMode = picker.startViewMode;
+            showMode();
+            picker.element.trigger({
+                type: 'dp.hide',
+                date: pMoment(picker.date)
+            });
+            detachDatePickerGlobalEvents();
+        },
+
+        picker.setValue = function (newDate) {
+            pMoment.lang(picker.options.language);
+            if (!newDate) {
+                picker.unset = true;
+                set();
+            } else {
+                picker.unset = false;
+            }
+            if (!pMoment.isMoment(newDate)) newDate = pMoment(newDate, picker.format);
+            if (newDate.isValid()) {
+                picker.date = newDate;
+                set();
+                picker.viewDate = pMoment({ y: picker.date.year(), M: picker.date.month() });
+                fillDate();
+                fillTime();
+            }
+            else {
+                notifyError(newDate);
+            }
+        },
+
+        picker.getDate = function () {
+            if (picker.unset) return null;
+            return picker.date;
+        },
+
+        picker.setDate = function (date) {
+            var oldDate = pMoment(picker.date);
+            if (!date) {
+                picker.setValue(null);
+            } else {
+                picker.setValue(date);
+            }
+            notifyChange(oldDate, "function");
+        },
+
+        picker.setDisabledDates = function (dates) {
+            picker.options.disabledDates = indexGivenDates(dates);
+            if (picker.viewDate) update();
+        },
+        picker.setEnabledDates = function (dates) {
+            picker.options.enabledDates = indexGivenDates(dates);
+            if (picker.viewDate) update();
+        },
+
+        picker.setMaxDate = function (date) {
+            if (date == undefined) return;
+            picker.options.maxDate = pMoment(date);
+            if (picker.viewDate) update();
+        },
+
+        picker.setMinDate = function (date) {
+            if (date == undefined) return;
+            picker.options.minDate = pMoment(date);
+            if (picker.viewDate) update();
+        };
+
+        init();
+    };
+
+    $.fn.datetimepicker = function (options) {
+        return this.each(function () {
+            var $this = $(this), data = $this.data('DateTimePicker');
+            if (!data) $this.data('DateTimePicker', new DateTimePicker(this, options));
+        });
+    };
+    
+    $.fn.datetimepicker.defaults = {
+        pickDate: true,
+        pickTime: true,
+        useMinutes: true,
+        useSeconds: false,
+        useCurrent: true,
+        minuteStepping: 1,
+        minDate: new pMoment({ y: 1900 }),
+        maxDate: new pMoment().add(100, "y"),
+        showToday: true,
+        collapse: true,
+        language: "en",
+        defaultDate: "",
+        disabledDates: false,
+        enabledDates: false,
+        icons: {},
+        useStrict: false,
+        direction: "auto",
+        sideBySide: false,
+        daysOfWeekDisabled: false
+    };
+
+}));
+
+
+
+
+
+// moment.js language configuration
+// language : french (fr)
+// author : John Fischer : https://github.com/jfroffice
+
+(function (factory) {
+    if (typeof define === 'function' && define.amd) {
+        define(['moment'], factory); // AMD
+    } else if (typeof exports === 'object') {
+        module.exports = factory(require('../moment')); // Node
+    } else {
+        factory(window.moment); // Browser global
+    }
+}(function (moment) {
+    return moment.lang('fr', {
+        months : "janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),
+        monthsShort : "janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),
+        weekdays : "dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),
+        weekdaysShort : "dim._lun._mar._mer._jeu._ven._sam.".split("_"),
+        weekdaysMin : "Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),
+        longDateFormat : {
+            LT : "HH:mm",
+            L : "DD/MM/YYYY",
+            LL : "D MMMM YYYY",
+            LLL : "D MMMM YYYY LT",
+            LLLL : "dddd D MMMM YYYY LT"
+        },
+        calendar : {
+            sameDay: "[Aujourd'hui à] LT",
+            nextDay: '[Demain à] LT',
+            nextWeek: 'dddd [à] LT',
+            lastDay: '[Hier à] LT',
+            lastWeek: 'dddd [dernier à] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : "dans %s",
+            past : "il y a %s",
+            s : "quelques secondes",
+            m : "une minute",
+            mm : "%d minutes",
+            h : "une heure",
+            hh : "%d heures",
+            d : "un jour",
+            dd : "%d jours",
+            M : "un mois",
+            MM : "%d mois",
+            y : "un an",
+            yy : "%d ans"
+        },
+        ordinal : function (number) {
+            return number + (number === 1 ? 'er' : '');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+}));
+
+
diff --git a/app/assets/javascripts/bootstrap/dropdown.js b/app/assets/javascripts/bootstrap/dropdown.js
new file mode 100644
index 0000000..43d7ae3
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/dropdown.js
@@ -0,0 +1,147 @@
+/* ========================================================================
+ * Bootstrap: dropdown.js v3.1.1
+ * http://getbootstrap.com/javascript/#dropdowns
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // DROPDOWN CLASS DEFINITION
+  // =========================
+
+  var backdrop = '.dropdown-backdrop'
+  var toggle   = '[data-toggle=dropdown]'
+  var Dropdown = function (element) {
+    $(element).on('click.bs.dropdown', this.toggle)
+  }
+
+  Dropdown.prototype.toggle = function (e) {
+    var $this = $(this)
+
+    if ($this.is('.disabled, :disabled')) return
+
+    var $parent  = getParent($this)
+    var isActive = $parent.hasClass('open')
+
+    clearMenus()
+
+    if (!isActive) {
+      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
+        // if mobile we use a backdrop because click events don't delegate
+        $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
+      }
+
+      var relatedTarget = { relatedTarget: this }
+      $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
+
+      if (e.isDefaultPrevented()) return
+
+      $parent
+        .toggleClass('open')
+        .trigger('shown.bs.dropdown', relatedTarget)
+
+      $this.focus()
+    }
+
+    return false
+  }
+
+  Dropdown.prototype.keydown = function (e) {
+    if (!/(38|40|27)/.test(e.keyCode)) return
+
+    var $this = $(this)
+
+    e.preventDefault()
+    e.stopPropagation()
+
+    if ($this.is('.disabled, :disabled')) return
+
+    var $parent  = getParent($this)
+    var isActive = $parent.hasClass('open')
+
+    if (!isActive || (isActive && e.keyCode == 27)) {
+      if (e.which == 27) $parent.find(toggle).focus()
+      return $this.click()
+    }
+
+    var desc = ' li:not(.divider):visible a'
+    var $items = $parent.find('[role=menu]' + desc + ', [role=listbox]' + desc)
+
+    if (!$items.length) return
+
+    var index = $items.index($items.filter(':focus'))
+
+    if (e.keyCode == 38 && index > 0)                 index--                        // up
+    if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
+    if (!~index)                                      index = 0
+
+    $items.eq(index).focus()
+  }
+
+  function clearMenus(e) {
+    $(backdrop).remove()
+    $(toggle).each(function () {
+      var $parent = getParent($(this))
+      var relatedTarget = { relatedTarget: this }
+      if (!$parent.hasClass('open')) return
+      $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
+      if (e.isDefaultPrevented()) return
+      $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
+    })
+  }
+
+  function getParent($this) {
+    var selector = $this.attr('data-target')
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    var $parent = selector && $(selector)
+
+    return $parent && $parent.length ? $parent : $this.parent()
+  }
+
+
+  // DROPDOWN PLUGIN DEFINITION
+  // ==========================
+
+  var old = $.fn.dropdown
+
+  $.fn.dropdown = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+      var data  = $this.data('bs.dropdown')
+
+      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.dropdown.Constructor = Dropdown
+
+
+  // DROPDOWN NO CONFLICT
+  // ====================
+
+  $.fn.dropdown.noConflict = function () {
+    $.fn.dropdown = old
+    return this
+  }
+
+
+  // APPLY TO STANDARD DROPDOWN ELEMENTS
+  // ===================================
+
+  $(document)
+    .on('click.bs.dropdown.data-api', clearMenus)
+    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown)
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/modal.js b/app/assets/javascripts/bootstrap/modal.js
new file mode 100644
index 0000000..20ff270
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/modal.js
@@ -0,0 +1,243 @@
+/* ========================================================================
+ * Bootstrap: modal.js v3.1.1
+ * http://getbootstrap.com/javascript/#modals
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // MODAL CLASS DEFINITION
+  // ======================
+
+  var Modal = function (element, options) {
+    this.options   = options
+    this.$element  = $(element)
+    this.$backdrop =
+    this.isShown   = null
+
+    if (this.options.remote) {
+      this.$element
+        .find('.modal-content')
+        .load(this.options.remote, $.proxy(function () {
+          this.$element.trigger('loaded.bs.modal')
+        }, this))
+    }
+  }
+
+  Modal.DEFAULTS = {
+    backdrop: true,
+    keyboard: true,
+    show: true
+  }
+
+  Modal.prototype.toggle = function (_relatedTarget) {
+    return this[!this.isShown ? 'show' : 'hide'](_relatedTarget)
+  }
+
+  Modal.prototype.show = function (_relatedTarget) {
+    var that = this
+    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
+
+    this.$element.trigger(e)
+
+    if (this.isShown || e.isDefaultPrevented()) return
+
+    this.isShown = true
+
+    this.escape()
+
+    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
+
+    this.backdrop(function () {
+      var transition = $.support.transition && that.$element.hasClass('fade')
+
+      if (!that.$element.parent().length) {
+        that.$element.appendTo(document.body) // don't move modals dom position
+      }
+
+      that.$element
+        .show()
+        .scrollTop(0)
+
+      if (transition) {
+        that.$element[0].offsetWidth // force reflow
+      }
+
+      that.$element
+        .addClass('in')
+        .attr('aria-hidden', false)
+
+      that.enforceFocus()
+
+      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
+
+      transition ?
+        that.$element.find('.modal-dialog') // wait for modal to slide in
+          .one($.support.transition.end, function () {
+            that.$element.focus().trigger(e)
+          })
+          .emulateTransitionEnd(300) :
+        that.$element.focus().trigger(e)
+    })
+  }
+
+  Modal.prototype.hide = function (e) {
+    if (e) e.preventDefault()
+
+    e = $.Event('hide.bs.modal')
+
+    this.$element.trigger(e)
+
+    if (!this.isShown || e.isDefaultPrevented()) return
+
+    this.isShown = false
+
+    this.escape()
+
+    $(document).off('focusin.bs.modal')
+
+    this.$element
+      .removeClass('in')
+      .attr('aria-hidden', true)
+      .off('click.dismiss.bs.modal')
+
+    $.support.transition && this.$element.hasClass('fade') ?
+      this.$element
+        .one($.support.transition.end, $.proxy(this.hideModal, this))
+        .emulateTransitionEnd(300) :
+      this.hideModal()
+  }
+
+  Modal.prototype.enforceFocus = function () {
+    $(document)
+      .off('focusin.bs.modal') // guard against infinite focus loop
+      .on('focusin.bs.modal', $.proxy(function (e) {
+        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
+          this.$element.focus()
+        }
+      }, this))
+  }
+
+  Modal.prototype.escape = function () {
+    if (this.isShown && this.options.keyboard) {
+      this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
+        e.which == 27 && this.hide()
+      }, this))
+    } else if (!this.isShown) {
+      this.$element.off('keyup.dismiss.bs.modal')
+    }
+  }
+
+  Modal.prototype.hideModal = function () {
+    var that = this
+    this.$element.hide()
+    this.backdrop(function () {
+      that.removeBackdrop()
+      that.$element.trigger('hidden.bs.modal')
+    })
+  }
+
+  Modal.prototype.removeBackdrop = function () {
+    this.$backdrop && this.$backdrop.remove()
+    this.$backdrop = null
+  }
+
+  Modal.prototype.backdrop = function (callback) {
+    var animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+    if (this.isShown && this.options.backdrop) {
+      var doAnimate = $.support.transition && animate
+
+      this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+        .appendTo(document.body)
+
+      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
+        if (e.target !== e.currentTarget) return
+        this.options.backdrop == 'static'
+          ? this.$element[0].focus.call(this.$element[0])
+          : this.hide.call(this)
+      }, this))
+
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+      this.$backdrop.addClass('in')
+
+      if (!callback) return
+
+      doAnimate ?
+        this.$backdrop
+          .one($.support.transition.end, callback)
+          .emulateTransitionEnd(150) :
+        callback()
+
+    } else if (!this.isShown && this.$backdrop) {
+      this.$backdrop.removeClass('in')
+
+      $.support.transition && this.$element.hasClass('fade') ?
+        this.$backdrop
+          .one($.support.transition.end, callback)
+          .emulateTransitionEnd(150) :
+        callback()
+
+    } else if (callback) {
+      callback()
+    }
+  }
+
+
+  // MODAL PLUGIN DEFINITION
+  // =======================
+
+  var old = $.fn.modal
+
+  $.fn.modal = function (option, _relatedTarget) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.modal')
+      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
+
+      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option](_relatedTarget)
+      else if (options.show) data.show(_relatedTarget)
+    })
+  }
+
+  $.fn.modal.Constructor = Modal
+
+
+  // MODAL NO CONFLICT
+  // =================
+
+  $.fn.modal.noConflict = function () {
+    $.fn.modal = old
+    return this
+  }
+
+
+  // MODAL DATA-API
+  // ==============
+
+  $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
+    var $this   = $(this)
+    var href    = $this.attr('href')
+    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
+    var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
+
+    if ($this.is('a')) e.preventDefault()
+
+    $target
+      .modal(option, this)
+      .one('hide', function () {
+        $this.is(':visible') && $this.focus()
+      })
+  })
+
+  $(document)
+    .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
+    .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/popover.js b/app/assets/javascripts/bootstrap/popover.js
new file mode 100644
index 0000000..23aa829
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/popover.js
@@ -0,0 +1,110 @@
+/* ========================================================================
+ * Bootstrap: popover.js v3.1.1
+ * http://getbootstrap.com/javascript/#popovers
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // POPOVER PUBLIC CLASS DEFINITION
+  // ===============================
+
+  var Popover = function (element, options) {
+    this.init('popover', element, options)
+  }
+
+  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
+
+  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
+    placement: 'right',
+    trigger: 'click',
+    content: '',
+    template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+  })
+
+
+  // NOTE: POPOVER EXTENDS tooltip.js
+  // ================================
+
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
+
+  Popover.prototype.constructor = Popover
+
+  Popover.prototype.getDefaults = function () {
+    return Popover.DEFAULTS
+  }
+
+  Popover.prototype.setContent = function () {
+    var $tip    = this.tip()
+    var title   = this.getTitle()
+    var content = this.getContent()
+
+    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+    $tip.find('.popover-content')[ // we use append for html objects to maintain js events
+      this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
+    ](content)
+
+    $tip.removeClass('fade top bottom left right in')
+
+    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
+    // this manually by checking the contents.
+    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
+  }
+
+  Popover.prototype.hasContent = function () {
+    return this.getTitle() || this.getContent()
+  }
+
+  Popover.prototype.getContent = function () {
+    var $e = this.$element
+    var o  = this.options
+
+    return $e.attr('data-content')
+      || (typeof o.content == 'function' ?
+            o.content.call($e[0]) :
+            o.content)
+  }
+
+  Popover.prototype.arrow = function () {
+    return this.$arrow = this.$arrow || this.tip().find('.arrow')
+  }
+
+  Popover.prototype.tip = function () {
+    if (!this.$tip) this.$tip = $(this.options.template)
+    return this.$tip
+  }
+
+
+  // POPOVER PLUGIN DEFINITION
+  // =========================
+
+  var old = $.fn.popover
+
+  $.fn.popover = function (option) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.popover')
+      var options = typeof option == 'object' && option
+
+      if (!data && option == 'destroy') return
+      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.popover.Constructor = Popover
+
+
+  // POPOVER NO CONFLICT
+  // ===================
+
+  $.fn.popover.noConflict = function () {
+    $.fn.popover = old
+    return this
+  }
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/scrollspy.js b/app/assets/javascripts/bootstrap/scrollspy.js
new file mode 100644
index 0000000..4346c86
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/scrollspy.js
@@ -0,0 +1,153 @@
+/* ========================================================================
+ * Bootstrap: scrollspy.js v3.1.1
+ * http://getbootstrap.com/javascript/#scrollspy
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // SCROLLSPY CLASS DEFINITION
+  // ==========================
+
+  function ScrollSpy(element, options) {
+    var href
+    var process  = $.proxy(this.process, this)
+
+    this.$element       = $(element).is('body') ? $(window) : $(element)
+    this.$body          = $('body')
+    this.$scrollElement = this.$element.on('scroll.bs.scroll-spy.data-api', process)
+    this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
+    this.selector       = (this.options.target
+      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      || '') + ' .nav li > a'
+    this.offsets        = $([])
+    this.targets        = $([])
+    this.activeTarget   = null
+
+    this.refresh()
+    this.process()
+  }
+
+  ScrollSpy.DEFAULTS = {
+    offset: 10
+  }
+
+  ScrollSpy.prototype.refresh = function () {
+    var offsetMethod = this.$element[0] == window ? 'offset' : 'position'
+
+    this.offsets = $([])
+    this.targets = $([])
+
+    var self     = this
+    var $targets = this.$body
+      .find(this.selector)
+      .map(function () {
+        var $el   = $(this)
+        var href  = $el.data('target') || $el.attr('href')
+        var $href = /^#./.test(href) && $(href)
+
+        return ($href
+          && $href.length
+          && $href.is(':visible')
+          && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
+      })
+      .sort(function (a, b) { return a[0] - b[0] })
+      .each(function () {
+        self.offsets.push(this[0])
+        self.targets.push(this[1])
+      })
+  }
+
+  ScrollSpy.prototype.process = function () {
+    var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
+    var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
+    var maxScroll    = scrollHeight - this.$scrollElement.height()
+    var offsets      = this.offsets
+    var targets      = this.targets
+    var activeTarget = this.activeTarget
+    var i
+
+    if (scrollTop >= maxScroll) {
+      return activeTarget != (i = targets.last()[0]) && this.activate(i)
+    }
+
+    if (activeTarget && scrollTop <= offsets[0]) {
+      return activeTarget != (i = targets[0]) && this.activate(i)
+    }
+
+    for (i = offsets.length; i--;) {
+      activeTarget != targets[i]
+        && scrollTop >= offsets[i]
+        && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+        && this.activate( targets[i] )
+    }
+  }
+
+  ScrollSpy.prototype.activate = function (target) {
+    this.activeTarget = target
+
+    $(this.selector)
+      .parentsUntil(this.options.target, '.active')
+      .removeClass('active')
+
+    var selector = this.selector +
+        '[data-target="' + target + '"],' +
+        this.selector + '[href="' + target + '"]'
+
+    var active = $(selector)
+      .parents('li')
+      .addClass('active')
+
+    if (active.parent('.dropdown-menu').length) {
+      active = active
+        .closest('li.dropdown')
+        .addClass('active')
+    }
+
+    active.trigger('activate.bs.scrollspy')
+  }
+
+
+  // SCROLLSPY PLUGIN DEFINITION
+  // ===========================
+
+  var old = $.fn.scrollspy
+
+  $.fn.scrollspy = function (option) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.scrollspy')
+      var options = typeof option == 'object' && option
+
+      if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.scrollspy.Constructor = ScrollSpy
+
+
+  // SCROLLSPY NO CONFLICT
+  // =====================
+
+  $.fn.scrollspy.noConflict = function () {
+    $.fn.scrollspy = old
+    return this
+  }
+
+
+  // SCROLLSPY DATA-API
+  // ==================
+
+  $(window).on('load', function () {
+    $('[data-spy="scroll"]').each(function () {
+      var $spy = $(this)
+      $spy.scrollspy($spy.data())
+    })
+  })
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/tab.js b/app/assets/javascripts/bootstrap/tab.js
new file mode 100644
index 0000000..400cb7b
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/tab.js
@@ -0,0 +1,125 @@
+/* ========================================================================
+ * Bootstrap: tab.js v3.1.1
+ * http://getbootstrap.com/javascript/#tabs
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // TAB CLASS DEFINITION
+  // ====================
+
+  var Tab = function (element) {
+    this.element = $(element)
+  }
+
+  Tab.prototype.show = function () {
+    var $this    = this.element
+    var $ul      = $this.closest('ul:not(.dropdown-menu)')
+    var selector = $this.data('target')
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    if ($this.parent('li').hasClass('active')) return
+
+    var previous = $ul.find('.active:last a')[0]
+    var e        = $.Event('show.bs.tab', {
+      relatedTarget: previous
+    })
+
+    $this.trigger(e)
+
+    if (e.isDefaultPrevented()) return
+
+    var $target = $(selector)
+
+    this.activate($this.parent('li'), $ul)
+    this.activate($target, $target.parent(), function () {
+      $this.trigger({
+        type: 'shown.bs.tab',
+        relatedTarget: previous
+      })
+    })
+  }
+
+  Tab.prototype.activate = function (element, container, callback) {
+    var $active    = container.find('> .active')
+    var transition = callback
+      && $.support.transition
+      && $active.hasClass('fade')
+
+    function next() {
+      $active
+        .removeClass('active')
+        .find('> .dropdown-menu > .active')
+        .removeClass('active')
+
+      element.addClass('active')
+
+      if (transition) {
+        element[0].offsetWidth // reflow for transition
+        element.addClass('in')
+      } else {
+        element.removeClass('fade')
+      }
+
+      if (element.parent('.dropdown-menu')) {
+        element.closest('li.dropdown').addClass('active')
+      }
+
+      callback && callback()
+    }
+
+    transition ?
+      $active
+        .one($.support.transition.end, next)
+        .emulateTransitionEnd(150) :
+      next()
+
+    $active.removeClass('in')
+  }
+
+
+  // TAB PLUGIN DEFINITION
+  // =====================
+
+  var old = $.fn.tab
+
+  $.fn.tab = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+      var data  = $this.data('bs.tab')
+
+      if (!data) $this.data('bs.tab', (data = new Tab(this)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tab.Constructor = Tab
+
+
+  // TAB NO CONFLICT
+  // ===============
+
+  $.fn.tab.noConflict = function () {
+    $.fn.tab = old
+    return this
+  }
+
+
+  // TAB DATA-API
+  // ============
+
+  $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+    e.preventDefault()
+    $(this).tab('show')
+  })
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/tooltip.js b/app/assets/javascripts/bootstrap/tooltip.js
new file mode 100644
index 0000000..f6c0a37
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/tooltip.js
@@ -0,0 +1,399 @@
+/* ========================================================================
+ * Bootstrap: tooltip.js v3.1.1
+ * http://getbootstrap.com/javascript/#tooltip
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // TOOLTIP PUBLIC CLASS DEFINITION
+  // ===============================
+
+  var Tooltip = function (element, options) {
+    this.type       =
+    this.options    =
+    this.enabled    =
+    this.timeout    =
+    this.hoverState =
+    this.$element   = null
+
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.DEFAULTS = {
+    animation: true,
+    placement: 'top',
+    selector: false,
+    template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
+    trigger: 'hover focus',
+    title: '',
+    delay: 0,
+    html: false,
+    container: false
+  }
+
+  Tooltip.prototype.init = function (type, element, options) {
+    this.enabled  = true
+    this.type     = type
+    this.$element = $(element)
+    this.options  = this.getOptions(options)
+
+    var triggers = this.options.trigger.split(' ')
+
+    for (var i = triggers.length; i--;) {
+      var trigger = triggers[i]
+
+      if (trigger == 'click') {
+        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+      } else if (trigger != 'manual') {
+        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focusin'
+        var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
+
+        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+      }
+    }
+
+    this.options.selector ?
+      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+      this.fixTitle()
+  }
+
+  Tooltip.prototype.getDefaults = function () {
+    return Tooltip.DEFAULTS
+  }
+
+  Tooltip.prototype.getOptions = function (options) {
+    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
+
+    if (options.delay && typeof options.delay == 'number') {
+      options.delay = {
+        show: options.delay,
+        hide: options.delay
+      }
+    }
+
+    return options
+  }
+
+  Tooltip.prototype.getDelegateOptions = function () {
+    var options  = {}
+    var defaults = this.getDefaults()
+
+    this._options && $.each(this._options, function (key, value) {
+      if (defaults[key] != value) options[key] = value
+    })
+
+    return options
+  }
+
+  Tooltip.prototype.enter = function (obj) {
+    var self = obj instanceof this.constructor ?
+      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
+
+    clearTimeout(self.timeout)
+
+    self.hoverState = 'in'
+
+    if (!self.options.delay || !self.options.delay.show) return self.show()
+
+    self.timeout = setTimeout(function () {
+      if (self.hoverState == 'in') self.show()
+    }, self.options.delay.show)
+  }
+
+  Tooltip.prototype.leave = function (obj) {
+    var self = obj instanceof this.constructor ?
+      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
+
+    clearTimeout(self.timeout)
+
+    self.hoverState = 'out'
+
+    if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+    self.timeout = setTimeout(function () {
+      if (self.hoverState == 'out') self.hide()
+    }, self.options.delay.hide)
+  }
+
+  Tooltip.prototype.show = function () {
+    var e = $.Event('show.bs.' + this.type)
+
+    if (this.hasContent() && this.enabled) {
+      this.$element.trigger(e)
+
+      if (e.isDefaultPrevented()) return
+      var that = this;
+
+      var $tip = this.tip()
+
+      this.setContent()
+
+      if (this.options.animation) $tip.addClass('fade')
+
+      var placement = typeof this.options.placement == 'function' ?
+        this.options.placement.call(this, $tip[0], this.$element[0]) :
+        this.options.placement
+
+      var autoToken = /\s?auto?\s?/i
+      var autoPlace = autoToken.test(placement)
+      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
+
+      $tip
+        .detach()
+        .css({ top: 0, left: 0, display: 'block' })
+        .addClass(placement)
+
+      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+
+      var pos          = this.getPosition()
+      var actualWidth  = $tip[0].offsetWidth
+      var actualHeight = $tip[0].offsetHeight
+
+      if (autoPlace) {
+        var $parent = this.$element.parent()
+
+        var orgPlacement = placement
+        var docScroll    = document.documentElement.scrollTop || document.body.scrollTop
+        var parentWidth  = this.options.container == 'body' ? window.innerWidth  : $parent.outerWidth()
+        var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight()
+        var parentLeft   = this.options.container == 'body' ? 0 : $parent.offset().left
+
+        placement = placement == 'bottom' && pos.top   + pos.height  + actualHeight - docScroll > parentHeight  ? 'top'    :
+                    placement == 'top'    && pos.top   - docScroll   - actualHeight < 0                         ? 'bottom' :
+                    placement == 'right'  && pos.right + actualWidth > parentWidth                              ? 'left'   :
+                    placement == 'left'   && pos.left  - actualWidth < parentLeft                               ? 'right'  :
+                    placement
+
+        $tip
+          .removeClass(orgPlacement)
+          .addClass(placement)
+      }
+
+      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
+
+      this.applyPlacement(calculatedOffset, placement)
+      this.hoverState = null
+
+      var complete = function() {
+        that.$element.trigger('shown.bs.' + that.type)
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        $tip
+          .one($.support.transition.end, complete)
+          .emulateTransitionEnd(150) :
+        complete()
+    }
+  }
+
+  Tooltip.prototype.applyPlacement = function (offset, placement) {
+    var replace
+    var $tip   = this.tip()
+    var width  = $tip[0].offsetWidth
+    var height = $tip[0].offsetHeight
+
+    // manually read margins because getBoundingClientRect includes difference
+    var marginTop = parseInt($tip.css('margin-top'), 10)
+    var marginLeft = parseInt($tip.css('margin-left'), 10)
+
+    // we must check for NaN for ie 8/9
+    if (isNaN(marginTop))  marginTop  = 0
+    if (isNaN(marginLeft)) marginLeft = 0
+
+    offset.top  = offset.top  + marginTop
+    offset.left = offset.left + marginLeft
+
+    // $.fn.offset doesn't round pixel values
+    // so we use setOffset directly with our own function B-0
+    $.offset.setOffset($tip[0], $.extend({
+      using: function (props) {
+        $tip.css({
+          top: Math.round(props.top),
+          left: Math.round(props.left)
+        })
+      }
+    }, offset), 0)
+
+    $tip.addClass('in')
+
+    // check to see if placing tip in new offset caused the tip to resize itself
+    var actualWidth  = $tip[0].offsetWidth
+    var actualHeight = $tip[0].offsetHeight
+
+    if (placement == 'top' && actualHeight != height) {
+      replace = true
+      offset.top = offset.top + height - actualHeight
+    }
+
+    if (/bottom|top/.test(placement)) {
+      var delta = 0
+
+      if (offset.left < 0) {
+        delta       = offset.left * -2
+        offset.left = 0
+
+        $tip.offset(offset)
+
+        actualWidth  = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+      }
+
+      this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
+    } else {
+      this.replaceArrow(actualHeight - height, actualHeight, 'top')
+    }
+
+    if (replace) $tip.offset(offset)
+  }
+
+  Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
+    this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '')
+  }
+
+  Tooltip.prototype.setContent = function () {
+    var $tip  = this.tip()
+    var title = this.getTitle()
+
+    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+    $tip.removeClass('fade in top bottom left right')
+  }
+
+  Tooltip.prototype.hide = function () {
+    var that = this
+    var $tip = this.tip()
+    var e    = $.Event('hide.bs.' + this.type)
+
+    function complete() {
+      if (that.hoverState != 'in') $tip.detach()
+      that.$element.trigger('hidden.bs.' + that.type)
+    }
+
+    this.$element.trigger(e)
+
+    if (e.isDefaultPrevented()) return
+
+    $tip.removeClass('in')
+
+    $.support.transition && this.$tip.hasClass('fade') ?
+      $tip
+        .one($.support.transition.end, complete)
+        .emulateTransitionEnd(150) :
+      complete()
+
+    this.hoverState = null
+
+    return this
+  }
+
+  Tooltip.prototype.fixTitle = function () {
+    var $e = this.$element
+    if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
+    }
+  }
+
+  Tooltip.prototype.hasContent = function () {
+    return this.getTitle()
+  }
+
+  Tooltip.prototype.getPosition = function () {
+    var el = this.$element[0]
+    return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
+      width: el.offsetWidth,
+      height: el.offsetHeight
+    }, this.$element.offset())
+  }
+
+  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
+    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
+           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
+           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
+        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width   }
+  }
+
+  Tooltip.prototype.getTitle = function () {
+    var title
+    var $e = this.$element
+    var o  = this.options
+
+    title = $e.attr('data-original-title')
+      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+    return title
+  }
+
+  Tooltip.prototype.tip = function () {
+    return this.$tip = this.$tip || $(this.options.template)
+  }
+
+  Tooltip.prototype.arrow = function () {
+    return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
+  }
+
+  Tooltip.prototype.validate = function () {
+    if (!this.$element[0].parentNode) {
+      this.hide()
+      this.$element = null
+      this.options  = null
+    }
+  }
+
+  Tooltip.prototype.enable = function () {
+    this.enabled = true
+  }
+
+  Tooltip.prototype.disable = function () {
+    this.enabled = false
+  }
+
+  Tooltip.prototype.toggleEnabled = function () {
+    this.enabled = !this.enabled
+  }
+
+  Tooltip.prototype.toggle = function (e) {
+    var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this
+    self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
+  }
+
+  Tooltip.prototype.destroy = function () {
+    clearTimeout(this.timeout)
+    this.hide().$element.off('.' + this.type).removeData('bs.' + this.type)
+  }
+
+
+  // TOOLTIP PLUGIN DEFINITION
+  // =========================
+
+  var old = $.fn.tooltip
+
+  $.fn.tooltip = function (option) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.tooltip')
+      var options = typeof option == 'object' && option
+
+      if (!data && option == 'destroy') return
+      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tooltip.Constructor = Tooltip
+
+
+  // TOOLTIP NO CONFLICT
+  // ===================
+
+  $.fn.tooltip.noConflict = function () {
+    $.fn.tooltip = old
+    return this
+  }
+
+}(jQuery);
diff --git a/app/assets/javascripts/bootstrap/transition.js b/app/assets/javascripts/bootstrap/transition.js
new file mode 100644
index 0000000..efa8c17
--- /dev/null
+++ b/app/assets/javascripts/bootstrap/transition.js
@@ -0,0 +1,48 @@
+/* ========================================================================
+ * Bootstrap: transition.js v3.1.1
+ * http://getbootstrap.com/javascript/#transitions
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
+  // ============================================================
+
+  function transitionEnd() {
+    var el = document.createElement('bootstrap')
+
+    var transEndEventNames = {
+      'WebkitTransition' : 'webkitTransitionEnd',
+      'MozTransition'    : 'transitionend',
+      'OTransition'      : 'oTransitionEnd otransitionend',
+      'transition'       : 'transitionend'
+    }
+
+    for (var name in transEndEventNames) {
+      if (el.style[name] !== undefined) {
+        return { end: transEndEventNames[name] }
+      }
+    }
+
+    return false // explicit for ie8 (  ._.)
+  }
+
+  // http://blog.alexmaccaw.com/css-transitions
+  $.fn.emulateTransitionEnd = function (duration) {
+    var called = false, $el = this
+    $(this).one($.support.transition.end, function () { called = true })
+    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
+    setTimeout(callback, duration)
+    return this
+  }
+
+  $(function () {
+    $.support.transition = transitionEnd()
+  })
+
+}(jQuery);
diff --git a/app/assets/javascripts/connexion.coffee b/app/assets/javascripts/connexion.coffee
index 943ed17..38e6279 100644
--- a/app/assets/javascripts/connexion.coffee
+++ b/app/assets/javascripts/connexion.coffee
@@ -1,5 +1,18 @@
 #= require jquery
-#= require twitter/bootstrap
+#= require shared/jquery-ui
+#= require bootstrap
 
 #= require ./shared/jquery.backstretch.js
 
+
+
+resize = () ->
+  
+  $(".content").css("margin-top", ($(window).height() - $(".content").outerHeight(false))/ 2)
+  
+  
+$ ->
+  resize()
+  $(window).bind "resize", ->
+    resize()
+  
\ No newline at end of file
diff --git a/app/assets/javascripts/event_form.coffee b/app/assets/javascripts/event_form.coffee
new file mode 100644
index 0000000..9271bba
--- /dev/null
+++ b/app/assets/javascripts/event_form.coffee
@@ -0,0 +1,17 @@
+
+  
+@update_event_form = ->
+  if $("#event_stop_date").is(":checked")
+    $(".stop_at").show()
+  else
+    $(".stop_at").hide()
+  if $("#event_entire_day").is(":checked")
+    $(".event_time").hide()
+    $(".event_time_input").attr "value", ""
+  else
+    $(".event_time").show()
+
+$ ->
+  
+  $(document).on 'change', ".event_date_form input:checkbox", ->
+    update_event_form()
\ No newline at end of file
diff --git a/app/assets/javascripts/image_files.js b/app/assets/javascripts/image_files.js
new file mode 100644
index 0000000..d6e8bb4
--- /dev/null
+++ b/app/assets/javascripts/image_files.js
@@ -0,0 +1,191 @@
+var slider_value = 160;
+
+function image_files_load() 
+{
+  
+  update_multiple_selection_text();
+
+  set_image_files_img_size();
+
+  initialize_slider();
+  
+
+}
+
+function set_image_files_img_size(){
+  $('.image_file .img').css('width',slider_value+"px");
+  $('.image_file .img').css('height',slider_value+"px");
+  
+}
+
+function update_multiple_selection_text()
+{
+  
+  var multiple_ids = multiple_selection_ids()
+  var text = ""
+  if (multiple_ids.length == 0)
+    {
+      text = "Aucune image séléctionnée";
+    }
+  else if(multiple_ids.length == 1)
+    {
+      text= "Une image séléctionnée";
+    }
+  else
+    {
+      text= multiple_ids.length+" images séléctionnées";  
+    }
+  
+  
+  $('#multiple_selection_text').html(text);
+  
+}
+
+function multiple_selection_ids()
+{
+  var multiple_selection_ids = []
+  
+  $('#image_files .active').each(function ()
+    {
+      multiple_selection_ids.push($(this).attr("data_id"))
+    });
+  
+  return multiple_selection_ids
+}
+
+function close_image_file_container(image_file_id)
+{
+  $('#image_file_container').removeClass("image_file_container_active");
+  $('#image_files_container').css("overflow", "");
+  $('#right_bar').show();
+
+}
+
+
+
+function delete_multiple_images(){
+  if(confirm("Voulez-vous vraiment supprimer ces images ?"))
+  {
+
+    var multiple_ids = multiple_selection_ids();
+    $.each(multiple_ids, function(index, value) 
+      { 
+        $.ajax({
+          url:"/admin/image_files/"+value+".js", 
+          type : "DELETE",
+          success : function (){
+            update_multiple_selection_text();
+            }
+        });
+      }
+    );
+
+    return false;
+
+  }
+  
+}
+
+function select_all_image(){
+  $('#image_files .image_file').each(function (){
+    
+    
+    $(this).addClass("active");
+    
+    
+  });
+  update_multiple_selection_text();
+  
+}
+
+function unselect_all_image(){
+  
+  $('#image_files .image_file').each(function (){
+    
+    
+    $(this).removeClass("active");
+    
+    
+  });
+  update_multiple_selection_text();
+}
+
+
+function initialize_slider(){
+  
+  $("#grid_slider").slider({
+    value: slider_value,
+    max: 250,
+    min: 80,
+    tooltip:"hide"
+  }).on("slide", function(ev) 
+  {      
+    slider_value = ev.value
+    set_image_files_img_size();
+  });
+  set_image_files_img_size();
+
+}
+
+$(document).on("dblclick",".image_file", function (event){
+  
+
+  $.ajax({url : $(this).attr('data_show_url'), success: function (){
+    $('#image_file_container').addClass("image_file_container_active");
+    $('#right_bar').hide();
+    
+  }});
+  
+
+});
+
+$(document).on("click","#image_files_container", function (e){
+  
+  
+
+  
+  if ($(e.target).parents(".image_file").length == 0){
+    unselect_all_image();
+    
+  }
+
+});
+
+$(document).on("dblclick","#image_file_container .img", function (){
+  close_image_file_container();
+  
+});
+
+$(document).on("click",".image_file", function (){
+
+  if ($(this).hasClass('active')){
+    $(this).removeClass('active');
+    
+  }
+  else
+  {
+    $(this).addClass('active');
+  }
+  update_multiple_selection_text();
+  
+});
+
+$(document).ready(function ($) {
+
+  $("#left_buttons").on("click", function() {
+    multiple_selection_ids();
+  })
+
+  $('#image_files_big_container #main_workspace_view #image_file_container .form input').on('keydown', function(){
+    $('#image_files_big_container #main_workspace_view #image_file_container .form .submit_tr').show();
+  })
+  $('#image_files_big_container #main_workspace_view #image_file_container .form textarea').on('keydown', function(){
+    $('#image_files_big_container #main_workspace_view #image_file_container .form .submit_tr').show();
+  })
+  
+  initialize_slider();
+
+  image_files_load();
+
+
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/jquery.bxslider.js b/app/assets/javascripts/jquery.bxslider.js
new file mode 100644
index 0000000..c0413df
--- /dev/null
+++ b/app/assets/javascripts/jquery.bxslider.js
@@ -0,0 +1,1343 @@
+/**
+ * BxSlider v4.1.2 - Fully loaded, responsive content slider
+ * http://bxslider.com
+ *
+ * Copyright 2014, Steven Wanderski - http://stevenwanderski.com - http://bxcreative.com
+ * Written while drinking Belgian ales and listening to jazz
+ *
+ * Released under the MIT license - http://opensource.org/licenses/MIT
+ */
+
+;(function($){
+
+	var plugin = {};
+
+	var defaults = {
+
+		// GENERAL
+		mode: 'horizontal',
+		slideSelector: '',
+		infiniteLoop: true,
+		hideControlOnEnd: false,
+		speed: 500,
+		easing: null,
+		slideMargin: 0,
+		startSlide: 0,
+		randomStart: false,
+		captions: false,
+		ticker: false,
+		tickerHover: false,
+		adaptiveHeight: false,
+		adaptiveHeightSpeed: 500,
+		video: false,
+		useCSS: true,
+		preloadImages: 'visible',
+		responsive: true,
+		slideZIndex: 50,
+		wrapperClass: 'bx-wrapper',
+
+		// TOUCH
+		touchEnabled: true,
+		swipeThreshold: 50,
+		oneToOneTouch: true,
+		preventDefaultSwipeX: true,
+		preventDefaultSwipeY: false,
+
+		// PAGER
+		pager: true,
+		pagerType: 'full',
+		pagerShortSeparator: ' / ',
+		pagerSelector: null,
+		buildPager: null,
+		pagerCustom: null,
+
+		// CONTROLS
+		controls: true,
+		nextText: 'Next',
+		prevText: 'Prev',
+		nextSelector: null,
+		prevSelector: null,
+		autoControls: false,
+		startText: 'Start',
+		stopText: 'Stop',
+		autoControlsCombine: false,
+		autoControlsSelector: null,
+
+		// AUTO
+		auto: false,
+		pause: 4000,
+		autoStart: true,
+		autoDirection: 'next',
+		autoHover: false,
+		autoDelay: 0,
+		autoSlideForOnePage: false,
+
+		// CAROUSEL
+		minSlides: 1,
+		maxSlides: 1,
+		moveSlides: 0,
+		slideWidth: 0,
+
+		// CALLBACKS
+		onSliderLoad: function() {},
+		onSlideBefore: function() {},
+		onSlideAfter: function() {},
+		onSlideNext: function() {},
+		onSlidePrev: function() {},
+		onSliderResize: function() {}
+	}
+
+	$.fn.bxSlider = function(options){
+
+		if(this.length == 0) return this;
+
+		// support mutltiple elements
+		if(this.length > 1){
+			this.each(function(){$(this).bxSlider(options)});
+			return this;
+		}
+
+		// create a namespace to be used throughout the plugin
+		var slider = {};
+		// set a reference to our slider element
+		var el = this;
+		plugin.el = this;
+
+		/**
+		 * Makes slideshow responsive
+		 */
+		// first get the original window dimens (thanks alot IE)
+		var windowWidth = $(window).width();
+		var windowHeight = $(window).height();
+
+
+
+		/**
+		 * ===================================================================================
+		 * = PRIVATE FUNCTIONS
+		 * ===================================================================================
+		 */
+
+		/**
+		 * Initializes namespace settings to be used throughout plugin
+		 */
+		var init = function(){
+			// merge user-supplied options with the defaults
+			slider.settings = $.extend({}, defaults, options);
+			// parse slideWidth setting
+			slider.settings.slideWidth = parseInt(slider.settings.slideWidth);
+			// store the original children
+			slider.children = el.children(slider.settings.slideSelector);
+			// check if actual number of slides is less than minSlides / maxSlides
+			if(slider.children.length < slider.settings.minSlides) slider.settings.minSlides = slider.children.length;
+			if(slider.children.length < slider.settings.maxSlides) slider.settings.maxSlides = slider.children.length;
+			// if random start, set the startSlide setting to random number
+			if(slider.settings.randomStart) slider.settings.startSlide = Math.floor(Math.random() * slider.children.length);
+			// store active slide information
+			slider.active = { index: slider.settings.startSlide }
+			// store if the slider is in carousel mode (displaying / moving multiple slides)
+			slider.carousel = slider.settings.minSlides > 1 || slider.settings.maxSlides > 1;
+			// if carousel, force preloadImages = 'all'
+			if(slider.carousel) slider.settings.preloadImages = 'all';
+			// calculate the min / max width thresholds based on min / max number of slides
+			// used to setup and update carousel slides dimensions
+			slider.minThreshold = (slider.settings.minSlides * slider.settings.slideWidth) + ((slider.settings.minSlides - 1) * slider.settings.slideMargin);
+			slider.maxThreshold = (slider.settings.maxSlides * slider.settings.slideWidth) + ((slider.settings.maxSlides - 1) * slider.settings.slideMargin);
+			// store the current state of the slider (if currently animating, working is true)
+			slider.working = false;
+			// initialize the controls object
+			slider.controls = {};
+			// initialize an auto interval
+			slider.interval = null;
+			// determine which property to use for transitions
+			slider.animProp = slider.settings.mode == 'vertical' ? 'top' : 'left';
+			// determine if hardware acceleration can be used
+			slider.usingCSS = slider.settings.useCSS && slider.settings.mode != 'fade' && (function(){
+				// create our test div element
+				var div = document.createElement('div');
+				// css transition properties
+				var props = ['WebkitPerspective', 'MozPerspective', 'OPerspective', 'msPerspective'];
+				// test for each property
+				for(var i in props){
+					if(div.style[props[i]] !== undefined){
+						slider.cssPrefix = props[i].replace('Perspective', '').toLowerCase();
+						slider.animProp = '-' + slider.cssPrefix + '-transform';
+						return true;
+					}
+				}
+				return false;
+			}());
+			// if vertical mode always make maxSlides and minSlides equal
+			if(slider.settings.mode == 'vertical') slider.settings.maxSlides = slider.settings.minSlides;
+			// save original style data
+			el.data("origStyle", el.attr("style"));
+			el.children(slider.settings.slideSelector).each(function() {
+			  $(this).data("origStyle", $(this).attr("style"));
+			});
+			// perform all DOM / CSS modifications
+			setup();
+		}
+
+		/**
+		 * Performs all DOM and CSS modifications
+		 */
+		var setup = function(){
+			// wrap el in a wrapper
+			el.wrap('<div class="' + slider.settings.wrapperClass + '"><div class="bx-viewport"></div></div>');
+			// store a namspace reference to .bx-viewport
+			slider.viewport = el.parent();
+			// add a loading div to display while images are loading
+			slider.loader = $('<div class="bx-loading" />');
+			slider.viewport.prepend(slider.loader);
+			// set el to a massive width, to hold any needed slides
+			// also strip any margin and padding from el
+			el.css({
+				width: slider.settings.mode == 'horizontal' ? (slider.children.length * 100 + 215) + '%' : 'auto',
+				position: 'relative'
+			});
+			// if using CSS, add the easing property
+			if(slider.usingCSS && slider.settings.easing){
+				el.css('-' + slider.cssPrefix + '-transition-timing-function', slider.settings.easing);
+			// if not using CSS and no easing value was supplied, use the default JS animation easing (swing)
+			}else if(!slider.settings.easing){
+				slider.settings.easing = 'swing';
+			}
+			var slidesShowing = getNumberSlidesShowing();
+			// make modifications to the viewport (.bx-viewport)
+			slider.viewport.css({
+				width: '100%',
+				overflow: 'hidden',
+				position: 'relative'
+			});
+			slider.viewport.parent().css({
+				maxWidth: getViewportMaxWidth()
+			});
+			// make modification to the wrapper (.bx-wrapper)
+			if(!slider.settings.pager) {
+				slider.viewport.parent().css({
+				margin: '0 auto 0px'
+				});
+			}
+			// apply css to all slider children
+			slider.children.css({
+				'float': slider.settings.mode == 'horizontal' ? 'left' : 'none',
+				listStyle: 'none',
+				position: 'relative'
+			});
+			// apply the calculated width after the float is applied to prevent scrollbar interference
+			slider.children.css('width', getSlideWidth());
+			// if slideMargin is supplied, add the css
+			if(slider.settings.mode == 'horizontal' && slider.settings.slideMargin > 0) slider.children.css('marginRight', slider.settings.slideMargin);
+			if(slider.settings.mode == 'vertical' && slider.settings.slideMargin > 0) slider.children.css('marginBottom', slider.settings.slideMargin);
+			// if "fade" mode, add positioning and z-index CSS
+			if(slider.settings.mode == 'fade'){
+				slider.children.css({
+					position: 'absolute',
+					zIndex: 0,
+					display: 'none'
+				});
+				// prepare the z-index on the showing element
+				slider.children.eq(slider.settings.startSlide).css({zIndex: slider.settings.slideZIndex, display: 'block'});
+			}
+			// create an element to contain all slider controls (pager, start / stop, etc)
+			slider.controls.el = $('<div class="bx-controls" />');
+			// if captions are requested, add them
+			if(slider.settings.captions) appendCaptions();
+			// check if startSlide is last slide
+			slider.active.last = slider.settings.startSlide == getPagerQty() - 1;
+			// if video is true, set up the fitVids plugin
+			if(slider.settings.video) el.fitVids();
+			// set the default preload selector (visible)
+			var preloadSelector = slider.children.eq(slider.settings.startSlide);
+			if (slider.settings.preloadImages == "all") preloadSelector = slider.children;
+			// only check for control addition if not in "ticker" mode
+			if(!slider.settings.ticker){
+				// if pager is requested, add it
+				if(slider.settings.pager) appendPager();
+				// if controls are requested, add them
+				if(slider.settings.controls) appendControls();
+				// if auto is true, and auto controls are requested, add them
+				if(slider.settings.auto && slider.settings.autoControls) appendControlsAuto();
+				// if any control option is requested, add the controls wrapper
+				if(slider.settings.controls || slider.settings.autoControls || slider.settings.pager) slider.viewport.after(slider.controls.el);
+			// if ticker mode, do not allow a pager
+			}else{
+				slider.settings.pager = false;
+			}
+			// preload all images, then perform final DOM / CSS modifications that depend on images being loaded
+			loadElements(preloadSelector, start);
+		}
+
+		var loadElements = function(selector, callback){
+			var total = selector.find('img, iframe').length;
+			if (total == 0){
+				callback();
+				return;
+			}
+			var count = 0;
+			selector.find('img, iframe').each(function(){
+				$(this).one('load', function() {
+				  if(++count == total) callback();
+				}).each(function() {
+				  if(this.complete) $(this).load();
+				});
+			});
+		}
+
+		/**
+		 * Start the slider
+		 */
+		var start = function(){
+			// if infinite loop, prepare additional slides
+			if(slider.settings.infiniteLoop && slider.settings.mode != 'fade' && !slider.settings.ticker){
+				var slice = slider.settings.mode == 'vertical' ? slider.settings.minSlides : slider.settings.maxSlides;
+				var sliceAppend = slider.children.slice(0, slice).clone().addClass('bx-clone');
+				var slicePrepend = slider.children.slice(-slice).clone().addClass('bx-clone');
+				el.append(sliceAppend).prepend(slicePrepend);
+			}
+			// remove the loading DOM element
+			slider.loader.remove();
+			// set the left / top position of "el"
+			setSlidePosition();
+			// if "vertical" mode, always use adaptiveHeight to prevent odd behavior
+			if (slider.settings.mode == 'vertical') slider.settings.adaptiveHeight = true;
+			// set the viewport height
+			slider.viewport.height(getViewportHeight());
+			// make sure everything is positioned just right (same as a window resize)
+			el.redrawSlider();
+			// onSliderLoad callback
+			slider.settings.onSliderLoad(slider.active.index);
+			// slider has been fully initialized
+			slider.initialized = true;
+			// bind the resize call to the window
+			if (slider.settings.responsive) $(window).bind('resize', resizeWindow);
+			// if auto is true and has more than 1 page, start the show
+			if (slider.settings.auto && slider.settings.autoStart && (getPagerQty() > 1 || slider.settings.autoSlideForOnePage)) initAuto();
+			// if ticker is true, start the ticker
+			if (slider.settings.ticker) initTicker();
+			// if pager is requested, make the appropriate pager link active
+			if (slider.settings.pager) updatePagerActive(slider.settings.startSlide);
+			// check for any updates to the controls (like hideControlOnEnd updates)
+			if (slider.settings.controls) updateDirectionControls();
+			// if touchEnabled is true, setup the touch events
+			if (slider.settings.touchEnabled && !slider.settings.ticker) initTouch();
+		}
+
+		/**
+		 * Returns the calculated height of the viewport, used to determine either adaptiveHeight or the maxHeight value
+		 */
+		var getViewportHeight = function(){
+			var height = 0;
+			// first determine which children (slides) should be used in our height calculation
+			var children = $();
+			// if mode is not "vertical" and adaptiveHeight is false, include all children
+			if(slider.settings.mode != 'vertical' && !slider.settings.adaptiveHeight){
+				children = slider.children;
+			}else{
+				// if not carousel, return the single active child
+				if(!slider.carousel){
+					children = slider.children.eq(slider.active.index);
+				// if carousel, return a slice of children
+				}else{
+					// get the individual slide index
+					var currentIndex = slider.settings.moveSlides == 1 ? slider.active.index : slider.active.index * getMoveBy();
+					// add the current slide to the children
+					children = slider.children.eq(currentIndex);
+					// cycle through the remaining "showing" slides
+					for (i = 1; i <= slider.settings.maxSlides - 1; i++){
+						// if looped back to the start
+						if(currentIndex + i >= slider.children.length){
+							children = children.add(slider.children.eq(i - 1));
+						}else{
+							children = children.add(slider.children.eq(currentIndex + i));
+						}
+					}
+				}
+			}
+			// if "vertical" mode, calculate the sum of the heights of the children
+			if(slider.settings.mode == 'vertical'){
+				children.each(function(index) {
+				  height += $(this).outerHeight();
+				});
+				// add user-supplied margins
+				if(slider.settings.slideMargin > 0){
+					height += slider.settings.slideMargin * (slider.settings.minSlides - 1);
+				}
+			// if not "vertical" mode, calculate the max height of the children
+			}else{
+				height = Math.max.apply(Math, children.map(function(){
+					return $(this).outerHeight(false);
+				}).get());
+			}
+
+			if(slider.viewport.css('box-sizing') == 'border-box'){
+				height +=	parseFloat(slider.viewport.css('padding-top')) + parseFloat(slider.viewport.css('padding-bottom')) +
+							parseFloat(slider.viewport.css('border-top-width')) + parseFloat(slider.viewport.css('border-bottom-width'));
+			}else if(slider.viewport.css('box-sizing') == 'padding-box'){
+				height +=	parseFloat(slider.viewport.css('padding-top')) + parseFloat(slider.viewport.css('padding-bottom'));
+			}
+
+			return height;
+		}
+
+		/**
+		 * Returns the calculated width to be used for the outer wrapper / viewport
+		 */
+		var getViewportMaxWidth = function(){
+			var width = '100%';
+			if(slider.settings.slideWidth > 0){
+				if(slider.settings.mode == 'horizontal'){
+					width = (slider.settings.maxSlides * slider.settings.slideWidth) + ((slider.settings.maxSlides - 1) * slider.settings.slideMargin);
+				}else{
+					width = slider.settings.slideWidth;
+				}
+			}
+			return width;
+		}
+
+		/**
+		 * Returns the calculated width to be applied to each slide
+		 */
+		var getSlideWidth = function(){
+			// start with any user-supplied slide width
+			var newElWidth = slider.settings.slideWidth;
+			// get the current viewport width
+			var wrapWidth = slider.viewport.width();
+			// if slide width was not supplied, or is larger than the viewport use the viewport width
+			if(slider.settings.slideWidth == 0 ||
+				(slider.settings.slideWidth > wrapWidth && !slider.carousel) ||
+				slider.settings.mode == 'vertical'){
+				newElWidth = wrapWidth;
+			// if carousel, use the thresholds to determine the width
+			}else if(slider.settings.maxSlides > 1 && slider.settings.mode == 'horizontal'){
+				if(wrapWidth > slider.maxThreshold){
+					// newElWidth = (wrapWidth - (slider.settings.slideMargin * (slider.settings.maxSlides - 1))) / slider.settings.maxSlides;
+				}else if(wrapWidth < slider.minThreshold){
+					newElWidth = (wrapWidth - (slider.settings.slideMargin * (slider.settings.minSlides - 1))) / slider.settings.minSlides;
+				}
+			}
+			return newElWidth;
+		}
+
+		/**
+		 * Returns the number of slides currently visible in the viewport (includes partially visible slides)
+		 */
+		var getNumberSlidesShowing = function(){
+			var slidesShowing = 1;
+			if(slider.settings.mode == 'horizontal' && slider.settings.slideWidth > 0){
+				// if viewport is smaller than minThreshold, return minSlides
+				if(slider.viewport.width() < slider.minThreshold){
+					slidesShowing = slider.settings.minSlides;
+				// if viewport is larger than minThreshold, return maxSlides
+				}else if(slider.viewport.width() > slider.maxThreshold){
+					slidesShowing = slider.settings.maxSlides;
+				// if viewport is between min / max thresholds, divide viewport width by first child width
+				}else{
+					var childWidth = slider.children.first().width() + slider.settings.slideMargin;
+					slidesShowing = Math.floor((slider.viewport.width() +
+						slider.settings.slideMargin) / childWidth);
+				}
+			// if "vertical" mode, slides showing will always be minSlides
+			}else if(slider.settings.mode == 'vertical'){
+				slidesShowing = slider.settings.minSlides;
+			}
+			return slidesShowing;
+		}
+
+		/**
+		 * Returns the number of pages (one full viewport of slides is one "page")
+		 */
+		var getPagerQty = function(){
+			var pagerQty = 0;
+			// if moveSlides is specified by the user
+			if(slider.settings.moveSlides > 0){
+				if(slider.settings.infiniteLoop){
+					pagerQty = Math.ceil(slider.children.length / getMoveBy());
+				}else{
+					// use a while loop to determine pages
+					var breakPoint = 0;
+					var counter = 0
+					// when breakpoint goes above children length, counter is the number of pages
+					while (breakPoint < slider.children.length){
+						++pagerQty;
+						breakPoint = counter + getNumberSlidesShowing();
+						counter += slider.settings.moveSlides <= getNumberSlidesShowing() ? slider.settings.moveSlides : getNumberSlidesShowing();
+					}
+				}
+			// if moveSlides is 0 (auto) divide children length by sides showing, then round up
+			}else{
+				pagerQty = Math.ceil(slider.children.length / getNumberSlidesShowing());
+			}
+			return pagerQty;
+		}
+
+		/**
+		 * Returns the number of indivual slides by which to shift the slider
+		 */
+		var getMoveBy = function(){
+			// if moveSlides was set by the user and moveSlides is less than number of slides showing
+			if(slider.settings.moveSlides > 0 && slider.settings.moveSlides <= getNumberSlidesShowing()){
+				return slider.settings.moveSlides;
+			}
+			// if moveSlides is 0 (auto)
+			return getNumberSlidesShowing();
+		}
+
+		/**
+		 * Sets the slider's (el) left or top position
+		 */
+		var setSlidePosition = function(){
+			// if last slide, not infinite loop, and number of children is larger than specified maxSlides
+			if(slider.children.length > slider.settings.maxSlides && slider.active.last && !slider.settings.infiniteLoop){
+				if (slider.settings.mode == 'horizontal'){
+					// get the last child's position
+					var lastChild = slider.children.last();
+					var position = lastChild.position();
+					// set the left position
+					setPositionProperty(-(position.left - (slider.viewport.width() - lastChild.outerWidth())), 'reset', 0);
+				}else if(slider.settings.mode == 'vertical'){
+					// get the last showing index's position
+					var lastShowingIndex = slider.children.length - slider.settings.minSlides;
+					var position = slider.children.eq(lastShowingIndex).position();
+					// set the top position
+					setPositionProperty(-position.top, 'reset', 0);
+				}
+			// if not last slide
+			}else{
+				// get the position of the first showing slide
+				var position = slider.children.eq(slider.active.index * getMoveBy()).position();
+				// check for last slide
+				if (slider.active.index == getPagerQty() - 1) slider.active.last = true;
+				// set the repective position
+				if (position != undefined){
+					if (slider.settings.mode == 'horizontal') setPositionProperty(-position.left, 'reset', 0);
+					else if (slider.settings.mode == 'vertical') setPositionProperty(-position.top, 'reset', 0);
+				}
+			}
+		}
+
+		/**
+		 * Sets the el's animating property position (which in turn will sometimes animate el).
+		 * If using CSS, sets the transform property. If not using CSS, sets the top / left property.
+		 *
+		 * @param value (int)
+		 *  - the animating property's value
+		 *
+		 * @param type (string) 'slider', 'reset', 'ticker'
+		 *  - the type of instance for which the function is being
+		 *
+		 * @param duration (int)
+		 *  - the amount of time (in ms) the transition should occupy
+		 *
+		 * @param params (array) optional
+		 *  - an optional parameter containing any variables that need to be passed in
+		 */
+		var setPositionProperty = function(value, type, duration, params){
+			// use CSS transform
+			if(slider.usingCSS){
+				// determine the translate3d value
+				var propValue = slider.settings.mode == 'vertical' ? 'translate3d(0, ' + value + 'px, 0)' : 'translate3d(' + value + 'px, 0, 0)';
+				// add the CSS transition-duration
+				el.css('-' + slider.cssPrefix + '-transition-duration', duration / 1000 + 's');
+				if(type == 'slide'){
+					// set the property value
+					el.css(slider.animProp, propValue);
+					// bind a callback method - executes when CSS transition completes
+					el.bind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd', function(){
+						// unbind the callback
+						el.unbind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd');
+						updateAfterSlideTransition();
+					});
+				}else if(type == 'reset'){
+					el.css(slider.animProp, propValue);
+				}else if(type == 'ticker'){
+					// make the transition use 'linear'
+					el.css('-' + slider.cssPrefix + '-transition-timing-function', 'linear');
+					el.css(slider.animProp, propValue);
+					// bind a callback method - executes when CSS transition completes
+					el.bind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd', function(){
+						// unbind the callback
+						el.unbind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd');
+						// reset the position
+						setPositionProperty(params['resetValue'], 'reset', 0);
+						// start the loop again
+						tickerLoop();
+					});
+				}
+			// use JS animate
+			}else{
+				var animateObj = {};
+				animateObj[slider.animProp] = value;
+				if(type == 'slide'){
+					el.animate(animateObj, duration, slider.settings.easing, function(){
+						updateAfterSlideTransition();
+					});
+				}else if(type == 'reset'){
+					el.css(slider.animProp, value)
+				}else if(type == 'ticker'){
+					el.animate(animateObj, speed, 'linear', function(){
+						setPositionProperty(params['resetValue'], 'reset', 0);
+						// run the recursive loop after animation
+						tickerLoop();
+					});
+				}
+			}
+		}
+
+		/**
+		 * Populates the pager with proper amount of pages
+		 */
+		var populatePager = function(){
+			var pagerHtml = '';
+			var pagerQty = getPagerQty();
+			// loop through each pager item
+			for(var i=0; i < pagerQty; i++){
+				var linkContent = '';
+				// if a buildPager function is supplied, use it to get pager link value, else use index + 1
+				if(slider.settings.buildPager && $.isFunction(slider.settings.buildPager)){
+					linkContent = slider.settings.buildPager(i);
+					slider.pagerEl.addClass('bx-custom-pager');
+				}else{
+					linkContent = i + 1;
+					slider.pagerEl.addClass('bx-default-pager');
+				}
+				// var linkContent = slider.settings.buildPager && $.isFunction(slider.settings.buildPager) ? slider.settings.buildPager(i) : i + 1;
+				// add the markup to the string
+				pagerHtml += '<div class="bx-pager-item"><a href="" data-slide-index="' + i + '" class="bx-pager-link">' + linkContent + '</a></div>';
+			};
+			// populate the pager element with pager links
+			slider.pagerEl.html(pagerHtml);
+		}
+
+		/**
+		 * Appends the pager to the controls element
+		 */
+		var appendPager = function(){
+			if(!slider.settings.pagerCustom){
+				// create the pager DOM element
+				slider.pagerEl = $('<div class="bx-pager" />');
+				// if a pager selector was supplied, populate it with the pager
+				if(slider.settings.pagerSelector){
+					$(slider.settings.pagerSelector).html(slider.pagerEl);
+				// if no pager selector was supplied, add it after the wrapper
+				}else{
+					slider.controls.el.addClass('bx-has-pager').append(slider.pagerEl);
+				}
+				// populate the pager
+				populatePager();
+			}else{
+				slider.pagerEl = $(slider.settings.pagerCustom);
+			}
+			// assign the pager click binding
+			slider.pagerEl.on('click', 'a', clickPagerBind);
+		}
+
+		/**
+		 * Appends prev / next controls to the controls element
+		 */
+		var appendControls = function(){
+			slider.controls.next = $('<a class="bx-next" href="">' + slider.settings.nextText + '</a>');
+			slider.controls.prev = $('<a class="bx-prev" href="">' + slider.settings.prevText + '</a>');
+			// bind click actions to the controls
+			slider.controls.next.bind('click', clickNextBind);
+			slider.controls.prev.bind('click', clickPrevBind);
+			// if nextSlector was supplied, populate it
+			if(slider.settings.nextSelector){
+				$(slider.settings.nextSelector).append(slider.controls.next);
+			}
+			// if prevSlector was supplied, populate it
+			if(slider.settings.prevSelector){
+				$(slider.settings.prevSelector).append(slider.controls.prev);
+			}
+			// if no custom selectors were supplied
+			if(!slider.settings.nextSelector && !slider.settings.prevSelector){
+				// add the controls to the DOM
+				slider.controls.directionEl = $('<div class="bx-controls-direction" />');
+				// add the control elements to the directionEl
+				slider.controls.directionEl.append(slider.controls.prev).append(slider.controls.next);
+				// slider.viewport.append(slider.controls.directionEl);
+				slider.controls.el.addClass('bx-has-controls-direction').append(slider.controls.directionEl);
+			}
+		}
+
+		/**
+		 * Appends start / stop auto controls to the controls element
+		 */
+		var appendControlsAuto = function(){
+			slider.controls.start = $('<div class="bx-controls-auto-item"><a class="bx-start" href="">' + slider.settings.startText + '</a></div>');
+			slider.controls.stop = $('<div class="bx-controls-auto-item"><a class="bx-stop" href="">' + slider.settings.stopText + '</a></div>');
+			// add the controls to the DOM
+			slider.controls.autoEl = $('<div class="bx-controls-auto" />');
+			// bind click actions to the controls
+			slider.controls.autoEl.on('click', '.bx-start', clickStartBind);
+			slider.controls.autoEl.on('click', '.bx-stop', clickStopBind);
+			// if autoControlsCombine, insert only the "start" control
+			if(slider.settings.autoControlsCombine){
+				slider.controls.autoEl.append(slider.controls.start);
+			// if autoControlsCombine is false, insert both controls
+			}else{
+				slider.controls.autoEl.append(slider.controls.start).append(slider.controls.stop);
+			}
+			// if auto controls selector was supplied, populate it with the controls
+			if(slider.settings.autoControlsSelector){
+				$(slider.settings.autoControlsSelector).html(slider.controls.autoEl);
+			// if auto controls selector was not supplied, add it after the wrapper
+			}else{
+				slider.controls.el.addClass('bx-has-controls-auto').append(slider.controls.autoEl);
+			}
+			// update the auto controls
+			updateAutoControls(slider.settings.autoStart ? 'stop' : 'start');
+		}
+
+		/**
+		 * Appends image captions to the DOM
+		 */
+		var appendCaptions = function(){
+			// cycle through each child
+			slider.children.each(function(index){
+				// get the image title attribute
+				var title = $(this).find('img:first').attr('title');
+				// append the caption
+				if (title != undefined && ('' + title).length) {
+                    $(this).append('<div class="bx-caption"><span>' + title + '</span></div>');
+                }
+			});
+		}
+
+		/**
+		 * Click next binding
+		 *
+		 * @param e (event)
+		 *  - DOM event object
+		 */
+		var clickNextBind = function(e){
+			// if auto show is running, stop it
+			if (slider.settings.auto) el.stopAuto();
+			el.goToNextSlide();
+			e.preventDefault();
+		}
+
+		/**
+		 * Click prev binding
+		 *
+		 * @param e (event)
+		 *  - DOM event object
+		 */
+		var clickPrevBind = function(e){
+			// if auto show is running, stop it
+			if (slider.settings.auto) el.stopAuto();
+			el.goToPrevSlide();
+			e.preventDefault();
+		}
+
+		/**
+		 * Click start binding
+		 *
+		 * @param e (event)
+		 *  - DOM event object
+		 */
+		var clickStartBind = function(e){
+			el.startAuto();
+			e.preventDefault();
+		}
+
+		/**
+		 * Click stop binding
+		 *
+		 * @param e (event)
+		 *  - DOM event object
+		 */
+		var clickStopBind = function(e){
+			el.stopAuto();
+			e.preventDefault();
+		}
+
+		/**
+		 * Click pager binding
+		 *
+		 * @param e (event)
+		 *  - DOM event object
+		 */
+		var clickPagerBind = function(e){
+			// if auto show is running, stop it
+			if (slider.settings.auto) el.stopAuto();
+			var pagerLink = $(e.currentTarget);
+			if(pagerLink.attr('data-slide-index') !== undefined){
+				var pagerIndex = parseInt(pagerLink.attr('data-slide-index'));
+				// if clicked pager link is not active, continue with the goToSlide call
+				if(pagerIndex != slider.active.index) el.goToSlide(pagerIndex);
+				e.preventDefault();
+			}
+		}
+
+		/**
+		 * Updates the pager links with an active class
+		 *
+		 * @param slideIndex (int)
+		 *  - index of slide to make active
+		 */
+		var updatePagerActive = function(slideIndex){
+			// if "short" pager type
+			var len = slider.children.length; // nb of children
+			if(slider.settings.pagerType == 'short'){
+				if(slider.settings.maxSlides > 1) {
+					len = Math.ceil(slider.children.length/slider.settings.maxSlides);
+				}
+				slider.pagerEl.html( (slideIndex + 1) + slider.settings.pagerShortSeparator + len);
+				return;
+			}
+			// remove all pager active classes
+			slider.pagerEl.find('a').removeClass('active');
+			// apply the active class for all pagers
+			slider.pagerEl.each(function(i, el) { $(el).find('a').eq(slideIndex).addClass('active'); });
+		}
+
+		/**
+		 * Performs needed actions after a slide transition
+		 */
+		var updateAfterSlideTransition = function(){
+			// if infinte loop is true
+			if(slider.settings.infiniteLoop){
+				var position = '';
+				// first slide
+				if(slider.active.index == 0){
+					// set the new position
+					position = slider.children.eq(0).position();
+				// carousel, last slide
+				}else if(slider.active.index == getPagerQty() - 1 && slider.carousel){
+					position = slider.children.eq((getPagerQty() - 1) * getMoveBy()).position();
+				// last slide
+				}else if(slider.active.index == slider.children.length - 1){
+					position = slider.children.eq(slider.children.length - 1).position();
+				}
+				if(position){
+					if (slider.settings.mode == 'horizontal') { setPositionProperty(-position.left, 'reset', 0); }
+					else if (slider.settings.mode == 'vertical') { setPositionProperty(-position.top, 'reset', 0); }
+				}
+			}
+			// declare that the transition is complete
+			slider.working = false;
+			// onSlideAfter callback
+			slider.settings.onSlideAfter(slider.children.eq(slider.active.index), slider.oldIndex, slider.active.index);
+		}
+
+		/**
+		 * Updates the auto controls state (either active, or combined switch)
+		 *
+		 * @param state (string) "start", "stop"
+		 *  - the new state of the auto show
+		 */
+		var updateAutoControls = function(state){
+			// if autoControlsCombine is true, replace the current control with the new state
+			if(slider.settings.autoControlsCombine){
+				slider.controls.autoEl.html(slider.controls[state]);
+			// if autoControlsCombine is false, apply the "active" class to the appropriate control
+			}else{
+				slider.controls.autoEl.find('a').removeClass('active');
+				slider.controls.autoEl.find('a:not(.bx-' + state + ')').addClass('active');
+			}
+		}
+
+		/**
+		 * Updates the direction controls (checks if either should be hidden)
+		 */
+		var updateDirectionControls = function(){
+			if(getPagerQty() == 1){
+				slider.controls.prev.addClass('disabled');
+				slider.controls.next.addClass('disabled');
+			}else if(!slider.settings.infiniteLoop && slider.settings.hideControlOnEnd){
+				// if first slide
+				if (slider.active.index == 0){
+					slider.controls.prev.addClass('disabled');
+					slider.controls.next.removeClass('disabled');
+				// if last slide
+				}else if(slider.active.index == getPagerQty() - 1){
+					slider.controls.next.addClass('disabled');
+					slider.controls.prev.removeClass('disabled');
+				// if any slide in the middle
+				}else{
+					slider.controls.prev.removeClass('disabled');
+					slider.controls.next.removeClass('disabled');
+				}
+			}
+		}
+
+		/**
+		 * Initialzes the auto process
+		 */
+		var initAuto = function(){
+			// if autoDelay was supplied, launch the auto show using a setTimeout() call
+			if(slider.settings.autoDelay > 0){
+				var timeout = setTimeout(el.startAuto, slider.settings.autoDelay);
+			// if autoDelay was not supplied, start the auto show normally
+			}else{
+				el.startAuto();
+			}
+			// if autoHover is requested
+			if(slider.settings.autoHover){
+				// on el hover
+				el.hover(function(){
+					// if the auto show is currently playing (has an active interval)
+					if(slider.interval){
+						// stop the auto show and pass true agument which will prevent control update
+						el.stopAuto(true);
+						// create a new autoPaused value which will be used by the relative "mouseout" event
+						slider.autoPaused = true;
+					}
+				}, function(){
+					// if the autoPaused value was created be the prior "mouseover" event
+					if(slider.autoPaused){
+						// start the auto show and pass true agument which will prevent control update
+						el.startAuto(true);
+						// reset the autoPaused value
+						slider.autoPaused = null;
+					}
+				});
+			}
+		}
+
+		/**
+		 * Initialzes the ticker process
+		 */
+		var initTicker = function(){
+			var startPosition = 0;
+			// if autoDirection is "next", append a clone of the entire slider
+			if(slider.settings.autoDirection == 'next'){
+				el.append(slider.children.clone().addClass('bx-clone'));
+			// if autoDirection is "prev", prepend a clone of the entire slider, and set the left position
+			}else{
+				el.prepend(slider.children.clone().addClass('bx-clone'));
+				var position = slider.children.first().position();
+				startPosition = slider.settings.mode == 'horizontal' ? -position.left : -position.top;
+			}
+			setPositionProperty(startPosition, 'reset', 0);
+			// do not allow controls in ticker mode
+			slider.settings.pager = false;
+			slider.settings.controls = false;
+			slider.settings.autoControls = false;
+			// if autoHover is requested
+			if(slider.settings.tickerHover && !slider.usingCSS){
+				// on el hover
+				slider.viewport.hover(function(){
+					el.stop();
+				}, function(){
+					// calculate the total width of children (used to calculate the speed ratio)
+					var totalDimens = 0;
+					slider.children.each(function(index){
+					  totalDimens += slider.settings.mode == 'horizontal' ? $(this).outerWidth(true) : $(this).outerHeight(true);
+					});
+					// calculate the speed ratio (used to determine the new speed to finish the paused animation)
+					var ratio = slider.settings.speed / totalDimens;
+					// determine which property to use
+					var property = slider.settings.mode == 'horizontal' ? 'left' : 'top';
+					// calculate the new speed
+					var newSpeed = ratio * (totalDimens - (Math.abs(parseInt(el.css(property)))));
+					tickerLoop(newSpeed);
+				});
+			}
+			// start the ticker loop
+			tickerLoop();
+		}
+
+		/**
+		 * Runs a continuous loop, news ticker-style
+		 */
+		var tickerLoop = function(resumeSpeed){
+			speed = resumeSpeed ? resumeSpeed : slider.settings.speed;
+			var position = {left: 0, top: 0};
+			var reset = {left: 0, top: 0};
+			// if "next" animate left position to last child, then reset left to 0
+			if(slider.settings.autoDirection == 'next'){
+				position = el.find('.bx-clone').first().position();
+			// if "prev" animate left position to 0, then reset left to first non-clone child
+			}else{
+				reset = slider.children.first().position();
+			}
+			var animateProperty = slider.settings.mode == 'horizontal' ? -position.left : -position.top;
+			var resetValue = slider.settings.mode == 'horizontal' ? -reset.left : -reset.top;
+			var params = {resetValue: resetValue};
+			setPositionProperty(animateProperty, 'ticker', speed, params);
+		}
+
+		/**
+		 * Initializes touch events
+		 */
+		var initTouch = function(){
+			// initialize object to contain all touch values
+			slider.touch = {
+				start: {x: 0, y: 0},
+				end: {x: 0, y: 0}
+			}
+			slider.viewport.bind('touchstart', onTouchStart);
+		}
+
+		/**
+		 * Event handler for "touchstart"
+		 *
+		 * @param e (event)
+		 *  - DOM event object
+		 */
+		var onTouchStart = function(e){
+			if(slider.working){
+				e.preventDefault();
+			}else{
+				// record the original position when touch starts
+				slider.touch.originalPos = el.position();
+				var orig = e.originalEvent;
+				// record the starting touch x, y coordinates
+				slider.touch.start.x = orig.changedTouches[0].pageX;
+				slider.touch.start.y = orig.changedTouches[0].pageY;
+				// bind a "touchmove" event to the viewport
+				slider.viewport.bind('touchmove', onTouchMove);
+				// bind a "touchend" event to the viewport
+				slider.viewport.bind('touchend', onTouchEnd);
+			}
+		}
+
+		/**
+		 * Event handler for "touchmove"
+		 *
+		 * @param e (event)
+		 *  - DOM event object
+		 */
+		var onTouchMove = function(e){
+			var orig = e.originalEvent;
+			// if scrolling on y axis, do not prevent default
+			var xMovement = Math.abs(orig.changedTouches[0].pageX - slider.touch.start.x);
+			var yMovement = Math.abs(orig.changedTouches[0].pageY - slider.touch.start.y);
+			// x axis swipe
+			if((xMovement * 3) > yMovement && slider.settings.preventDefaultSwipeX){
+				e.preventDefault();
+			// y axis swipe
+			}else if((yMovement * 3) > xMovement && slider.settings.preventDefaultSwipeY){
+				e.preventDefault();
+			}
+			if(slider.settings.mode != 'fade' && slider.settings.oneToOneTouch){
+				var value = 0;
+				// if horizontal, drag along x axis
+				if(slider.settings.mode == 'horizontal'){
+					var change = orig.changedTouches[0].pageX - slider.touch.start.x;
+					value = slider.touch.originalPos.left + change;
+				// if vertical, drag along y axis
+				}else{
+					var change = orig.changedTouches[0].pageY - slider.touch.start.y;
+					value = slider.touch.originalPos.top + change;
+				}
+				setPositionProperty(value, 'reset', 0);
+			}
+		}
+
+		/**
+		 * Event handler for "touchend"
+		 *
+		 * @param e (event)
+		 *  - DOM event object
+		 */
+		var onTouchEnd = function(e){
+			slider.viewport.unbind('touchmove', onTouchMove);
+			var orig = e.originalEvent;
+			var value = 0;
+			// record end x, y positions
+			slider.touch.end.x = orig.changedTouches[0].pageX;
+			slider.touch.end.y = orig.changedTouches[0].pageY;
+			// if fade mode, check if absolute x distance clears the threshold
+			if(slider.settings.mode == 'fade'){
+				var distance = Math.abs(slider.touch.start.x - slider.touch.end.x);
+				if(distance >= slider.settings.swipeThreshold){
+					slider.touch.start.x > slider.touch.end.x ? el.goToNextSlide() : el.goToPrevSlide();
+					el.stopAuto();
+				}
+			// not fade mode
+			}else{
+				var distance = 0;
+				// calculate distance and el's animate property
+				if(slider.settings.mode == 'horizontal'){
+					distance = slider.touch.end.x - slider.touch.start.x;
+					value = slider.touch.originalPos.left;
+				}else{
+					distance = slider.touch.end.y - slider.touch.start.y;
+					value = slider.touch.originalPos.top;
+				}
+				// if not infinite loop and first / last slide, do not attempt a slide transition
+				if(!slider.settings.infiniteLoop && ((slider.active.index == 0 && distance > 0) || (slider.active.last && distance < 0))){
+					setPositionProperty(value, 'reset', 200);
+				}else{
+					// check if distance clears threshold
+					if(Math.abs(distance) >= slider.settings.swipeThreshold){
+						distance < 0 ? el.goToNextSlide() : el.goToPrevSlide();
+						el.stopAuto();
+					}else{
+						// el.animate(property, 200);
+						setPositionProperty(value, 'reset', 200);
+					}
+				}
+			}
+			slider.viewport.unbind('touchend', onTouchEnd);
+		}
+
+		/**
+		 * Window resize event callback
+		 */
+		var resizeWindow = function(e){
+			// don't do anything if slider isn't initialized.
+			if(!slider.initialized) return;
+			// get the new window dimens (again, thank you IE)
+			var windowWidthNew = $(window).width();
+			var windowHeightNew = $(window).height();
+			// make sure that it is a true window resize
+			// *we must check this because our dinosaur friend IE fires a window resize event when certain DOM elements
+			// are resized. Can you just die already?*
+			if(windowWidth != windowWidthNew || windowHeight != windowHeightNew){
+				// set the new window dimens
+				windowWidth = windowWidthNew;
+				windowHeight = windowHeightNew;
+				// update all dynamic elements
+				el.redrawSlider();
+				// Call user resize handler
+				slider.settings.onSliderResize.call(el, slider.active.index);
+			}
+		}
+
+		/**
+		 * ===================================================================================
+		 * = PUBLIC FUNCTIONS
+		 * ===================================================================================
+		 */
+
+		/**
+		 * Performs slide transition to the specified slide
+		 *
+		 * @param slideIndex (int)
+		 *  - the destination slide's index (zero-based)
+		 *
+		 * @param direction (string)
+		 *  - INTERNAL USE ONLY - the direction of travel ("prev" / "next")
+		 */
+		el.goToSlide = function(slideIndex, direction){
+			// if plugin is currently in motion, ignore request
+			if(slider.working || slider.active.index == slideIndex) return;
+			// declare that plugin is in motion
+			slider.working = true;
+			// store the old index
+			slider.oldIndex = slider.active.index;
+			// if slideIndex is less than zero, set active index to last child (this happens during infinite loop)
+			if(slideIndex < 0){
+				slider.active.index = getPagerQty() - 1;
+			// if slideIndex is greater than children length, set active index to 0 (this happens during infinite loop)
+			}else if(slideIndex >= getPagerQty()){
+				slider.active.index = 0;
+			// set active index to requested slide
+			}else{
+				slider.active.index = slideIndex;
+			}
+			// onSlideBefore, onSlideNext, onSlidePrev callbacks
+			slider.settings.onSlideBefore(slider.children.eq(slider.active.index), slider.oldIndex, slider.active.index);
+			if(direction == 'next'){
+				slider.settings.onSlideNext(slider.children.eq(slider.active.index), slider.oldIndex, slider.active.index);
+			}else if(direction == 'prev'){
+				slider.settings.onSlidePrev(slider.children.eq(slider.active.index), slider.oldIndex, slider.active.index);
+			}
+			// check if last slide
+			slider.active.last = slider.active.index >= getPagerQty() - 1;
+			// update the pager with active class
+			if(slider.settings.pager) updatePagerActive(slider.active.index);
+			// // check for direction control update
+			if(slider.settings.controls) updateDirectionControls();
+			// if slider is set to mode: "fade"
+			if(slider.settings.mode == 'fade'){
+				// if adaptiveHeight is true and next height is different from current height, animate to the new height
+				if(slider.settings.adaptiveHeight && slider.viewport.height() != getViewportHeight()){
+					slider.viewport.animate({height: getViewportHeight()}, slider.settings.adaptiveHeightSpeed);
+				}
+				// fade out the visible child and reset its z-index value
+				slider.children.filter(':visible').fadeOut(slider.settings.speed).css({zIndex: 0});
+				// fade in the newly requested slide
+				slider.children.eq(slider.active.index).css('zIndex', slider.settings.slideZIndex+1).fadeIn(slider.settings.speed, function(){
+					$(this).css('zIndex', slider.settings.slideZIndex);
+					updateAfterSlideTransition();
+				});
+			// slider mode is not "fade"
+			}else{
+				// if adaptiveHeight is true and next height is different from current height, animate to the new height
+				if(slider.settings.adaptiveHeight && slider.viewport.height() != getViewportHeight()){
+					slider.viewport.animate({height: getViewportHeight()}, slider.settings.adaptiveHeightSpeed);
+				}
+				var moveBy = 0;
+				var position = {left: 0, top: 0};
+				// if carousel and not infinite loop
+				if(!slider.settings.infiniteLoop && slider.carousel && slider.active.last){
+					if(slider.settings.mode == 'horizontal'){
+						// get the last child position
+						var lastChild = slider.children.eq(slider.children.length - 1);
+						position = lastChild.position();
+						// calculate the position of the last slide
+						moveBy = slider.viewport.width() - lastChild.outerWidth();
+					}else{
+						// get last showing index position
+						var lastShowingIndex = slider.children.length - slider.settings.minSlides;
+						position = slider.children.eq(lastShowingIndex).position();
+					}
+					// horizontal carousel, going previous while on first slide (infiniteLoop mode)
+				}else if(slider.carousel && slider.active.last && direction == 'prev'){
+					// get the last child position
+					var eq = slider.settings.moveSlides == 1 ? slider.settings.maxSlides - getMoveBy() : ((getPagerQty() - 1) * getMoveBy()) - (slider.children.length - slider.settings.maxSlides);
+					var lastChild = el.children('.bx-clone').eq(eq);
+					position = lastChild.position();
+				// if infinite loop and "Next" is clicked on the last slide
+				}else if(direction == 'next' && slider.active.index == 0){
+					// get the last clone position
+					position = el.find('> .bx-clone').eq(slider.settings.maxSlides).position();
+					slider.active.last = false;
+				// normal non-zero requests
+				}else if(slideIndex >= 0){
+					var requestEl = slideIndex * getMoveBy();
+					position = slider.children.eq(requestEl).position();
+				}
+
+				/* If the position doesn't exist
+				 * (e.g. if you destroy the slider on a next click),
+				 * it doesn't throw an error.
+				 */
+				if ("undefined" !== typeof(position)) {
+					var value = slider.settings.mode == 'horizontal' ? -(position.left - moveBy) : -position.top;
+					// plugin values to be animated
+					setPositionProperty(value, 'slide', slider.settings.speed);
+				}
+			}
+		}
+
+		/**
+		 * Transitions to the next slide in the show
+		 */
+		el.goToNextSlide = function(){
+			// if infiniteLoop is false and last page is showing, disregard call
+			if (!slider.settings.infiniteLoop && slider.active.last) return;
+			var pagerIndex = parseInt(slider.active.index) + 1;
+			el.goToSlide(pagerIndex, 'next');
+		}
+
+		/**
+		 * Transitions to the prev slide in the show
+		 */
+		el.goToPrevSlide = function(){
+			// if infiniteLoop is false and last page is showing, disregard call
+			if (!slider.settings.infiniteLoop && slider.active.index == 0) return;
+			var pagerIndex = parseInt(slider.active.index) - 1;
+			el.goToSlide(pagerIndex, 'prev');
+		}
+
+		/**
+		 * Starts the auto show
+		 *
+		 * @param preventControlUpdate (boolean)
+		 *  - if true, auto controls state will not be updated
+		 */
+		el.startAuto = function(preventControlUpdate){
+			// if an interval already exists, disregard call
+			if(slider.interval) return;
+			// create an interval
+			slider.interval = setInterval(function(){
+				slider.settings.autoDirection == 'next' ? el.goToNextSlide() : el.goToPrevSlide();
+			}, slider.settings.pause);
+			// if auto controls are displayed and preventControlUpdate is not true
+			if (slider.settings.autoControls && preventControlUpdate != true) updateAutoControls('stop');
+		}
+
+		/**
+		 * Stops the auto show
+		 *
+		 * @param preventControlUpdate (boolean)
+		 *  - if true, auto controls state will not be updated
+		 */
+		el.stopAuto = function(preventControlUpdate){
+			// if no interval exists, disregard call
+			if(!slider.interval) return;
+			// clear the interval
+			clearInterval(slider.interval);
+			slider.interval = null;
+			// if auto controls are displayed and preventControlUpdate is not true
+			if (slider.settings.autoControls && preventControlUpdate != true) updateAutoControls('start');
+		}
+
+		/**
+		 * Returns current slide index (zero-based)
+		 */
+		el.getCurrentSlide = function(){
+			return slider.active.index;
+		}
+
+		/**
+		 * Returns current slide element
+		 */
+		el.getCurrentSlideElement = function(){
+			return slider.children.eq(slider.active.index);
+		}
+
+		/**
+		 * Returns number of slides in show
+		 */
+		el.getSlideCount = function(){
+			return slider.children.length;
+		}
+
+		/**
+		 * Update all dynamic slider elements
+		 */
+		el.redrawSlider = function(){
+			// resize all children in ratio to new screen size
+			slider.children.add(el.find('.bx-clone')).width(getSlideWidth());
+			// adjust the height
+			slider.viewport.css('height', getViewportHeight());
+			// update the slide position
+			if(!slider.settings.ticker) setSlidePosition();
+			// if active.last was true before the screen resize, we want
+			// to keep it last no matter what screen size we end on
+			if (slider.active.last) slider.active.index = getPagerQty() - 1;
+			// if the active index (page) no longer exists due to the resize, simply set the index as last
+			if (slider.active.index >= getPagerQty()) slider.active.last = true;
+			// if a pager is being displayed and a custom pager is not being used, update it
+			if(slider.settings.pager && !slider.settings.pagerCustom){
+				populatePager();
+				updatePagerActive(slider.active.index);
+			}
+		}
+
+		/**
+		 * Destroy the current instance of the slider (revert everything back to original state)
+		 */
+		el.destroySlider = function(){
+			// don't do anything if slider has already been destroyed
+			if(!slider.initialized) return;
+			slider.initialized = false;
+			$('.bx-clone', this).remove();
+			slider.children.each(function() {
+				$(this).data("origStyle") != undefined ? $(this).attr("style", $(this).data("origStyle")) : $(this).removeAttr('style');
+			});
+			$(this).data("origStyle") != undefined ? this.attr("style", $(this).data("origStyle")) : $(this).removeAttr('style');
+			$(this).unwrap().unwrap();
+			if(slider.controls.el) slider.controls.el.remove();
+			if(slider.controls.next) slider.controls.next.remove();
+			if(slider.controls.prev) slider.controls.prev.remove();
+			if(slider.pagerEl && slider.settings.controls) slider.pagerEl.remove();
+			$('.bx-caption', this).remove();
+			if(slider.controls.autoEl) slider.controls.autoEl.remove();
+			clearInterval(slider.interval);
+			if(slider.settings.responsive) $(window).unbind('resize', resizeWindow);
+		}
+
+		/**
+		 * Reload the slider (revert all DOM changes, and re-initialize)
+		 */
+		el.reloadSlider = function(settings){
+			if (settings != undefined) options = settings;
+			el.destroySlider();
+			init();
+		}
+
+		init();
+
+		// returns the current jQuery object
+		return this;
+	}
+
+})(jQuery);
diff --git a/app/assets/javascripts/jquery.easing.1.3.js b/app/assets/javascripts/jquery.easing.1.3.js
new file mode 100755
index 0000000..03b7fb6
--- /dev/null
+++ b/app/assets/javascripts/jquery.easing.1.3.js
@@ -0,0 +1,205 @@
+/*
+ * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
+ *
+ * Uses the built in easing capabilities added In jQuery 1.1
+ * to offer multiple easing options
+ *
+ * TERMS OF USE - jQuery Easing
+ * 
+ * Open source under the BSD License. 
+ * 
+ * Copyright © 2008 George McGinley Smith
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of 
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list 
+ * of conditions and the following disclaimer in the documentation and/or other materials 
+ * provided with the distribution.
+ * 
+ * Neither the name of the author nor the names of contributors may be used to endorse 
+ * or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE. 
+ *
+*/
+
+// t: current time, b: begInnIng value, c: change In value, d: duration
+jQuery.easing['jswing'] = jQuery.easing['swing'];
+
+jQuery.extend( jQuery.easing,
+{
+  def: 'easeOutQuad',
+  swing: function (x, t, b, c, d) {
+    //alert(jQuery.easing.default);
+    return jQuery.easing[jQuery.easing.def](x, t, b, c, d);
+  },
+  easeInQuad: function (x, t, b, c, d) {
+    return c*(t/=d)*t + b;
+  },
+  easeOutQuad: function (x, t, b, c, d) {
+    return -c *(t/=d)*(t-2) + b;
+  },
+  easeInOutQuad: function (x, t, b, c, d) {
+    if ((t/=d/2) < 1) return c/2*t*t + b;
+    return -c/2 * ((--t)*(t-2) - 1) + b;
+  },
+  easeInCubic: function (x, t, b, c, d) {
+    return c*(t/=d)*t*t + b;
+  },
+  easeOutCubic: function (x, t, b, c, d) {
+    return c*((t=t/d-1)*t*t + 1) + b;
+  },
+  easeInOutCubic: function (x, t, b, c, d) {
+    if ((t/=d/2) < 1) return c/2*t*t*t + b;
+    return c/2*((t-=2)*t*t + 2) + b;
+  },
+  easeInQuart: function (x, t, b, c, d) {
+    return c*(t/=d)*t*t*t + b;
+  },
+  easeOutQuart: function (x, t, b, c, d) {
+    return -c * ((t=t/d-1)*t*t*t - 1) + b;
+  },
+  easeInOutQuart: function (x, t, b, c, d) {
+    if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
+    return -c/2 * ((t-=2)*t*t*t - 2) + b;
+  },
+  easeInQuint: function (x, t, b, c, d) {
+    return c*(t/=d)*t*t*t*t + b;
+  },
+  easeOutQuint: function (x, t, b, c, d) {
+    return c*((t=t/d-1)*t*t*t*t + 1) + b;
+  },
+  easeInOutQuint: function (x, t, b, c, d) {
+    if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
+    return c/2*((t-=2)*t*t*t*t + 2) + b;
+  },
+  easeInSine: function (x, t, b, c, d) {
+    return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
+  },
+  easeOutSine: function (x, t, b, c, d) {
+    return c * Math.sin(t/d * (Math.PI/2)) + b;
+  },
+  easeInOutSine: function (x, t, b, c, d) {
+    return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
+  },
+  easeInExpo: function (x, t, b, c, d) {
+    return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
+  },
+  easeOutExpo: function (x, t, b, c, d) {
+    return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
+  },
+  easeInOutExpo: function (x, t, b, c, d) {
+    if (t==0) return b;
+    if (t==d) return b+c;
+    if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
+    return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
+  },
+  easeInCirc: function (x, t, b, c, d) {
+    return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
+  },
+  easeOutCirc: function (x, t, b, c, d) {
+    return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
+  },
+  easeInOutCirc: function (x, t, b, c, d) {
+    if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
+    return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
+  },
+  easeInElastic: function (x, t, b, c, d) {
+    var s=1.70158;var p=0;var a=c;
+    if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+    if (a < Math.abs(c)) { a=c; var s=p/4; }
+    else var s = p/(2*Math.PI) * Math.asin (c/a);
+    return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+  },
+  easeOutElastic: function (x, t, b, c, d) {
+    var s=1.70158;var p=0;var a=c;
+    if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+    if (a < Math.abs(c)) { a=c; var s=p/4; }
+    else var s = p/(2*Math.PI) * Math.asin (c/a);
+    return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
+  },
+  easeInOutElastic: function (x, t, b, c, d) {
+    var s=1.70158;var p=0;var a=c;
+    if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);
+    if (a < Math.abs(c)) { a=c; var s=p/4; }
+    else var s = p/(2*Math.PI) * Math.asin (c/a);
+    if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+    return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
+  },
+  easeInBack: function (x, t, b, c, d, s) {
+    if (s == undefined) s = 1.70158;
+    return c*(t/=d)*t*((s+1)*t - s) + b;
+  },
+  easeOutBack: function (x, t, b, c, d, s) {
+    if (s == undefined) s = 1.70158;
+    return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
+  },
+  easeInOutBack: function (x, t, b, c, d, s) {
+    if (s == undefined) s = 1.70158; 
+    if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
+    return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
+  },
+  easeInBounce: function (x, t, b, c, d) {
+    return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b;
+  },
+  easeOutBounce: function (x, t, b, c, d) {
+    if ((t/=d) < (1/2.75)) {
+      return c*(7.5625*t*t) + b;
+    } else if (t < (2/2.75)) {
+      return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
+    } else if (t < (2.5/2.75)) {
+      return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
+    } else {
+      return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
+    }
+  },
+  easeInOutBounce: function (x, t, b, c, d) {
+    if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
+    return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
+  }
+});
+
+/*
+ *
+ * TERMS OF USE - EASING EQUATIONS
+ * 
+ * Open source under the BSD License. 
+ * 
+ * Copyright © 2001 Robert Penner
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of 
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list 
+ * of conditions and the following disclaimer in the documentation and/or other materials 
+ * provided with the distribution.
+ * 
+ * Neither the name of the author nor the names of contributors may be used to endorse 
+ * or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE. 
+ *
+ */
\ No newline at end of file
diff --git a/app/assets/javascripts/manager.js b/app/assets/javascripts/manager.js
new file mode 100644
index 0000000..2cc2489
--- /dev/null
+++ b/app/assets/javascripts/manager.js
@@ -0,0 +1,174 @@
+var manager_response = "";
+var manager_callback_function = null;
+
+function manager_load() {
+
+  
+  $(document).bind("keydown",function(e) {
+      if (e.keyCode == 27) {
+          manager_hide();
+      }
+  });
+  
+
+  
+}
+
+function manager_show(url){
+  
+  initialize_manager();
+  
+  manager_response = null;
+  $('#manager_box').html("");
+  
+  $("#manager_box_place").show("fast", function (){
+    $("#manager_box_place").addClass("manager_box_place_active");
+    $('#manager_box').load(url, function (){
+      image_files_load();
+        
+    }
+      )
+    
+
+  });
+  
+
+
+
+  
+  
+}
+
+
+function manager_hide(){
+  $("#manager_box_place").removeClass("manager_box_place_active");
+  
+    $("body").css("overflow", "auto");
+    slider_enabled = null;
+
+  
+  
+}
+$(document).ready(function ($) {
+  manager_load();
+  
+  
+  
+  
+});
+
+
+
+function manager_prompt(url, callback) {
+  manager_callback_function = callback;
+  manager_show(url);
+}
+
+function manager_send_response(send_value){
+
+  manager_hide();
+  manager_callback_function(send_value);
+
+
+}
+
+function select_image_from_manager(input_id){
+
+  manager_prompt("/admin/image_files/?manager=true",function(m_return){
+
+    $('#input_'+input_id).val(m_return.image_file_id);
+    $('#img_'+input_id).attr("src",m_return.thumb);
+    $('#name_'+input_id).val(m_return.name);
+    
+  });
+  
+}
+
+function select_gallery_images_from_manager(gallery_content_id){
+  
+  manager_prompt("/admin/image_files/?manager=true&multiple=true",function(m_return){
+
+    $.ajax({url:"/portlet/gallery_images/", type: "POST", data : { image_file_ids : m_return, gallery_content_id : gallery_content_id }});
+
+    
+  });
+  
+}
+
+
+
+function select_file_from_manager(input_id){
+  manager_prompt("/admin/data_files/?manager=true",function(m_return){
+
+    $('#input_'+input_id).val(m_return.data_file_id);
+    
+    $('#name_'+input_id).html(m_return.name);
+    
+  });
+  
+}
+
+
+
+function manager_send_multiple_image_files(){
+
+  
+  
+  manager_send_response(multiple_selection_ids());
+}
+
+
+
+function manager_send_image_file(image_file_id){
+
+
+  var image_file_div = $('#image_file_'+image_file_id);
+  
+  manager_send_response({thumb : image_file_div.attr("data_thumb"), image_file_id : image_file_div.attr("data_id"), name : image_file_div.attr("data_name")});
+}
+
+function manager_send_cible(cible_id, cible_type, cible_name){
+  
+  manager_send_response({cible_id : cible_id, cible_type : cible_type, cible_name : cible_name});
+}
+
+
+function manager_send_data_file(data_file_id){
+
+
+  var data_file_div = $('#data_file_'+data_file_id);
+  
+  manager_send_response({data_file_id : data_file_div.data("id"), name : data_file_div.data("name")});
+}
+
+function select_cible_from_manager(input_id){
+    
+
+    manager_prompt("/admin/cibles/?manager=true",function(m_return){
+  
+    $('#input_id_'+input_id).val(m_return.cible_id);
+    $('#input_type_'+input_id).val(m_return.cible_type);
+    $('#name_'+input_id).val(m_return.cible_name);
+    
+  });
+  
+}
+
+
+
+
+
+function initialize_manager(){
+
+  if($('#manager_box_place').length == 0){
+
+    $('body').prepend('<div id="manager_box_place"><div id="manager_box"></div></div>');
+    
+  }  
+  
+
+  
+  
+  
+}
+
diff --git a/app/assets/javascripts/nested_fields.coffee b/app/assets/javascripts/nested_fields.coffee
new file mode 100644
index 0000000..5e1756f
--- /dev/null
+++ b/app/assets/javascripts/nested_fields.coffee
@@ -0,0 +1,11 @@
+
+@remove_fields = (link) ->
+  $(link).prev("input[type=hidden]").val "1"
+  $(link).closest(".field").hide()
+  false
+@add_fields = (link, association, content) ->
+  new_id = new Date().getTime()
+  regexp = new RegExp("new_" + association, "g")
+  $(link).closest("p").next("." + association + "_form").prepend content.replace(regexp, new_id).replace(association + "_class", "new_field")
+  $(".new_field").removeClass "new_field"
+  false
\ No newline at end of file
diff --git a/app/assets/javascripts/pane_hover.js b/app/assets/javascripts/pane_hover.js
new file mode 100644
index 0000000..b6bff46
--- /dev/null
+++ b/app/assets/javascripts/pane_hover.js
@@ -0,0 +1,55 @@
+
+
+function show_pane_hover(content, width, height, zindex){
+  var width = width || 500;
+  var height = height || 500;
+  var zindex = zindex || 1000;
+  
+  
+  initialize_pane_hover();
+  
+  
+  
+  
+  
+  $('#qi_pane_hover_content').html(content);
+  
+  $('#qi_pane_hover_content').data("height",height);
+  $('#qi_pane_hover_content').css({"width" : width+"px","height" : height+"px","z-index" : zindex, "margin-top":"-"+height+"px"});
+  
+  
+  $('#qi_pane_hover_content .actions').prepend('<a href="#" class="btn btn-default" onclick="close_pane_hover();return false;">Annuler</a>');
+  $('#qi_pane_hover_content').css("display","block").delay(1).css({"-webkit-transition-duration":"0.5s","-moz-transition-duration":"0.5s", "margin-top":"0px"});
+  
+  
+  
+  
+}
+
+
+
+
+function close_pane_hover(){
+  
+  $('#qi_pane_hover_content').css("display","block").delay(1).css({"-webkit-transition-duration":"0.5s","-moz-transition-duration":"0.5s", "margin-top":"-"+$('#qi_pane_hover_content').data("height")+"px"}).delay(500).queue(function() {
+    $('#qi_pane_hover').remove();
+  });
+  
+  
+
+
+  
+}
+
+function initialize_pane_hover(){
+  if($('#qi_pane_hover').length == 0){
+    
+    $('body').append('<div id="qi_pane_hover"><div id="qi_pane_hover_content"></div></div>');
+    
+  }  
+  
+  
+}
+
+
+
diff --git a/app/assets/javascripts/public.js.coffee b/app/assets/javascripts/public.js.coffee
index 34fdb23..69f70ac 100644
--- a/app/assets/javascripts/public.js.coffee
+++ b/app/assets/javascripts/public.js.coffee
@@ -1,35 +1,316 @@
 
 #= require jquery
-
 #= require jquery_ujs
-
-#= require ./shared/jquery.easing.1.3
-#= require ./shared/jquery.fancybox-1.3.4.pack
+#= require jquery.bxslider
+#= require jquery.easing.1.3
 
 
 
 
-$ ->
+@scrollToAnchor = (aid) ->
+  aTag = $("#" + aid )
+  $("html,body").animate({scrollTop: aTag.offset().top}, 1000)
+  return
+
+
+  
+bottom = 0
+prev_link = ""
+
+
+$("document").ready ->
+  
+  position_img_now = ->
+    
+    
+    
+   # alert $("#large .large-img").outerHeight(false)
+    
+    imgheight = $("#large .large-img").outerHeight(false) + $("#large h3").outerHeight(false) 
+    
+     
+    margintop = (( $(window).height() - imgheight) / 2 )
+   
+    $("#large .large-img").css
+      "margin-top" :(margintop+"px")
+      #"width" : "100px"
+
+    
+    
+  position_img = ->
+    $("#large .large-img").one "load", ->
+      
+      position_img_now()
+    
+  
+  
+  $("#video").click ->
+    maxwidth = 1000
+    maxheight = 900
+
+    
+    
+    
+    prev_link = $(this)
+    $("body").append "<div id='large'></div>"
+    title = false
+    
+    
+    
+    $("#large").append "<div class='img_container first' style='width:90%;margin:auto;'></div>"
+    $("#large").append "<img src='/close.png' class='close_link' />"
+    $(".img_container.first").append '<iframe width="1000" height="563" src="//www.youtube.com/embed/ED4b38n4d-U?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>'
+    
+    
+    $(".img_container.first").append "<h3>Vidéo de présentation</h3>"
+      
+    
+    $("#large").fadeIn(500)
+    position_img();
+    if $(window).height() > (maxheight+100)
+      $("#large .large-img").css
+        "max-height" : maxheight
+    else
+      $("#large .large-img").css
+        "max-height" : "85%"
+        
+    if $(window).width() > (maxwidth+100)
+      $("#large .large-img").css
+        "max-width" : maxwidth
+    else
+      $("#large .large-img").css
+        "max-width" : "85%"
+    resize();
+    
+    $("#large .img_container.first").css
+      "padding-top": (($(window).height()- $("#large .img_container.first iframe").height()-50)/ 2)+"px"
+    #position_img();
+    
+    
+    false
+  
+  
+  $(".expandable_image").click ->
+    maxwidth = 1000
+    maxheight = 900
+    
+    
+    
+    
+    prev_link = $(this)
+    $("body").append "<div id='large'></div>"
+    title = false
+    
+    
+    
+    $("#large").append "<div class='img_container first'></div>"
+    $("#large").append "<img src='/close.png' class='close_link' />"
+    $(".img_container.first").append "<img src="+$(this).attr("href")+" class='large-img' />"
+    
+    if $(this).attr "title"
+      title = $(this).attr "title"
+      $(".img_container.first").append "<h3>"+title+"</h3>"
+      
+    $("#large .large-img").one "load", ->
+      $("#large").fadeIn(500)
+    position_img();
+    if $(window).height() > (maxheight+100)
+      $("#large .large-img").css
+        "max-height" : maxheight
+    else
+      $("#large .large-img").css
+        "max-height" : "85%"
+        
+    if $(window).width() > (maxwidth+100)
+      $("#large .large-img").css
+        "max-width" : maxwidth
+    else
+      $("#large .large-img").css
+        "max-width" : "85%"
+    
+    position_img();
+    
+    
+    false
+  
+  
+  $(".rea-gal a").click ->
+    maxwidth = 1000
+    maxheight = 900
+    
+    
+    
+    
+    prev_link = $(this)
+    $("body").append "<div id='large'></div>"
+    title = false
+    
+        
+    $("#large").append "<img src='/arrow-next.png' class='next' />"
+    $("#large").append "<img src='/arrow-prev.png' class='prev' />"
+    $("#large").append "<img src='/close.png' class='close_link' />"
+    
+    $("#large").append "<div class='img_container first'></div>"
+    $(".img_container.first").append "<img src="+$(this).attr("href")+" class='large-img' />"
+    
+    if $(this).attr "title"
+      title = $(this).attr "title"
+      $(".img_container.first").append "<h3>"+title+"</h3>"
+      
+    $("#large .large-img").one "load", ->
+      $("#large").fadeIn(500)
+    position_img();
+    if $(window).height() > (maxheight+100)
+      $("#large .large-img").css
+        "max-height" : maxheight
+    else
+      $("#large .large-img").css
+        "max-height" : "85%"
+        
+    if $(window).width() > (maxwidth+100)
+      $("#large .large-img").css
+        "max-width" : maxwidth
+    else
+      $("#large .large-img").css
+        "max-width" : "85%"
+    
+    position_img();
+    
+    
+    false
+  
+  
+  
+  $("body").on "click", "#large", ->
+    $(this).fadeOut 300, ->
+      $(this).remove()
+    
+    
+  $("body").on "click" ,"#large .prev",->
+    
+    if prev_link.prev("a").length > 0
+      link = prev_link.closest("a").prev("a")
+      
+      
+      
+    else
+      link = prev_link.closest("div").children("a:last")
+    
+   
+    #titre = photo.find("h3")
+    $(".img_container.first").fadeOut 300, ->
+      $("#large h3").remove()
+      if link.attr "title"
+        title = link.attr "title"
+        $(".img_container.first").append "<h3>"+title+"</h3>"
+      
+      
+      $('#large .large-img').attr("src", link.attr("href"))
+      $("#large .large-img").one "load", ->
+        $(".img_container.first").fadeIn()
+      position_img();
+    prev_link = link
+    
+    false
+  
+  
+  $("body").on "click" ,"#large .next",->
+    
+    if prev_link.next("a").length > 0
+      link = prev_link.closest("a").next("a")
+      
+      
+      
+    else
+      link = prev_link.closest("div").children("a:first")
+    
+   
+    #titre = photo.find("h3")
+    
+    $(".img_container.first").fadeOut 300, ->
+      $("#large h3").remove()
+      if link.attr "title"
+        title = link.attr "title"
+        $(".img_container.first").append "<h3>"+title+"</h3>"
+      
+      $('#large .large-img').attr("src", link.attr("href"))
+      $("#large .large-img").one "load", ->
+        $(".img_container.first").fadeIn()
+      position_img();
+    prev_link = link
+    
+    false
+  
+  
+  $('.gal').bxSlider
+    adaptiveHeight: true,
+    auto: true,
+    speed:1000,
+    pause:5000,
+
+  
+  
+
+  left =0
+  
+  top = 0
+  offset= 0
+  
+  resize = ->
+    
+    $("iframe").each ->
+      $(this).css
+        "height" : Math.round($(this).width()/ 1.77)+"px"
+    
+    if $(window).width() > 1250
+      $(".infos .main").css
+        "position" : "static"
+      $(".bottom_image").css
+        "left" : "0px"
+        
+    else
+      $(".infos .main").css
+        "position" : "relative"
+      $(".bottom_image").css
+        "left" : "-120px"
+        
+    $(".rea-gal").each ->
+      
+      $(this).find("img").css "width", Math.floor(((100) )/ 5)+"%"
+    
+    
+    $("#large").css "min-height", ($(window).height()-30)+"px"
+  
+    $(".bxslider").each ->
+      
+    
+      height = ($(window).height())
+      optimal_height = Math.round($(this).width()/ $(this).data("ratio"))
+      if optimal_height < height
+        height = optimal_height
+  
+      $(this).find("li").css("max-height", height+"px")
+
+    
+    position_img_now();
+  
+    
+    
+    
+  
+  resize()
+  $('.bxslider').bxSlider
+    mode: 'fade'
+    captions: true
+    auto: true
+  resize()
+  $(window).on "resize", ->
+    resize()
+    
+  
+  
+
+  
+
 
-	
-	
-	$("a[rel^='prettyPhoto']").fancybox()
 
-	$("#legals").click ->
-		
-		$('#legals_large').toggle()
-		$('#legals_large .content').css("margin-top",( ($(window).height()-$("#legals_large .content").height())/2)+"px")
-		return false
-		
-	$("#legals_large").click ->
-		
-		$('#legals_large').toggle();
-		return false
-		
-		
-	$("#legals_large a").click ->
-		
-		$('#legals_large').toggle();
-		return false
-		
-	
\ No newline at end of file
diff --git a/app/assets/javascripts/redactor.js b/app/assets/javascripts/redactor.js
index 41fae96..fe77a60 100755
--- a/app/assets/javascripts/redactor.js
+++ b/app/assets/javascripts/redactor.js
@@ -1,6 +1,6 @@
 /*
-	Redactor v10.0.5
-	Updated: November 18, 2014
+	Redactor v10.0.1
+	Updated: October 6, 2014
 
 	http://imperavi.com/redactor/
 
@@ -94,13 +94,11 @@
 
 	// Functionality
 	$.Redactor = Redactor;
-	$.Redactor.VERSION = '10.0.5';
-	$.Redactor.modules = ['alignment', 'autosave', 'block', 'buffer', 'build', 'button',
-						  'caret', 'clean', 'code', 'core', 'dropdown', 'file', 'focus',
-						  'image', 'indent', 'inline', 'insert', 'keydown', 'keyup',
-						  'lang', 'line', 'link', 'list', 'modal', 'observe', 'paragraphize',
-						  'paste', 'placeholder', 'progress', 'selection', 'shortcuts',
-						  'tabifier', 'tidy',  'toolbar', 'upload', 'utils'];
+	$.Redactor.VERSION = '10.0.1';
+	$.Redactor.modules = ['core', 'build', 'lang', 'toolbar', 'button', 'dropdown', 'code',
+						  'clean', 'tidy', 'paragraphize', 'tabifier', 'focus', 'placeholder', 'autosave', 'buffer', 'indent', 'alignment', 'paste',
+						  'keydown', 'keyup', 'shortcuts', 'line', 'list', 'block', 'inline', 'insert', 'caret', 'selection', 'observe',
+						  'link', 'image', 'file', 'modal', 'progress', 'upload', 'utils'];
 
 	$.Redactor.opts = {
 
@@ -425,676 +423,93 @@
 			}
 		},
 
-		alignment: function()
+		core: function()
 		{
 			return {
-				left: function()
+				getObject: function()
 				{
-					this.alignment.set('');
+					return $.extend({}, this);
 				},
-				right: function()
+				getEditor: function()
 				{
-					this.alignment.set('right');
+					return this.$editor;
 				},
-				center: function()
+				getBox: function()
 				{
-					this.alignment.set('center');
+					return this.$box;
 				},
-				justify: function()
+				getElement: function()
 				{
-					this.alignment.set('justify');
+					return this.$element;
 				},
-				set: function(type)
+				getTextarea: function()
 				{
-					if (!this.utils.browser('msie')) this.$editor.focus();
-
-					this.buffer.set();
-					this.selection.save();
-
-					this.alignment.blocks = this.selection.getBlocks();
-					if (this.opts.linebreaks && this.alignment.blocks[0] === false)
+					return this.$textarea;
+				},
+				getToolbar: function()
+				{
+					return (this.$toolbar) ? this.$toolbar : false;
+				},
+				addEvent: function(name)
+				{
+					this.core.event = name;
+				},
+				getEvent: function()
+				{
+					return this.core.event;
+				},
+				setCallback: function(type, e, data)
+				{
+					var callback = this.opts[type + 'Callback'];
+					if ($.isFunction(callback))
 					{
-						this.alignment.setText(type);
+						return (typeof data == 'undefined') ? callback.call(this, e) : callback.call(this, e, data);
 					}
 					else
 					{
-						this.alignment.setBlocks(type);
-					}
-
-					this.selection.restore();
-					this.code.sync();
-				},
-				setText: function(type)
-				{
-					var wrapper = this.selection.wrap('div');
-					$(wrapper).attr('data-tagblock', 'redactor');
-					$(wrapper).css('text-align', type);
-				},
-				setBlocks: function(type)
-				{
-					$.each(this.alignment.blocks, $.proxy(function(i, el)
-					{
-						var $el = this.utils.getAlignmentElement(el);
-
-						if (!$el) return;
-
-						if (type === '' && typeof($el.data('tagblock')) !== 'undefined')
-						{
-							$el.replaceWith($el.html());
-						}
-						else
-						{
-							$el.css('text-align', type);
-							this.utils.removeEmptyAttr($el, 'style');
-						}
-
-
-					}, this));
-				}
-			};
-		},
-		autosave: function()
-		{
-			return {
-				enable: function()
-				{
-					if (!this.opts.autosave) return;
-
-					this.autosave.html = false;
-					this.autosave.name = (this.opts.autosaveName) ? this.opts.autosaveName : this.$textarea.attr('name');
-
-					if (!this.opts.autosaveOnChange)
-					{
-						this.autosaveInterval = setInterval($.proxy(this.autosave.load, this), this.opts.autosaveInterval * 1000);
+						return (typeof data == 'undefined') ? e : data;
 					}
 				},
-				onChange: function()
+				destroy: function()
 				{
-					if (!this.opts.autosaveOnChange) return;
+					this.core.setCallback('destroy');
+
+					// off events and remove data
+					this.$element.off('.redactor').removeData('redactor');
+					this.$editor.off('.redactor');
+
+					// common
+					this.$editor.removeClass('redactor-editor redactor-linebreaks redactor-placeholder');
+					this.$editor.removeAttr('contenteditable');
 
-					this.autosave.load();
-				},
-				load: function()
-				{
 					var html = this.code.get();
-					if (this.autosave.html === html) return;
-					if (this.utils.isEmpty(html)) return;
 
-					$.ajax({
-						url: this.opts.autosave,
-						type: 'post',
-						data: 'name=' + this.autosave.name + '&' + this.autosave.name + '=' + escape(encodeURIComponent(html)),
-						success: $.proxy(function(data)
-						{
-							this.autosave.success(data, html);
-
-						}, this)
-					});
-				},
-				success: function(data, html)
-				{
-					var json;
-					try
+					if (this.build.isTextarea())
 					{
-						json = $.parseJSON(data);
+						this.$box.after(this.$element);
+						this.$box.remove();
+						this.$element.val(html).show();
 					}
-					catch(e)
+					else
 					{
-						//data has already been parsed
-						json = data;
+						this.$box.after(this.$editor);
+						this.$box.remove();
+						this.$element.html(html).show();
 					}
 
-					var callbackName = (typeof json.error == 'undefined') ? 'autosave' :  'autosaveError';
+					// paste box
+					if (this.$pasteBox) this.$pasteBox.remove();
 
-					this.core.setCallback(callbackName, this.autosave.name, json);
-					this.autosave.html = html;
-				},
-				disable: function()
-				{
+					// modal
+					if (this.$modalBox) this.$modalBox.remove();
+					if (this.$modalOverlay) this.$modalOverlay.remove();
+
+					// buttons tooltip
+					$('.redactor-toolbar-tooltip').remove();
+
+					// autosave
 					clearInterval(this.autosaveInterval);
-				}
-			};
-		},
-		block: function()
-		{
-			return {
-				formatting: function(name)
-				{
-					var type, value;
 
-					if (typeof this.formatting[name].data != 'undefined') type = 'data';
-					else if (typeof this.formatting[name].attr != 'undefined') type = 'attr';
-					else if (typeof this.formatting[name].class != 'undefined') type = 'class';
-
-					if (type) value = this.formatting[name][type];
-
-					this.block.format(this.formatting[name].tag, type, value);
-
-				},
-				format: function(tag, type, value)
-				{
-					if (tag == 'quote') tag = 'blockquote';
-
-					var formatTags = ['p', 'pre', 'blockquote', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
-					if ($.inArray(tag, formatTags) == -1) return;
-
-					this.block.isRemoveInline = (tag == 'pre' || tag.search(/h[1-6]/i) != -1);
-
-					// focus
-					if (!this.utils.browser('msie')) this.$editor.focus();
-
-					this.block.blocks = this.selection.getBlocks();
-
-					this.block.blocksSize = this.block.blocks.length;
-					this.block.type = type;
-					this.block.value = value;
-
-					this.buffer.set();
-					this.selection.save();
-
-					this.block.set(tag);
-
-					this.selection.restore();
-					this.code.sync();
-
-				},
-				set: function(tag)
-				{
-					this.selection.get();
-					this.block.containerTag = this.range.commonAncestorContainer.tagName;
-
-					if (this.range.collapsed)
-					{
-						this.block.setCollapsed(tag);
-					}
-					else
-					{
-						this.block.setMultiple(tag);
-					}
-				},
-				setCollapsed: function(tag)
-				{
-					var block = this.block.blocks[0];
-					if (block === false) return;
-
-					if (block.tagName == 'LI')
-					{
-						if (tag != 'blockquote') return;
-
-						this.block.formatListToBlockquote();
-						return;
-					}
-
-					var isContainerTable = (this.block.containerTag  == 'TD' || this.block.containerTag  == 'TH');
-					if (isContainerTable && !this.opts.linebreaks)
-					{
-
-						document.execCommand('formatblock', false, '<' + tag + '>');
-
-						block = this.selection.getBlock();
-						this.block.toggle($(block));
-
-					}
-					else if (block.tagName.toLowerCase() != tag)
-					{
-						if (this.opts.linebreaks && tag == 'p')
-						{
-							$(block).prepend('<br>').append('<br>');
-							this.utils.replaceWithContents(block);
-						}
-						else
-						{
-							var $formatted = this.utils.replaceToTag(block, tag);
-
-							this.block.toggle($formatted);
-
-							if (tag != 'p' && tag != 'blockquote') $formatted.find('img').remove();
-							if (this.block.isRemoveInline) this.utils.removeInlineTags($formatted);
-							if (tag == 'p' || this.block.headTag) $formatted.find('p').contents().unwrap();
-
-							this.block.formatTableWrapping($formatted);
-						}
-					}
-					else if (tag == 'blockquote' && block.tagName.toLowerCase() == tag)
-					{
-						// blockquote off
-						if (this.opts.linebreaks)
-						{
-							$(block).prepend('<br>').append('<br>');
-							this.utils.replaceWithContents(block);
-						}
-						else
-						{
-							var $el = this.utils.replaceToTag(block, 'p');
-							this.block.toggle($el);
-						}
-					}
-					else if (block.tagName.toLowerCase() == tag)
-					{
-						this.block.toggle($(block));
-					}
-
-				},
-				setMultiple: function(tag)
-				{
-					var block = this.block.blocks[0];
-					var isContainerTable = (this.block.containerTag  == 'TD' || this.block.containerTag  == 'TH');
-
-					if (block !== false && this.block.blocksSize === 1)
-					{
-						if (block.tagName.toLowerCase() == tag &&  tag == 'blockquote')
-						{
-							// blockquote off
-							if (this.opts.linebreaks)
-							{
-								$(block).prepend('<br>').append('<br>');
-								this.utils.replaceWithContents(block);
-							}
-							else
-							{
-								var $el = this.utils.replaceToTag(block, 'p');
-								this.block.toggle($el);
-							}
-						}
-						else if (block.tagName == 'LI')
-						{
-							if (tag != 'blockquote') return;
-
-							this.block.formatListToBlockquote();
-						}
-						else if (this.block.containerTag == 'BLOCKQUOTE')
-						{
-							this.block.formatBlockquote(tag);
-						}
-						else if (this.opts.linebreaks && ((isContainerTable) || (this.range.commonAncestorContainer != block)))
-						{
-							this.block.formatWrap(tag);
-						}
-						else
-						{
-							if (this.opts.linebreaks && tag == 'p')
-							{
-								$(block).prepend('<br>').append('<br>');
-								this.utils.replaceWithContents(block);
-							}
-							else if (block.tagName === 'TD')
-							{
-								this.block.formatWrap(tag);
-							}
-							else
-							{
-								var $formatted = this.utils.replaceToTag(block, tag);
-
-								this.block.toggle($formatted);
-
-								if (this.block.isRemoveInline) this.utils.removeInlineTags($formatted);
-								if (tag == 'p' || this.block.headTag) $formatted.find('p').contents().unwrap();
-							}
-						}
-					}
-					else
-					{
-						if (this.opts.linebreaks || tag != 'p')
-						{
-							if (tag == 'blockquote')
-							{
-								var count = 0;
-								for (var i = 0; i < this.block.blocksSize; i++)
-								{
-									if (this.block.blocks[i].tagName == 'BLOCKQUOTE') count++;
-								}
-
-								// only blockquote selected
-								if (count == this.block.blocksSize)
-								{
-									$.each(this.block.blocks, $.proxy(function(i,s)
-									{
-										if (this.opts.linebreaks)
-										{
-											$(s).prepend('<br>').append('<br>');
-											this.utils.replaceWithContents(s);
-										}
-										else
-										{
-											this.utils.replaceToTag(s, 'p');
-										}
-
-									}, this));
-
-									return;
-								}
-
-							}
-
-							this.block.formatWrap(tag);
-						}
-						else
-						{
-							var classSize = 0;
-							var toggleType = false;
-							if (this.block.type == 'class')
-							{
-								toggleType = 'toggle';
-								classSize = $(this.block.blocks).filter('.' + this.block.value).size();
-
-								if (this.block.blocksSize == classSize) toggleType = 'toggle';
-								else if (this.block.blocksSize > classSize) toggleType = 'set';
-								else if (classSize === 0) toggleType = 'set';
-
-							}
-
-							var exceptTags = ['ul', 'ol', 'li', 'td', 'th', 'dl', 'dt', 'dd'];
-							$.each(this.block.blocks, $.proxy(function(i,s)
-							{
-								if ($.inArray(s.tagName.toLowerCase(), exceptTags) != -1) return;
-
-								var $formatted = this.utils.replaceToTag(s, tag);
-
-								if (toggleType)
-								{
-									if (toggleType == 'toggle') this.block.toggle($formatted);
-									else if (toggleType == 'remove') this.block.remove($formatted);
-									else if (toggleType == 'set') this.block.setForce($formatted);
-								}
-								else this.block.toggle($formatted);
-
-								if (tag != 'p' && tag != 'blockquote') $formatted.find('img').remove();
-								if (this.block.isRemoveInline) this.utils.removeInlineTags($formatted);
-								if (tag == 'p' || this.block.headTag) $formatted.find('p').contents().unwrap();
-
-
-							}, this));
-						}
-					}
-				},
-				setForce: function($el)
-				{
-					if (this.block.type == 'class')
-					{
-						$el.addClass(this.block.value);
-						return;
-					}
-					else if (this.block.type == 'attr' || this.block.type == 'data')
-					{
-						$el.attr(this.block.value.name, this.block.value.value);
-						return;
-					}
-				},
-				toggle: function($el)
-				{
-					if (this.block.type == 'class')
-					{
-						$el.toggleClass(this.block.value);
-						return;
-					}
-					else if (this.block.type == 'attr' || this.block.type == 'data')
-					{
-						if ($el.attr(this.block.value.name) == this.block.value.value)
-						{
-							$el.removeAttr(this.block.value.name);
-						}
-						else
-						{
-							$el.attr(this.block.value.name, this.block.value.value);
-						}
-
-						return;
-					}
-					else
-					{
-						$el.removeAttr('style class');
-						return;
-					}
-				},
-				remove: function($el)
-				{
-					$el.removeClass(this.block.value);
-				},
-				formatListToBlockquote: function()
-				{
-					var block = $(this.block.blocks[0]).closest('ul, ol');
-
-					$(block).find('ul, ol').contents().unwrap();
-					$(block).find('li').append($('<br>')).contents().unwrap();
-
-					var $el = this.utils.replaceToTag(block, 'blockquote');
-					this.block.toggle($el);
-				},
-				formatBlockquote: function(tag)
-				{
-					document.execCommand('outdent');
-					document.execCommand('formatblock', false, tag);
-
-					this.clean.clearUnverified();
-					this.$editor.find('p:empty').remove();
-
-					var formatted = this.selection.getBlock();
-
-					if (tag != 'p')
-					{
-						$(formatted).find('img').remove();
-					}
-
-					if (!this.opts.linebreaks)
-					{
-						this.block.toggle($(formatted));
-					}
-
-					this.$editor.find('ul, ol, tr, blockquote, p').each($.proxy(this.utils.removeEmpty, this));
-
-					if (this.opts.linebreaks && tag == 'p')
-					{
-						this.utils.replaceWithContents(formatted);
-					}
-
-				},
-				formatWrap: function(tag)
-				{
-					if (this.block.containerTag == 'UL' || this.block.containerTag == 'OL')
-					{
-						if (tag == 'blockquote')
-						{
-							this.block.formatListToBlockquote();
-						}
-						else
-						{
-							return;
-						}
-					}
-
-					var formatted = this.selection.wrap(tag);
-					if (formatted === false) return;
-
-					var $formatted = $(formatted);
-
-					this.block.formatTableWrapping($formatted);
-
-					var $elements = $formatted.find(this.opts.blockLevelElements.join(',') + ', td, table, thead, tbody, tfoot, th, tr');
-
-					if ((this.opts.linebreaks && tag == 'p') || tag == 'pre' || tag == 'blockquote')
-					{
-						$elements.append('<br />');
-					}
-
-					$elements.contents().unwrap();
-
-					if (tag != 'p' && tag != 'blockquote') $formatted.find('img').remove();
-
-					$.each(this.block.blocks, $.proxy(this.utils.removeEmpty, this));
-
-					$formatted.append(this.selection.getMarker(2));
-
-					if (!this.opts.linebreaks)
-					{
-						this.block.toggle($formatted);
-					}
-
-					this.$editor.find('ul, ol, tr, blockquote, p').each($.proxy(this.utils.removeEmpty, this));
-					$formatted.find('blockquote:empty').remove();
-
-					if (this.block.isRemoveInline)
-					{
-						this.utils.removeInlineTags($formatted);
-					}
-
-					if (this.opts.linebreaks && tag == 'p')
-					{
-						this.utils.replaceWithContents($formatted);
-					}
-
-				},
-				formatTableWrapping: function($formatted)
-				{
-					if ($formatted.closest('table').size() === 0) return;
-
-					if ($formatted.closest('tr').size() === 0) $formatted.wrap('<tr>');
-					if ($formatted.closest('td').size() === 0 && $formatted.closest('th').size() === 0)
-					{
-						$formatted.wrap('<td>');
-					}
-				},
-				removeData: function(name, value)
-				{
-					var blocks = this.selection.getBlocks();
-					$(blocks).removeAttr('data-' + name);
-
-					this.code.sync();
-				},
-				setData: function(name, value)
-				{
-					var blocks = this.selection.getBlocks();
-					$(blocks).attr('data-' + name, value);
-
-					this.code.sync();
-				},
-				toggleData: function(name, value)
-				{
-					var blocks = this.selection.getBlocks();
-					$.each(blocks, function()
-					{
-						if ($(this).attr('data-' + name))
-						{
-							$(this).removeAttr('data-' + name);
-						}
-						else
-						{
-							$(this).attr('data-' + name, value);
-						}
-					});
-				},
-				removeAttr: function(attr, value)
-				{
-					var blocks = this.selection.getBlocks();
-					$(blocks).removeAttr(attr);
-
-					this.code.sync();
-				},
-				setAttr: function(attr, value)
-				{
-					var blocks = this.selection.getBlocks();
-					$(blocks).attr(attr, value);
-
-					this.code.sync();
-				},
-				toggleAttr: function(attr, value)
-				{
-					var blocks = this.selection.getBlocks();
-					$.each(blocks, function()
-					{
-						if ($(this).attr(name))
-						{
-							$(this).removeAttr(name);
-						}
-						else
-						{
-							$(this).attr(name, value);
-						}
-					});
-				},
-				removeClass: function(className)
-				{
-					var blocks = this.selection.getBlocks();
-					$(blocks).removeClass(className);
-
-					this.utils.removeEmptyAttr(blocks, 'class');
-
-					this.code.sync();
-				},
-				setClass: function(className)
-				{
-					var blocks = this.selection.getBlocks();
-					$(blocks).addClass(className);
-
-					this.code.sync();
-				},
-				toggleClass: function(className)
-				{
-					var blocks = this.selection.getBlocks();
-					$(blocks).toggleClass(className);
-
-					this.code.sync();
-				}
-			};
-		},
-		buffer: function()
-		{
-			return {
-				set: function(type)
-				{
-					if (typeof type == 'undefined' || type == 'undo')
-					{
-						this.buffer.setUndo();
-					}
-					else
-					{
-						this.buffer.setRedo();
-					}
-				},
-				setUndo: function()
-				{
-					this.selection.save();
-					this.opts.buffer.push(this.$editor.html());
-					this.selection.restore();
-				},
-				setRedo: function()
-				{
-					this.selection.save();
-					this.opts.rebuffer.push(this.$editor.html());
-					this.selection.restore();
-				},
-				getUndo: function()
-				{
-					this.$editor.html(this.opts.buffer.pop());
-				},
-				getRedo: function()
-				{
-					this.$editor.html(this.opts.rebuffer.pop());
-				},
-				add: function()
-				{
-					this.opts.buffer.push(this.$editor.html());
-				},
-				undo: function()
-				{
-					if (this.opts.buffer.length === 0) return;
-
-					this.buffer.set('redo');
-					this.buffer.getUndo();
-
-					this.selection.restore();
-
-					setTimeout($.proxy(this.observe.load, this), 50);
-				},
-				redo: function()
-				{
-					if (this.opts.rebuffer.length === 0) return;
-
-					this.buffer.set('undo');
-					this.buffer.getRedo();
-
-					this.selection.restore();
-
-					setTimeout($.proxy(this.observe.load, this), 50);
 				}
 			};
 		},
@@ -1226,18 +641,11 @@
 
 						if (window.FormData === undefined || !e.dataTransfer) return true;
 
-						var length = e.dataTransfer.files.length;
-						if (length === 0)
-						{
-							this.code.sync();
-							setTimeout($.proxy(this.clean.clearUnverified, this), 1);
-							this.core.setCallback('drop', e);
-
-							return true;
-						}
+					    var length = e.dataTransfer.files.length;
+					    if (length === 0) return true;
 						else
 						{
-							e.preventDefault();
+						    e.preventDefault();
 
 							if (this.opts.dragImageUpload || this.opts.dragFileUpload)
 							{
@@ -1333,30 +741,24 @@
 
 					$.each(this.opts.plugins, $.proxy(function(i, s)
 					{
-						if (typeof RedactorPlugins[s] === 'undefined') return;
-
-						if ($.inArray(s, $.Redactor.modules) !== -1)
+						if (RedactorPlugins[s])
 						{
-							$.error('Plugin name "' + s + '" matches the name of the Redactor\'s module.');
-							return;
+							if (!$.isFunction(RedactorPlugins[s])) return;
+
+							this[s] = RedactorPlugins[s]();
+
+							var methods = this.getModuleMethods(this[s]);
+							var len = methods.length;
+
+							// bind methods
+							for (var z = 0; z < len; z++)
+							{
+								this[s][methods[z]] = this[s][methods[z]].bind(this);
+							}
+
+							if ($.isFunction(this[s].init)) this[s].init();
 						}
 
-						if (!$.isFunction(RedactorPlugins[s])) return;
-
-						this[s] = RedactorPlugins[s]();
-
-						var methods = this.getModuleMethods(this[s]);
-						var len = methods.length;
-
-						// bind methods
-						for (var z = 0; z < len; z++)
-						{
-							this[s][methods[z]] = this[s][methods[z]].bind(this);
-						}
-
-						if ($.isFunction(this[s].init)) this[s].init();
-
-
 					}, this));
 
 
@@ -1373,12 +775,369 @@
 				}
 			};
 		},
+		lang: function()
+		{
+			return {
+				load: function()
+				{
+					this.opts.curLang = this.opts.langs[this.opts.lang];
+				},
+				get: function(name)
+				{
+					return (typeof this.opts.curLang[name] != 'undefined') ? this.opts.curLang[name] : '';
+				}
+			};
+		},
+		toolbar: function()
+		{
+			return {
+				init: function()
+				{
+					return {
+						html:
+						{
+							title: this.lang.get('html'),
+							func: 'code.toggle'
+						},
+						formatting:
+						{
+							title: this.lang.get('formatting'),
+							dropdown:
+							{
+								p:
+								{
+									title: this.lang.get('paragraph'),
+									func: 'block.format'
+								},
+								blockquote:
+								{
+									title: this.lang.get('quote'),
+									func: 'block.format'
+								},
+								pre:
+								{
+									title: this.lang.get('code'),
+									func: 'block.format'
+								},
+								h1:
+								{
+									title: this.lang.get('header1'),
+									func: 'block.format'
+								},
+								h2:
+								{
+									title: this.lang.get('header2'),
+									func: 'block.format'
+								},
+								h3:
+								{
+									title: this.lang.get('header3'),
+									func: 'block.format'
+								},
+								h4:
+								{
+									title: this.lang.get('header4'),
+									func: 'block.format'
+								},
+								h5:
+								{
+									title: this.lang.get('header5'),
+									func: 'block.format'
+								}
+							}
+						},
+						bold:
+						{
+							title: this.lang.get('bold'),
+							func: 'inline.format'
+						},
+						italic:
+						{
+							title: this.lang.get('italic'),
+							func: 'inline.format'
+						},
+						deleted:
+						{
+							title: this.lang.get('deleted'),
+							func: 'inline.format'
+						},
+						underline:
+						{
+							title: this.lang.get('underline'),
+							func: 'inline.format'
+						},
+						unorderedlist:
+						{
+							title: '&bull; ' + this.lang.get('unorderedlist'),
+							func: 'list.toggle'
+						},
+						orderedlist:
+						{
+							title: '1. ' + this.lang.get('orderedlist'),
+							func: 'list.toggle'
+						},
+						outdent:
+						{
+							title: '< ' + this.lang.get('outdent'),
+							func: 'indent.decrease'
+						},
+						indent:
+						{
+							title: '> ' + this.lang.get('indent'),
+							func: 'indent.increase'
+						},
+						image:
+						{
+							title: this.lang.get('image'),
+							func: 'image.show'
+						},
+						file:
+						{
+							title: this.lang.get('file'),
+							func: 'file.show'
+						},
+						link:
+						{
+							title: this.lang.get('link'),
+							dropdown:
+							{
+								link:
+								{
+									title: this.lang.get('link_insert'),
+									func: 'link.show'
+								},
+								unlink:
+								{
+									title: this.lang.get('unlink'),
+									func: 'link.unlink'
+								}
+							}
+						},
+						alignment:
+						{
+							title: this.lang.get('alignment'),
+							dropdown:
+							{
+								left:
+								{
+									title: this.lang.get('align_left'),
+									func: 'alignment.left'
+								},
+								center:
+								{
+									title: this.lang.get('align_center'),
+									func: 'alignment.center'
+								},
+								right:
+								{
+									title: this.lang.get('align_right'),
+									func: 'alignment.right'
+								},
+								justify:
+								{
+									title: this.lang.get('align_justify'),
+									func: 'alignment.justify'
+								}
+							}
+						},
+						horizontalrule:
+						{
+							title: this.lang.get('horizontalrule'),
+							func: 'line.insert'
+						}
+					};
+				},
+				build: function()
+				{
+					this.toolbar.hideButtons();
+					this.toolbar.hideButtonsOnMobile();
+					this.toolbar.isButtonSourceNeeded();
+
+					if (this.opts.buttons.length === 0) return;
+
+					this.$toolbar = this.toolbar.createContainer();
+
+					this.toolbar.setOverflow();
+					this.toolbar.append();
+					this.toolbar.setFormattingTags();
+					this.toolbar.loadButtons();
+					this.toolbar.setTabindex();
+					this.toolbar.setFixed();
+
+					// buttons response
+					if (this.opts.activeButtons)
+					{
+						this.$editor.on('mouseup.redactor keyup.redactor focus.redactor', $.proxy(this.observe.buttons, this));
+					}
+
+				},
+				createContainer: function()
+				{
+					return $('<ul>').addClass('redactor-toolbar').attr('id', 'redactor-toolbar-' + this.uuid);
+				},
+				setFormattingTags: function()
+				{
+					$.each(this.opts.toolbar.formatting.dropdown, $.proxy(function (i, s)
+					{
+						if ($.inArray(i, this.opts.formatting) == -1) delete this.opts.toolbar.formatting.dropdown[i];
+					}, this));
+
+				},
+				loadButtons: function()
+				{
+					$.each(this.opts.buttons, $.proxy(function(i, btnName)
+					{
+						if (!this.opts.toolbar[btnName]) return;
+
+						if (this.opts.fileUpload === false && btnName === 'file') return true;
+						if ((this.opts.imageUpload === false && this.opts.s3 === false) && btnName === 'image') return true;
+
+						var btnObject = this.opts.toolbar[btnName];
+						this.$toolbar.append($('<li>').append(this.button.build(btnName, btnObject)));
+
+					}, this));
+				},
+				append: function()
+				{
+					if (this.opts.toolbarExternal)
+					{
+						this.$toolbar.addClass('redactor-toolbar-external');
+						$(this.opts.toolbarExternal).html(this.$toolbar);
+					}
+					else
+					{
+						this.$box.prepend(this.$toolbar);
+					}
+				},
+				setFixed: function()
+				{
+					if (this.utils.isMobile()) return;
+					if (this.opts.toolbarExternal) return;
+					if (!this.opts.toolbarFixed) return;
+
+					this.toolbar.observeScroll();
+					$(this.opts.toolbarFixedTarget).on('scroll.redactor', $.proxy(this.toolbar.observeScroll, this));
+
+				},
+				setTabindex: function()
+				{
+					this.$toolbar.find('a').attr('tabindex', '-1');
+				},
+				setOverflow: function()
+				{
+					if (this.utils.isMobile() && this.opts.toolbarOverflow)
+					{
+						this.$toolbar.addClass('redactor-toolbar-overflow');
+					}
+				},
+				isButtonSourceNeeded: function()
+				{
+					if (this.opts.buttonSource) return;
+
+					var index = this.opts.buttons.indexOf('html');
+					if (index !== -1)
+					{
+						this.opts.buttons.splice(index, 1);
+					}
+				},
+				hideButtons: function()
+				{
+					if (this.opts.buttonsHide.length === 0) return;
+
+					$.each(this.opts.buttonsHide, $.proxy(function(i, s)
+					{
+						var index = this.opts.buttons.indexOf(s);
+						this.opts.buttons.splice(index, 1);
+
+					}, this));
+				},
+				hideButtonsOnMobile: function()
+				{
+					if (!this.utils.isMobile() && this.opts.buttonsHideOnMobile.length === 0) return;
+
+					$.each(this.opts.buttonsHideOnMobile, $.proxy(function(i, s)
+					{
+						var index = this.opts.buttons.indexOf(s);
+						this.opts.buttons.splice(index, 1);
+
+					}, this));
+				},
+				observeScroll: function()
+				{
+					var scrollTop = $(this.opts.toolbarFixedTarget).scrollTop();
+					var boxTop = 1;
+
+					if (this.opts.toolbarFixedTarget === document)
+					{
+						boxTop = this.$box.offset().top;
+					}
+
+					if (scrollTop > boxTop)
+					{
+						this.toolbar.observeScrollEnable(scrollTop, boxTop);
+					}
+					else
+					{
+						this.toolbar.observeScrollDisable();
+					}
+				},
+				observeScrollEnable: function(scrollTop, boxTop)
+				{
+					var top = this.opts.toolbarFixedTopOffset + scrollTop - boxTop;
+					var left = 0;
+					var end = boxTop + this.$box.height() + 30;
+					var width = this.$box.innerWidth();
+
+					this.$toolbar.addClass('toolbar-fixed-box');
+					this.$toolbar.css({
+						position: 'absolute',
+						width: width,
+						top: top + 'px',
+						left: left
+					});
+
+					this.toolbar.setDropdownsFixed();
+					this.$toolbar.css('visibility', (scrollTop < end) ? 'visible' : 'hidden');
+				},
+				observeScrollDisable: function()
+				{
+					this.$toolbar.css({
+						position: 'relative',
+						width: 'auto',
+						top: 0,
+						left: 0,
+						visibility: 'visible'
+					});
+
+					this.toolbar.unsetDropdownsFixed();
+					this.$toolbar.removeClass('toolbar-fixed-box');
+
+				},
+				setDropdownsFixed: function()
+				{
+					var self = this;
+					$('.redactor-dropdown').each(function()
+					{
+						$(this).css({ position: 'fixed', top: self.$toolbar.innerHeight() + self.opts.toolbarFixedTopOffset });
+					});
+				},
+				unsetDropdownsFixed: function()
+				{
+					var self = this;
+					$('.redactor-dropdown').each(function()
+					{
+						var top = (self.$toolbar.innerHeight() + self.$toolbar.offset().top) + 'px';
+						$(this).css({ position: 'absolute', top: top });
+					});
+				}
+			};
+		},
 		button: function()
 		{
 			return {
 				build: function(btnName, btnObject)
 				{
-					var $button = $('<a href="#" class="re-icon re-' + btnName + '" rel="' + btnName + '" />').attr('tabindex', '-1');
+					var $button = $('<a href="#" class="re-icon re-' + btnName + '" rel="' + btnName + '" />');
 
 					if (btnObject.func || btnObject.command || btnObject.dropdown)
 					{
@@ -1448,8 +1207,6 @@
 				},
 				onClick: function(e, btnName, type, callback)
 				{
-					this.button.caretOffset = this.caret.getOffset();
-
 					e.preventDefault();
 
 					if (this.utils.browser('msie')) e.returnValue = false;
@@ -1485,6 +1242,7 @@
 							this.observe.buttons(e, btnName);
 						}
 					}
+
 				},
 				get: function(key)
 				{
@@ -1607,196 +1365,289 @@
 				}
 			};
 		},
-		caret: function()
+		dropdown: function()
 		{
 			return {
-				setStart: function(node)
+				build: function(name, $dropdown, dropdownObject)
 				{
-					// inline tag
-					if (!this.utils.isBlock(node))
+					if (name == 'formatting' && this.opts.formattingAdd)
 					{
-						var space = this.utils.createSpaceElement();
+						$.each(this.opts.formattingAdd, $.proxy(function(i,s)
+						{
+							var name = s.tag;
+							if (typeof s.class != 'undefined')
+							{
+								name = name + '-' + s.class;
+							}
 
-						$(node).prepend(space);
-						this.caret.setEnd(space);
+							s.type = (this.utils.isBlockTag(s.tag)) ? 'block' : 'inline';
+							var func = (s.type == 'inline') ? 'inline.formatting' : 'block.formatting';
+
+							if (this.opts.linebreaks && s.type == 'block' && s.tag == 'p') return;
+
+							this.formatting[name] = {
+								tag: s.tag,
+								style: s.style,
+								'class': s.class,
+								attr: s.attr,
+								data: s.data
+							};
+
+							dropdownObject[name] = {
+								func: func,
+								title: s.title
+							};
+
+						}, this));
+
+					}
+
+					$.each(dropdownObject, $.proxy(function(btnName, btnObject)
+					{
+						var $item = $('<a href="#" class="redactor-dropdown-' + btnName + '">' + btnObject.title + '</a>');
+						if (name == 'formatting') $item.addClass('redactor-formatting-' + btnName);
+
+						$item.on('click', $.proxy(function(e)
+						{
+							var type = 'func';
+							var callback = btnObject.func;
+							if (btnObject.command)
+							{
+								type = 'command';
+								callback = btnObject.command;
+							}
+							else if (btnObject.dropdown)
+							{
+								type = 'dropdown';
+								callback = btnObject.dropdown;
+							}
+
+							this.button.onClick(e, btnName, type, callback);
+
+						}, this));
+
+						$dropdown.append($item);
+
+					}, this));
+				},
+				show: function(e, key)
+				{
+					if (!this.opts.visual)
+					{
+						e.preventDefault();
+						return false;
+					}
+
+					var $button = this.button.get(key);
+
+					// Always re-append it to the end of <body> so it always has the highest sub-z-index.
+					var $dropdown = $button.data('dropdown').appendTo(document.body);
+
+					if ($button.hasClass('dropact'))
+					{
+						this.dropdown.hideAll();
 					}
 					else
 					{
-						this.caret.set(node, 0, node, 0);
-					}
-				},
-				setEnd: function(node)
-				{
-					this.caret.set(node, 1, node, 1);
-				},
-				set: function(orgn, orgo, focn, foco)
-				{
-					// focus
-					if (!this.utils.browser('msie')) this.$editor.focus();
+						this.dropdown.hideAll();
+						this.core.setCallback('dropdownShow', { dropdown: $dropdown, key: key, button: $button });
 
-					orgn = orgn[0] || orgn;
-					focn = focn[0] || focn;
+						this.button.setActive(key);
 
-					if (this.utils.isBlockTag(orgn.tagName) && orgn.innerHTML === '')
-					{
-						orgn.innerHTML = this.opts.invisibleSpace;
-					}
+						$button.addClass('dropact');
 
-					if (orgn.tagName == 'BR' && this.opts.linebreaks === false)
-					{
-						var par = $(this.opts.emptyHtml)[0];
-						$(orgn).replaceWith(par);
-						orgn = par;
-						focn = orgn;
-					}
+						var keyPosition = $button.offset();
 
-					this.selection.get();
-
-					try {
-						this.range.setStart(orgn, orgo);
-						this.range.setEnd(focn, foco);
-					}
-					catch (e) {}
-
-					this.selection.addRange();
-				},
-				setAfter: function(node)
-				{
-					try {
-						var tag = $(node)[0].tagName;
-
-						// inline tag
-						if (tag != 'BR' && !this.utils.isBlock(node))
+						// fix right placement
+						var dropdownWidth = $dropdown.width();
+						if ((keyPosition.left + dropdownWidth) > $(document).width())
 						{
-							var space = this.utils.createSpaceElement();
+							keyPosition.left -= dropdownWidth;
+						}
 
-							$(node).after(space);
-							this.caret.setEnd(space);
+						var left = keyPosition.left + 'px';
+						if (this.$toolbar.hasClass('toolbar-fixed-box'))
+						{
+							$dropdown.css({ position: 'fixed', left: left, top: this.$toolbar.innerHeight() + this.opts.toolbarFixedTopOffset }).show();
 						}
 						else
 						{
-							if (tag != 'BR' && this.utils.browser('msie'))
-							{
-								this.caret.setStart($(node).next());
-							}
-							else
-							{
-								this.caret.setAfterOrBefore(node, 'after');
-							}
+							var top = ($button.innerHeight() + keyPosition.top) + 'px';
+
+							$dropdown.css({ position: 'absolute', left: left, top: top }).show();
 						}
+
+
+						this.core.setCallback('dropdownShown', { dropdown: $dropdown, key: key, button: $button });
 					}
-					catch (e) {
-						var space = this.utils.createSpaceElement();
-						$(node).after(space);
-						this.caret.setEnd(space);
-					}
+
+					$(document).one('click', $.proxy(this.dropdown.hide, this));
+					this.$editor.one('click', $.proxy(this.dropdown.hide, this));
+
+					$dropdown.on('mouseover', function() { $('html').css('overflow', 'hidden'); });
+					$dropdown.on('mouseout', function() { $('html').css('overflow', ''); });
+
+					e.stopPropagation();
 				},
-				setBefore: function(node)
+				hideAll: function()
 				{
-					// block tag
-					if (this.utils.isBlock(node))
+					this.$toolbar.find('a.dropact').removeClass('redactor-act').removeClass('dropact');
+
+					$('.redactor-dropdown').hide();
+					this.core.setCallback('dropdownHide');
+				},
+				hide: function (e)
+				{
+					var $dropdown = $(e.target);
+					if (!$dropdown.hasClass('dropact'))
 					{
-						this.caret.setEnd($(node).prev());
+						$dropdown.removeClass('dropact');
+						this.dropdown.hideAll();
+					}
+				}
+			};
+		},
+		code: function()
+		{
+			return {
+				set: function(html)
+				{
+					html = $.trim(html.toString());
+
+					// clean
+					html = this.clean.onSet(html);
+
+					this.$editor.html(html);
+					this.code.sync();
+
+					setTimeout($.proxy(this.buffer.add, this), 15);
+					if (this.start === false) this.observe.load();
+
+				},
+				get: function()
+				{
+					var code = this.$textarea.val();
+
+					// indent code
+					code = this.tabifier.get(code);
+
+					return code;
+				},
+				sync: function()
+				{
+					setTimeout($.proxy(this.code.startSync, this), 10);
+				},
+				startSync: function()
+				{
+					var html = this.$editor.html();
+
+					// is there a need to synchronize
+					if (this.code.syncCode && this.code.syncCode == html)
+					{
+						// do not sync
+						return;
+					}
+
+					// save code
+					this.code.syncCode = html;
+
+					// before clean callback
+					html = this.core.setCallback('syncBefore', html);
+
+					// clean
+					html = this.clean.onSync(html);
+
+					// set code
+					this.$textarea.val(html);
+
+					// after sync callback
+					this.core.setCallback('sync', html);
+
+					if (this.start === false)
+					{
+						this.core.setCallback('change', html);
+					}
+
+					this.start = false;
+
+					// autosave on change
+					this.autosave.onChange();
+				},
+				toggle: function()
+				{
+					if (this.opts.visual)
+					{
+						this.code.showCode();
 					}
 					else
 					{
-						this.caret.setAfterOrBefore(node, 'before');
+						this.code.showVisual();
 					}
 				},
-				setAfterOrBefore: function(node, type)
+				showCode: function()
 				{
-					// focus
-					if (!this.utils.browser('msie')) this.$editor.focus();
+					this.code.offset = this.caret.getOffset();
+					var scroll = $(window).scrollTop();
 
-					node = node[0] || node;
+					var height = this.$editor.innerHeight();
 
-					this.selection.get();
+					this.$editor.hide();
 
-					if (type == 'after')
+					var html = this.$textarea.val();
+					this.modified = this.clean.removeSpaces(html);
+
+					// indent code
+					html = this.tabifier.get(html);
+
+					this.$textarea.val(html).height(height).show().focus();
+					this.$textarea.on('keydown.redactor-textarea-indenting', this.code.textareaIndenting);
+
+					$(window).scrollTop(scroll);
+
+					this.opts.visual = false;
+
+					this.button.setInactiveInCode();
+					this.button.setActive('html');
+					this.core.setCallback('source', html);
+				},
+				showVisual: function()
+				{
+					if (this.opts.visual) return;
+
+					var html = this.$textarea.hide().val();
+
+					if (this.modified !== this.clean.removeSpaces(html))
 					{
-						try {
-
-							this.range.setStartAfter(node);
-							this.range.setEndAfter(node);
-						}
-						catch (e) {}
+						this.code.set(html);
 					}
-					else
+
+					this.$editor.show();
+
+					if (!this.utils.isEmpty(html))
 					{
-						try {
-							this.range.setStartBefore(node);
-							this.range.setEndBefore(node);
-						}
-						catch (e) {}
+						this.placeholder.remove();
 					}
 
+					this.caret.setOffset(this.code.offset);
 
-					this.range.collapse(false);
-					this.selection.addRange();
+					this.$textarea.off('keydown.redactor-textarea-indenting');
+
+					this.button.setActiveInVisual();
+					this.button.setInactive('html');
+
+					this.observe.load();
+					this.opts.visual = true;
 				},
-				getOffsetOfElement: function(node)
+				textareaIndenting: function(e)
 				{
-					node = node[0] || node;
+					if (e.keyCode !== 9) return true;
 
-					this.selection.get();
+					var $el = this.$textarea;
+					var start = $el.get(0).selectionStart;
+					$el.val($el.val().substring(0, start) + "\t" + $el.val().substring($el.get(0).selectionEnd));
+					$el.get(0).selectionStart = $el.get(0).selectionEnd = start + 1;
 
-					var cloned = this.range.cloneRange();
-					cloned.selectNodeContents(node);
-					cloned.setEnd(this.range.endContainer, this.range.endOffset);
-
-					return $.trim(cloned.toString()).length;
-				},
-				getOffset: function()
-				{
-					var offset = 0;
-				    var sel = window.getSelection();
-				    if (sel.rangeCount > 0)
-				    {
-				        var range = window.getSelection().getRangeAt(0);
-				        var preCaretRange = range.cloneRange();
-				        preCaretRange.selectNodeContents(this.$editor[0]);
-				        preCaretRange.setEnd(range.endContainer, range.endOffset);
-				        offset = preCaretRange.toString().length;
-				    }
-
-					return offset;
-				},
-				setOffset: function(start, end)
-				{
-					if (typeof end == 'undefined') end = start;
-					if (!this.focus.isFocused()) this.focus.setStart();
-
-					var range = document.createRange();
-					var sel = document.getSelection();
-					var node, offset = 0;
-					var walker = document.createTreeWalker(this.$editor[0], NodeFilter.SHOW_TEXT, null, null);
-
-					while (node = walker.nextNode())
-					{
-						offset += node.nodeValue.length;
-						if (offset > start)
-						{
-							range.setStart(node, node.nodeValue.length + start - offset);
-							start = Infinity;
-						}
-
-						if (offset >= end)
-						{
-							range.setEnd(node, node.nodeValue.length + end - offset);
-							break;
-						}
-					}
-
-					sel.removeAllRanges();
-					sel.addRange(range);
-				},
-				setToPoint: function(start, end)
-				{
-					this.caret.setOffset(start, end);
-				},
-				getCoords: function()
-				{
-					return this.caret.getOffset();
+					return false;
 				}
 			};
 		},
@@ -1807,9 +1658,6 @@
 				{
 					html = this.clean.savePreCode(html);
 
-					// convert script tag
-					html = html.replace(/<script(.*?[^>]?)>([\w\W]*?)<\/script>/gi, '<pre class="redactor-script-tag" style="display: none;" $1>$2</pre>');
-
 					// replace dollar sign to entity
 					html = html.replace(/\$/g, '&#36;');
 					html = html.replace(/”/g, '"');
@@ -1823,21 +1671,7 @@
 					html = this.clean.saveFormTags(html);
 
 					// convert font tag to span
-					var $div = $('<div>');
-					$div.html(html);
-					var fonts = $div.find('font[style]');
-					if (fonts.length !== 0)
-					{
-						fonts.replaceWith(function()
-						{
-							var $el = $(this);
-							var $span = $('<span>').attr('style', $el.attr('style'));
-							return $span.append($el.contents());
-						});
-
-						html = $div.html();
-					}
-					$div.remove();
+					html = html.replace(/<font(.*?)style="(.*?)"(.*?)>([\w\W]*?)<\/font>/gi, '<span style="$2">$4</span>');
 
 					// remove font tag
 					html = html.replace(/<font(.*?[^<])>/gi, '');
@@ -1869,9 +1703,6 @@
 						return '';
 					}
 
-					// reconvert script tag
-					html = html.replace(/<pre class="redactor-script-tag" style="display: none;"(.*?[^>]?)>([\w\W]*?)<\/pre>/gi, '<script$1>$2</script>');
-
 					// restore form tag
 					html = this.clean.restoreFormTags(html);
 
@@ -1897,8 +1728,6 @@
 					html = html.replace(new RegExp('<(.*?) data-verified="redactor"(.*?[^>])>', 'gi'), '<$1$2>');
 					html = html.replace(new RegExp('<span(.*?) rel="(.*?)"(.*?[^>])>', 'gi'), '<span$1$3>');
 					html = html.replace(new RegExp('<img(.*?) rel="(.*?)"(.*?[^>])>', 'gi'), '<img$1$3>');
-					html = html.replace(new RegExp('<img(.*?) style="" (.*?[^>])>', 'gi'), '<img$1 $2>');
-					html = html.replace(new RegExp('<img(.*?) style (.*?[^>])>', 'gi'), '<img$1 $2>');
 					html = html.replace(new RegExp('<span class="redactor-invisible-space">(.*?)</span>', 'gi'), '$1');
 					html = html.replace(/ data-save-url="(.*?[^>])"/gi, '');
 
@@ -1907,10 +1736,6 @@
 					html = html.replace(/<span(.*?)id="redactor-image-resizer"(.*?[^>])>(.*?)<\/span>/gi, '');
 					html = html.replace(/<span(.*?)id="redactor-image-editter"(.*?[^>])>(.*?)<\/span>/gi, '');
 
-					// remove font tag
-					html = html.replace(/<font(.*?[^<])>/gi, '');
-					html = html.replace(/<\/font>/gi, '');
-
 					// tidy html
 					html = this.tidy.load(html);
 
@@ -2007,13 +1832,12 @@
 						html = this.clean.saveFormTags(html);
 					}
 
-
+					html = this.clean.onPasteIeFixLinks(html);
 					html = this.clean.onPasteWord(html);
 					html = this.clean.onPasteExtra(html);
 
 					html = this.clean.onPasteTidy(html, 'all');
 
-
 					// paragraphize
 					if (!this.clean.singleLine && this.opts.paragraphize)
 					{
@@ -2036,37 +1860,26 @@
 					// style
 					html = html.replace(/<style[^>]*>[\s\S]*?<\/style>/gi, '');
 
-					if (/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(html))
-					{
-						html = this.clean.onPasteIeFixLinks(html);
+					// shapes
+					html = html.replace(/<img(.*?)v:shapes=(.*?)>/gi, '');
+					html = html.replace(/src="file\:\/\/(.*?)"/, 'src=""');
 
-						// shapes
-						html = html.replace(/<img(.*?)v:shapes=(.*?)>/gi, '');
-						html = html.replace(/src="file\:\/\/(.*?)"/, 'src=""');
+					// list
+					html = html.replace(/<p(.*?)class="MsoListParagraphCxSpFirst"([\w\W]*?)<\/p>/gi, '<ul><li$2</li>');
+					html = html.replace(/<p(.*?)class="MsoListParagraphCxSpMiddle"([\w\W]*?)<\/p>/gi, '<li$2</li>');
+					html = html.replace(/<p(.*?)class="MsoListParagraphCxSpLast"([\w\W]*?)<\/p>/gi, '<li$2</li></ul>');
+					// one line
+					html = html.replace(/<p(.*?)class="MsoListParagraph"([\w\W]*?)<\/p>/gi, '<ul><li$2</li></ul>');
+					// remove ms word's bullet
+					html = html.replace(/·/g, '');
+					html = html.replace(/<p class="Mso(.*?)"/gi, '<p');
 
-						// list
-						html = html.replace(/<p(.*?)class="MsoListParagraphCxSpFirst"([\w\W]*?)<\/p>/gi, '<ul><li$2</li>');
-						html = html.replace(/<p(.*?)class="MsoListParagraphCxSpMiddle"([\w\W]*?)<\/p>/gi, '<li$2</li>');
-						html = html.replace(/<p(.*?)class="MsoListParagraphCxSpLast"([\w\W]*?)<\/p>/gi, '<li$2</li></ul>');
-						// one line
-						html = html.replace(/<p(.*?)class="MsoListParagraph"([\w\W]*?)<\/p>/gi, '<ul><li$2</li></ul>');
-						// remove ms word's bullet
-						html = html.replace(/·/g, '');
-						html = html.replace(/<p class="Mso(.*?)"/gi, '<p');
+					// classes
+					html = html.replace(/ class=\"(mso[^\"]*)\"/gi,	"");
+					html = html.replace(/ class=(mso\w+)/gi, "");
 
-						// classes
-						html = html.replace(/ class=\"(mso[^\"]*)\"/gi,	"");
-						html = html.replace(/ class=(mso\w+)/gi, "");
-
-						// remove ms word tags
-						html = html.replace(/<o:p(.*?)>([\w\W]*?)<\/o:p>/gi, '$2');
-
-						// ms word break lines
-						html = html.replace(/\n/g, ' ');
-
-						// ms word lists break lines
-						html = html.replace(/<p>\n?<li>/gi, '<li>');
-					}
+					// remove ms word tags
+					html = html.replace(/<o:p(.*?)>([\w\W]*?)<\/o:p>/gi, '$2');
 
 					// remove nbsp
 					if (this.opts.cleanSpaces)
@@ -2074,6 +1887,12 @@
 						html = html.replace(/(\s|&nbsp;)+/g, ' ');
 					}
 
+					// ms word break lines
+					html = html.replace(/\n/g, ' ');
+
+					// ms word lists break lines
+					html = html.replace(/<p>\n?<li>/gi, '<li>');
+
 					return html;
 				},
 				onPasteExtra: function(html)
@@ -2119,14 +1938,13 @@
 				{
 					// remove all tags except these
 					var tags = ['span', 'a', 'pre', 'blockquote', 'small', 'em', 'strong', 'code', 'kbd', 'mark', 'address', 'cite', 'var', 'samp', 'dfn', 'sup', 'sub', 'b', 'i', 'u', 'del',
-								'ol', 'ul', 'li', 'dl', 'dt', 'dd', 'p', 'br', 'video', 'audio', 'iframe', 'embed', 'param', 'object', 'img', 'table',
+								'ol', 'ul', 'li', 'dl', 'dt', 'dd', 'p', 'br', 'video', 'audio', 'embed', 'param', 'object', 'img', 'table',
 								'td', 'th', 'tr', 'tbody', 'tfoot', 'thead', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
 					var tagsEmpty = false;
 					var attrAllowed =  [
 							['a', '*'],
 							['img', ['src', 'alt']],
 							['span', ['class', 'rel', 'data-verified']],
-							['iframe', '*'],
 							['video', '*'],
 							['audio', '*'],
 							['embed', '*'],
@@ -2144,7 +1962,6 @@
 							['a', '*'],
 							['img', ['src', 'alt', 'data-redactor-inserted-image']],
 							['span', ['class', 'rel', 'data-verified']],
-							['iframe', '*'],
 							['video', '*'],
 							['audio', '*'],
 							['embed', '*'],
@@ -2157,14 +1974,14 @@
 					{
 						// remove all tags except these and remove all table tags: tr, td etc
 						tags = ['ul', 'ol', 'li', 'span', 'a', 'small', 'em', 'strong', 'code', 'kbd', 'mark', 'cite', 'var', 'samp', 'dfn', 'sup', 'sub', 'b', 'i', 'u', 'del',
-								'ol', 'ul', 'li', 'dl', 'dt', 'dd', 'br', 'iframe', 'video', 'audio', 'embed', 'param', 'object', 'img', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
+								'ol', 'ul', 'li', 'dl', 'dt', 'dd', 'br', 'video', 'audio', 'embed', 'param', 'object', 'img', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
 
 					}
 					else if (type == 'li')
 					{
 						// only inline tags and ul, ol, li
 						tags = ['ul', 'ol', 'li', 'span', 'a', 'small', 'em', 'strong', 'code', 'kbd', 'mark', 'cite', 'var', 'samp', 'dfn', 'sup', 'sub', 'b', 'i', 'u', 'del', 'br',
-								'iframe', 'video', 'audio', 'embed', 'param', 'object', 'img'];
+								'video', 'audio', 'embed', 'param', 'object', 'img'];
 					}
 
 					var options = {
@@ -2389,11 +2206,8 @@
 						var len = matches.length;
 						for (var i = 0; i < len; i++)
 						{
-							try {
-								var newTag = matches[i].replace(/style="(.*?)"/i, 'style="$1" rel="$1"');
-								html = html.replace(new RegExp(matches[i], 'gi'), newTag);
-							}
-							catch (e) {}
+							var newTag = matches[i].replace(/style="(.*?)"/i, 'style="$1" rel="$1"');
+							html = html.replace(new RegExp(matches[i], 'gi'), newTag);
 						}
 					}
 
@@ -2491,481 +2305,616 @@
 				}
 			};
 		},
-		code: function()
+		tidy: function()
 		{
 			return {
-				set: function(html)
+				setupAllowed: function()
 				{
-					html = $.trim(html.toString());
+					if (this.opts.allowedTags) this.opts.deniedTags = false;
+					if (this.opts.allowedAttr) this.opts.removeAttr = false;
+
+					if (this.opts.linebreaks) return;
+
+					var tags = ['p', 'section'];
+					if (this.opts.allowedTags) this.tidy.addToAllowed(tags);
+					if (this.opts.deniedTags) this.tidy.removeFromDenied(tags);
+
+				},
+				addToAllowed: function(tags)
+				{
+					var len = tags.length;
+					for (var i = 0; i < len; i++)
+					{
+						if ($.inArray(tags[i], this.opts.allowedTags) == -1)
+						{
+							this.opts.allowedTags.push(tags[i]);
+						}
+					}
+				},
+				removeFromDenied: function(tags)
+				{
+					var len = tags.length;
+					for (var i = 0; i < len; i++)
+					{
+						var pos = $.inArray(tags[i], this.opts.deniedTags);
+						if (pos != -1)
+						{
+							this.opts.deniedTags.splice(pos, 1);
+						}
+					}
+				},
+				load: function(html, options)
+				{
+					this.tidy.settings = {
+						deniedTags: this.opts.deniedTags,
+						allowedTags: this.opts.allowedTags,
+						removeComments: this.opts.removeComments,
+						replaceTags: this.opts.replaceTags,
+						replaceStyles: this.opts.replaceStyles,
+						removeDataAttr: this.opts.removeDataAttr,
+						removeAttr: this.opts.removeAttr,
+						allowedAttr: this.opts.allowedAttr,
+						removeWithoutAttr: this.opts.removeWithoutAttr,
+						removeEmpty: this.opts.removeEmpty
+					};
+
+					$.extend(this.tidy.settings, options);
+
+					html = this.tidy.removeComments(html);
+					html = this.tidy.replaceTags(html);
+
+					// create container
+					this.tidy.$div = $('<div />').append(html);
 
 					// clean
-					html = this.clean.onSet(html);
+					this.tidy.replaceStyles();
+					this.tidy.removeTags();
 
-					this.$editor.html(html);
-					this.code.sync();
+					this.tidy.removeAttr();
+					this.tidy.removeEmpty();
+					this.tidy.removeParagraphsInLists();
+					this.tidy.removeDataAttr();
+					this.tidy.removeWithoutAttr();
 
-					setTimeout($.proxy(this.buffer.add, this), 15);
-					if (this.start === false) this.observe.load();
+					html = this.tidy.$div.html();
+					this.tidy.$div.remove();
 
+					return html;
 				},
-				get: function()
+				removeComments: function(html)
 				{
-					var code = this.$textarea.val();
+					if (!this.tidy.settings.removeComments) return html;
 
-					// indent code
-					code = this.tabifier.get(code);
-
-					return code;
+					return html.replace(/<!--[\s\S]*?-->/gi, '');
 				},
-				sync: function()
+				replaceTags: function(html)
 				{
-					setTimeout($.proxy(this.code.startSync, this), 10);
-				},
-				startSync: function()
-				{
-					var html = this.$editor.html();
+					if (!this.tidy.settings.replaceTags) return html;
 
-					// is there a need to synchronize
-					if (this.code.syncCode && this.code.syncCode == html)
+					var len = this.tidy.settings.replaceTags.length;
+					for (var i = 0; i < len; i++)
 					{
-						// do not sync
-						return;
+						var re = new RegExp('<' + this.tidy.settings.replaceTags[i][0] + '(.*?[^>])>', 'gi');
+						html = html.replace(re, '<' + this.tidy.settings.replaceTags[i][1] + '$1>');
+
+						re = new RegExp('</' + this.tidy.settings.replaceTags[i][0] + '>', 'gi');
+						html = html.replace(re, '</' + this.tidy.settings.replaceTags[i][1] + '>');
 					}
 
-					// save code
-					this.code.syncCode = html;
 
-					// before clean callback
-					html = this.core.setCallback('syncBefore', html);
+					return html;
+				},
+				replaceStyles: function()
+				{
+					if (!this.tidy.settings.replaceStyles) return;
 
-					// clean
-					html = this.clean.onSync(html);
-
-					// set code
-					this.$textarea.val(html);
-
-					// after sync callback
-					this.core.setCallback('sync', html);
-
-					if (this.start === false)
+					var len = this.tidy.settings.replaceStyles.length;
+					this.tidy.$div.find('span').each($.proxy(function(n,s)
 					{
-						this.core.setCallback('change', html);
-					}
-
-					this.start = false;
-
-					// autosave on change
-					this.autosave.onChange();
-				},
-				toggle: function()
-				{
-					if (this.opts.visual)
-					{
-						this.code.showCode();
-					}
-					else
-					{
-						this.code.showVisual();
-					}
-				},
-				showCode: function()
-				{
-					this.code.offset = this.caret.getOffset();
-					var scroll = $(window).scrollTop();
-
-					var height = this.$editor.innerHeight();
-
-					this.$editor.hide();
-
-					var html = this.$textarea.val();
-					this.modified = this.clean.removeSpaces(html);
-
-					// indent code
-					html = this.tabifier.get(html);
-
-					this.$textarea.val(html).height(height).show().focus();
-					this.$textarea.on('keydown.redactor-textarea-indenting', this.code.textareaIndenting);
-
-					$(window).scrollTop(scroll);
-
-					if (this.$textarea[0].setSelectionRange)
-					{
-						this.$textarea[0].setSelectionRange(0, 0);
-					}
-
-					this.$textarea[0].scrollTop = 0;
-
-					this.opts.visual = false;
-
-					this.button.setInactiveInCode();
-					this.button.setActive('html');
-					this.core.setCallback('source', html);
-				},
-				showVisual: function()
-				{
-					if (this.opts.visual) return;
-
-					var html = this.$textarea.hide().val();
-
-					if (this.modified !== this.clean.removeSpaces(html))
-					{
-						this.code.set(html);
-					}
-
-					this.$editor.show();
-
-					if (!this.utils.isEmpty(html))
-					{
-						this.placeholder.remove();
-					}
-
-					this.caret.setOffset(this.code.offset);
-
-					this.$textarea.off('keydown.redactor-textarea-indenting');
-
-					this.button.setActiveInVisual();
-					this.button.setInactive('html');
-
-					this.observe.load();
-					this.opts.visual = true;
-				},
-				textareaIndenting: function(e)
-				{
-					if (e.keyCode !== 9) return true;
-
-					var $el = this.$textarea;
-					var start = $el.get(0).selectionStart;
-					$el.val($el.val().substring(0, start) + "\t" + $el.val().substring($el.get(0).selectionEnd));
-					$el.get(0).selectionStart = $el.get(0).selectionEnd = start + 1;
-
-					return false;
-				}
-			};
-		},
-		core: function()
-		{
-			return {
-				getObject: function()
-				{
-					return $.extend({}, this);
-				},
-				getEditor: function()
-				{
-					return this.$editor;
-				},
-				getBox: function()
-				{
-					return this.$box;
-				},
-				getElement: function()
-				{
-					return this.$element;
-				},
-				getTextarea: function()
-				{
-					return this.$textarea;
-				},
-				getToolbar: function()
-				{
-					return (this.$toolbar) ? this.$toolbar : false;
-				},
-				addEvent: function(name)
-				{
-					this.core.event = name;
-				},
-				getEvent: function()
-				{
-					return this.core.event;
-				},
-				setCallback: function(type, e, data)
-				{
-					var callback = this.opts[type + 'Callback'];
-					if ($.isFunction(callback))
-					{
-						return (typeof data == 'undefined') ? callback.call(this, e) : callback.call(this, e, data);
-					}
-					else
-					{
-						return (typeof data == 'undefined') ? e : data;
-					}
-				},
-				destroy: function()
-				{
-					this.core.setCallback('destroy');
-
-					// off events and remove data
-					this.$element.off('.redactor').removeData('redactor');
-					this.$editor.off('.redactor');
-
-					// common
-					this.$editor.removeClass('redactor-editor redactor-linebreaks redactor-placeholder');
-					this.$editor.removeAttr('contenteditable');
-
-					var html = this.code.get();
-
-					if (this.build.isTextarea())
-					{
-						this.$box.after(this.$element);
-						this.$box.remove();
-						this.$element.val(html).show();
-					}
-					else
-					{
-						this.$box.after(this.$editor);
-						this.$box.remove();
-						this.$element.html(html).show();
-					}
-
-					// paste box
-					if (this.$pasteBox) this.$pasteBox.remove();
-
-					// modal
-					if (this.$modalBox) this.$modalBox.remove();
-					if (this.$modalOverlay) this.$modalOverlay.remove();
-
-					// buttons tooltip
-					$('.redactor-toolbar-tooltip').remove();
-
-					// autosave
-					clearInterval(this.autosaveInterval);
-
-				}
-			};
-		},
-		dropdown: function()
-		{
-			return {
-				build: function(name, $dropdown, dropdownObject)
-				{
-					if (name == 'formatting' && this.opts.formattingAdd)
-					{
-						$.each(this.opts.formattingAdd, $.proxy(function(i,s)
+						var $el = $(s);
+						var style = $el.attr('style');
+						for (var i = 0; i < len; i++)
 						{
-							var name = s.tag;
-							if (typeof s.class != 'undefined')
+							if (style && style.match(new RegExp('^' + this.tidy.settings.replaceStyles[i][0], 'i')))
 							{
-								name = name + '-' + s.class;
+								var tagName = this.tidy.settings.replaceStyles[i][1];
+								$el.replaceWith(function()
+								{
+									var tag = document.createElement(tagName);
+									return $(tag).append($(this).contents());
+								});
 							}
-
-							s.type = (this.utils.isBlockTag(s.tag)) ? 'block' : 'inline';
-							var func = (s.type == 'inline') ? 'inline.formatting' : 'block.formatting';
-
-							if (this.opts.linebreaks && s.type == 'block' && s.tag == 'p') return;
-
-							this.formatting[name] = {
-								tag: s.tag,
-								style: s.style,
-								'class': s.class,
-								attr: s.attr,
-								data: s.data
-							};
-
-							dropdownObject[name] = {
-								func: func,
-								title: s.title
-							};
-
-						}, this));
-
-					}
-
-					$.each(dropdownObject, $.proxy(function(btnName, btnObject)
-					{
-						var $item = $('<a href="#" class="redactor-dropdown-' + btnName + '">' + btnObject.title + '</a>');
-						if (name == 'formatting') $item.addClass('redactor-formatting-' + btnName);
-
-						$item.on('click', $.proxy(function(e)
-						{
-							var type = 'func';
-							var callback = btnObject.func;
-							if (btnObject.command)
-							{
-								type = 'command';
-								callback = btnObject.command;
-							}
-							else if (btnObject.dropdown)
-							{
-								type = 'dropdown';
-								callback = btnObject.dropdown;
-							}
-
-							this.button.onClick(e, btnName, type, callback);
-
-						}, this));
-
-						$dropdown.append($item);
-
-					}, this));
-				},
-				show: function(e, key)
-				{
-					if (!this.opts.visual)
-					{
-						e.preventDefault();
-						return false;
-					}
-
-					var $button = this.button.get(key);
-
-					// Always re-append it to the end of <body> so it always has the highest sub-z-index.
-					var $dropdown = $button.data('dropdown').appendTo(document.body);
-
-					// ios keyboard hide
-					document.activeElement.blur();
-
-					if ($button.hasClass('dropact'))
-					{
-						this.dropdown.hideAll();
-					}
-					else
-					{
-						this.dropdown.hideAll();
-						this.core.setCallback('dropdownShow', { dropdown: $dropdown, key: key, button: $button });
-
-						this.button.setActive(key);
-
-						$button.addClass('dropact');
-
-						var keyPosition = $button.offset();
-
-						// fix right placement
-						var dropdownWidth = $dropdown.width();
-						if ((keyPosition.left + dropdownWidth) > $(document).width())
-						{
-							keyPosition.left -= dropdownWidth;
 						}
 
-						var left = keyPosition.left + 'px';
-						if (this.$toolbar.hasClass('toolbar-fixed-box'))
+					}, this));
+
+				},
+				removeTags: function()
+				{
+					if (!this.tidy.settings.deniedTags && this.tidy.settings.allowedTags)
+					{
+						this.tidy.$div.find('*').not(this.tidy.settings.allowedTags.join(',')).contents().unwrap();
+					}
+
+					if (this.tidy.settings.deniedTags)
+					{
+						this.tidy.$div.find(this.tidy.settings.deniedTags.join(',')).contents().unwrap();
+					}
+				},
+				removeAttr: function()
+				{
+					var len;
+					if (!this.tidy.settings.removeAttr && this.tidy.settings.allowedAttr)
+					{
+
+						var allowedAttrTags = [], allowedAttrData = [];
+						len = this.tidy.settings.allowedAttr.length;
+						for (var i = 0; i < len; i++)
 						{
-							var top = this.$toolbar.innerHeight() + this.opts.toolbarFixedTopOffset;
-							var position = 'fixed';
-							if (this.opts.toolbarFixedTarget !== document)
+							allowedAttrTags.push(this.tidy.settings.allowedAttr[i][0]);
+							allowedAttrData.push(this.tidy.settings.allowedAttr[i][1]);
+						}
+
+
+						this.tidy.$div.find('*').each($.proxy(function(n,s)
+						{
+							var $el = $(s);
+							var pos = $.inArray($el[0].tagName.toLowerCase(), allowedAttrTags);
+							var attributesRemove = this.tidy.removeAttrGetRemoves(pos, allowedAttrData, $el);
+
+							if (attributesRemove)
 							{
-								top = (this.$toolbar.innerHeight() + this.$toolbar.offset().top) + this.opts.toolbarFixedTopOffset;
-								position = 'absolute';
+								$.each(attributesRemove, function(z,f) {
+									$el.removeAttr(f);
+								});
+							}
+						}, this));
+					}
+
+					if (this.tidy.settings.removeAttr)
+					{
+						len = this.tidy.settings.removeAttr.length;
+						for (var i = 0; i < len; i++)
+						{
+							var attrs = this.tidy.settings.removeAttr[i][1];
+							if ($.isArray(attrs)) attrs = attrs.join(' ');
+
+							this.tidy.$div.find(this.tidy.settings.removeAttr[i][0]).removeAttr(attrs);
+						}
+					}
+
+				},
+				removeAttrGetRemoves: function(pos, allowed, $el)
+				{
+					var attributesRemove = [];
+
+					// remove all attrs
+					if (pos == -1)
+					{
+						$.each($el[0].attributes, function(i, item)
+						{
+							attributesRemove.push(item.name);
+						});
+
+					}
+					// allow all attrs
+					else if (allowed[pos] == '*')
+					{
+						attributesRemove = [];
+					}
+					// allow specific attrs
+					else
+					{
+						$.each($el[0].attributes, function(i, item)
+						{
+							if ($.isArray(allowed[pos]))
+							{
+								if ($.inArray(item.name, allowed[pos]) == -1)
+								{
+									attributesRemove.push(item.name);
+								}
+							}
+							else if (allowed[pos] != item.name)
+							{
+								attributesRemove.push(item.name);
 							}
 
-							$dropdown.css({ position: position, left: left, top: top + 'px' }).show();
+						});
+					}
+
+					return attributesRemove;
+				},
+				removeAttrs: function (el, regex)
+				{
+					regex = new RegExp(regex, "g");
+					return el.each(function()
+					{
+						var self = $(this);
+						var len = this.attributes.length - 1;
+						for (var i = len; i >= 0; i--)
+						{
+							var item = this.attributes[i];
+							if (item && item.specified && item.name.search(regex)>=0)
+							{
+								self.removeAttr(item.name);
+							}
+						}
+					});
+				},
+				removeEmpty: function()
+				{
+					if (!this.tidy.settings.removeEmpty) return;
+
+					this.tidy.$div.find(this.tidy.settings.removeEmpty.join(',')).each(function()
+					{
+						var $el = $(this);
+						var text = $el.text();
+						text = text.replace(/[\u200B-\u200D\uFEFF]/g, '');
+						text = text.replace(/&nbsp;/gi, '');
+						text = text.replace(/\s/g, '');
+
+		    	    	if (text === '' && $el.children().length === 0)
+		    	    	{
+			    	    	$el.remove();
+		    	    	}
+					});
+				},
+				removeParagraphsInLists: function()
+				{
+					this.tidy.$div.find('li p').contents().unwrap();
+				},
+				removeDataAttr: function()
+				{
+					if (!this.tidy.settings.removeDataAttr) return;
+
+					var tags = this.tidy.settings.removeDataAttr;
+					if ($.isArray(this.tidy.settings.removeDataAttr)) tags = this.tidy.settings.removeDataAttr.join(',');
+
+					this.tidy.removeAttrs(this.tidy.$div.find(tags), '^(data-)');
+
+				},
+				removeWithoutAttr: function()
+				{
+					if (!this.tidy.settings.removeWithoutAttr) return;
+
+					this.tidy.$div.find(this.tidy.settings.removeWithoutAttr.join(',')).each(function()
+					{
+						if (this.attributes.length === 0)
+						{
+							$(this).contents().unwrap();
+						}
+					});
+				}
+			};
+		},
+		paragraphize: function()
+		{
+			return {
+				load: function(html)
+				{
+					if (this.opts.linebreaks) return html;
+					if (html === '' || html === '<p></p>') return this.opts.emptyHtml;
+
+					this.paragraphize.blocks = ['table', 'div', 'pre', 'form', 'ul', 'ol', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'dl', 'blockquote', 'figcaption',
+					'address', 'section', 'header', 'footer', 'aside', 'article', 'object', 'style', 'script', 'iframe', 'select', 'input', 'textarea',
+					'button', 'option', 'map', 'area', 'math', 'hr', 'fieldset', 'legend', 'hgroup', 'nav', 'figure', 'details', 'menu', 'summary', 'p'];
+
+					html = html + "\n";
+
+					this.paragraphize.safes = [];
+					this.paragraphize.z = 0;
+
+					html = html.replace(/(<br\s?\/?>){1,}\n?<\/blockquote>/gi, '</blockquote>');
+
+					html = this.paragraphize.getSafes(html);
+					html = this.paragraphize.getSafesComments(html);
+					html = this.paragraphize.replaceBreaksToNewLines(html);
+					html = this.paragraphize.replaceBreaksToParagraphs(html);
+					html = this.paragraphize.clear(html);
+					html = this.paragraphize.restoreSafes(html);
+
+					html = html.replace(new RegExp('<br\\s?/?>\n?<(' + this.paragraphize.blocks.join('|') + ')(.*?[^>])>', 'gi'), '<p><br /></p>\n<$1$2>');
+
+					return $.trim(html);
+				},
+				getSafes: function(html)
+				{
+					var $div = $('<div />').append(html);
+
+					// remove paragraphs in blockquotes
+					$div.find('blockquote p').replaceWith(function()
+					{
+						return $(this).append('<br />').contents();
+					});
+
+					html = $div.html();
+
+					$div.find(this.paragraphize.blocks.join(', ')).each($.proxy(function(i,s)
+					{
+						this.paragraphize.z++;
+						this.paragraphize.safes[this.paragraphize.z] = s.outerHTML;
+						html = html.replace(s.outerHTML, '\n{replace' + this.paragraphize.z + '}');
+
+					}, this));
+
+					return html;
+				},
+				getSafesComments: function(html)
+				{
+					var commentsMatches = html.match(/<!--([\w\W]*?)-->/gi);
+
+					if (!commentsMatches) return html;
+
+					$.each(commentsMatches, $.proxy(function(i,s)
+					{
+						this.paragraphize.z++;
+						this.paragraphize.safes[this.paragraphize.z] = s;
+						html = html.replace(s, '\n{replace' + this.paragraphize.z + '}');
+					}, this));
+
+					return html;
+				},
+				restoreSafes: function(html)
+				{
+					$.each(this.paragraphize.safes, function(i,s)
+					{
+						html = html.replace('{replace' + i + '}', s);
+					});
+
+					return html;
+				},
+				replaceBreaksToParagraphs: function(html)
+				{
+					var htmls = html.split(new RegExp('\n', 'g'), -1);
+
+					html = '';
+					if (htmls)
+					{
+						var len = htmls.length;
+						for (var i = 0; i < len; i++)
+						{
+							if (!htmls.hasOwnProperty(i)) return;
+
+							if (htmls[i].search('{replace') == -1)
+							{
+								htmls[i] = htmls[i].replace(/<p>\n\t?<\/p>/gi, '');
+								htmls[i] = htmls[i].replace(/<p><\/p>/gi, '');
+
+								if (htmls[i] !== '')
+								{
+									html += '<p>' +  htmls[i].replace(/^\n+|\n+$/g, "") + "</p>";
+								}
+							}
+							else html += htmls[i];
+						}
+					}
+
+					return html;
+				},
+				replaceBreaksToNewLines: function(html)
+				{
+					html = html.replace(/<br \/>\s*<br \/>/gi, "\n\n");
+					html = html.replace(/<br\s?\/?>\n?<br\s?\/?>/gi, "\n<br /><br />");
+
+					html = html.replace(new RegExp("\r\n", 'g'), "\n");
+					html = html.replace(new RegExp("\r", 'g'), "\n");
+					html = html.replace(new RegExp("/\n\n+/"), 'g', "\n\n");
+
+					return html;
+				},
+				clear: function(html)
+				{
+					html = html.replace(new RegExp('</blockquote></p>', 'gi'), '</blockquote>');
+					html = html.replace(new RegExp('<p></blockquote>', 'gi'), '</blockquote>');
+					html = html.replace(new RegExp('<p><blockquote>', 'gi'), '<blockquote>');
+					html = html.replace(new RegExp('<blockquote></p>', 'gi'), '<blockquote>');
+
+					html = html.replace(new RegExp('<p><p ', 'gi'), '<p ');
+					html = html.replace(new RegExp('<p><p>', 'gi'), '<p>');
+					html = html.replace(new RegExp('</p></p>', 'gi'), '</p>');
+					html = html.replace(new RegExp('<p>\\s?</p>', 'gi'), '');
+					html = html.replace(new RegExp("\n</p>", 'gi'), '</p>');
+					html = html.replace(new RegExp('<p>\t?\t?\n?<p>', 'gi'), '<p>');
+					html = html.replace(new RegExp('<p>\t*</p>', 'gi'), '');
+
+					return html;
+				}
+			};
+		},
+		tabifier: function()
+		{
+			return {
+				get: function(code)
+				{
+					if (!this.opts.tabifier) return code;
+
+					// clean setup
+					var ownLine = ['area', 'body', 'head', 'hr', 'i?frame', 'link', 'meta', 'noscript', 'style', 'script', 'table', 'tbody', 'thead', 'tfoot'];
+					var contOwnLine = ['li', 'dt', 'dt', 'h[1-6]', 'option', 'script'];
+					var newLevel = ['blockquote', 'div', 'dl', 'fieldset', 'form', 'frameset', 'map', 'ol', 'p', 'pre', 'select', 'td', 'th', 'tr', 'ul'];
+
+					this.tabifier.lineBefore = new RegExp('^<(/?' + ownLine.join('|/?' ) + '|' + contOwnLine.join('|') + ')[ >]');
+					this.tabifier.lineAfter = new RegExp('^<(br|/?' + ownLine.join('|/?' ) + '|/' + contOwnLine.join('|/') + ')[ >]');
+					this.tabifier.newLevel = new RegExp('^</?(' + newLevel.join('|' ) + ')[ >]');
+
+					var i = 0,
+					codeLength = code.length,
+					point = 0,
+					start = null,
+					end = null,
+					tag = '',
+					out = '',
+					cont = '';
+
+					this.tabifier.cleanlevel = 0;
+
+					for (; i < codeLength; i++)
+					{
+						point = i;
+
+						// if no more tags, copy and exit
+						if (-1 == code.substr(i).indexOf( '<' ))
+						{
+							out += code.substr(i);
+
+							return this.tabifier.finish(out);
+						}
+
+						// copy verbatim until a tag
+						while (point < codeLength && code.charAt(point) != '<')
+						{
+							point++;
+						}
+
+						if (i != point)
+						{
+							cont = code.substr(i, point - i);
+							if (!cont.match(/^\s{2,}$/g))
+							{
+								if ('\n' == out.charAt(out.length - 1)) out += this.tabifier.getTabs();
+								else if ('\n' == cont.charAt(0))
+								{
+									out += '\n' + this.tabifier.getTabs();
+									cont = cont.replace(/^\s+/, '');
+								}
+
+								out += cont;
+							}
+
+							if (cont.match(/\n/)) out += '\n' + this.tabifier.getTabs();
+						}
+
+						start = point;
+
+						// find the end of the tag
+						while (point < codeLength && '>' != code.charAt(point))
+						{
+							point++;
+						}
+
+						tag = code.substr(start, point - start);
+						i = point;
+
+						var t;
+
+						if ('!--' == tag.substr(1, 3))
+						{
+							if (!tag.match(/--$/))
+							{
+								while ('-->' != code.substr(point, 3))
+								{
+									point++;
+								}
+								point += 2;
+								tag = code.substr(start, point - start);
+								i = point;
+							}
+
+							if ('\n' != out.charAt(out.length - 1)) out += '\n';
+
+							out += this.tabifier.getTabs();
+							out += tag + '>\n';
+						}
+						else if ('!' == tag[1])
+						{
+							out = this.tabifier.placeTag(tag + '>', out);
+						}
+						else if ('?' == tag[1])
+						{
+							out += tag + '>\n';
+						}
+						else if (t = tag.match(/^<(script|style|pre)/i))
+						{
+							t[1] = t[1].toLowerCase();
+							tag = this.tabifier.cleanTag(tag);
+							out = this.tabifier.placeTag(tag, out);
+							end = String(code.substr(i + 1)).toLowerCase().indexOf('</' + t[1]);
+
+							if (end)
+							{
+								cont = code.substr(i + 1, end);
+								i += end;
+								out += cont;
+							}
 						}
 						else
 						{
-							var top = ($button.innerHeight() + keyPosition.top) + 'px';
-
-							$dropdown.css({ position: 'absolute', left: left, top: top }).show();
+							tag = this.tabifier.cleanTag(tag);
+							out = this.tabifier.placeTag(tag, out);
 						}
-
-
-						this.core.setCallback('dropdownShown', { dropdown: $dropdown, key: key, button: $button });
 					}
 
-					$(document).one('click', $.proxy(this.dropdown.hide, this));
-					this.$editor.one('click', $.proxy(this.dropdown.hide, this));
-
-					// disable scroll whan dropdown scroll
-					var $body = $(document.body);
-					var width = $body.width();
-
-					$dropdown.on('mouseover', function() {
-
-						$body.addClass('body-hidden');
-						$body.css('margin-right', ($body.width() - width) + 'px');
-
-					 });
-
-					$dropdown.on('mouseout', function() {
-
-						$body.removeClass('body-hidden').css('margin-right', 0);
-
-					});
-
-
-					e.stopPropagation();
+					return this.tabifier.finish(out);
 				},
-				hideAll: function()
+				getTabs: function()
 				{
-					this.$toolbar.find('a.dropact').removeClass('redactor-act').removeClass('dropact');
+					var s = '';
+					for ( var j = 0; j < this.tabifier.cleanlevel; j++ )
+					{
+						s += '\t';
+					}
 
-					$(document.body).removeClass('body-hidden').css('margin-right', 0);
-					$('.redactor-dropdown').hide();
-					this.core.setCallback('dropdownHide');
+					return s;
 				},
-				hide: function (e)
+				finish: function(code)
 				{
-					var $dropdown = $(e.target);
-					if (!$dropdown.hasClass('dropact'))
-					{
-						$dropdown.removeClass('dropact');
-						this.dropdown.hideAll();
-					}
-				}
-			};
-		},
-		file: function()
-		{
-			return {
-				show: function()
-				{
-					this.modal.load('file', this.lang.get('file'), 700);
-					this.upload.init('#redactor-modal-file-upload', this.opts.fileUpload, this.file.insert);
+					code = code.replace(/\n\s*\n/g, '\n');
+					code = code.replace(/^[\s\n]*/, '');
+					code = code.replace(/[\s\n]*$/, '');
+					code = code.replace(/<script(.*?)>\n<\/script>/gi, '<script$1></script>');
 
-					this.selection.save();
+					this.tabifier.cleanlevel = 0;
 
-					this.selection.get();
-					var text = this.sel.toString();
-
-					$('#redactor-filename').val(text);
-
-					this.modal.show();
+					return code;
 				},
-				insert: function(json, direct, e)
+				cleanTag: function (tag)
 				{
-					// error callback
-					if (typeof json.error != 'undefined')
+					var tagout = '';
+					tag = tag.replace(/\n/g, ' ');
+					tag = tag.replace(/\s{2,}/g, ' ');
+					tag = tag.replace(/^\s+|\s+$/g, ' ');
+
+					var suffix = '';
+					if (tag.match(/\/$/))
 					{
-						this.modal.close();
-						this.selection.restore();
-						this.core.setCallback('fileUploadError', json);
-						return;
+						suffix = '/';
+						tag = tag.replace(/\/+$/, '');
 					}
 
-					var link;
-					if (typeof json == 'string')
+					var m;
+					while (m = /\s*([^= ]+)(?:=((['"']).*?\3|[^ ]+))?/.exec(tag))
 					{
-						link = json;
-					}
-					else
-					{
-						var text = $('#redactor-filename').val();
-						if (typeof text == 'undefined' || text === '') text = json.filename;
+						if (m[2]) tagout += m[1].toLowerCase() + '=' + m[2];
+						else if (m[1]) tagout += m[1].toLowerCase();
 
-						link = '<a href="' + json.filelink + '" id="filelink-marker">' + text + '</a>';
+						tagout += ' ';
+						tag = tag.substr(m[0].length);
 					}
 
-					if (direct)
+					return tagout.replace(/\s*$/, '') + suffix + '>';
+				},
+				placeTag: function (tag, out)
+				{
+					var nl = tag.match(this.tabifier.newLevel);
+					if (tag.match(this.tabifier.lineBefore) || nl)
 					{
-						this.selection.removeMarkers();
-						var marker = this.selection.getMarker();
-						this.insert.nodeToCaretPositionFromPoint(e, marker);
-					}
-					else
-					{
-						this.modal.close();
+						out = out.replace(/\s*$/, '');
+						out += '\n';
 					}
 
-					this.selection.restore();
-					this.buffer.set();
+					if (nl && '/' == tag.charAt(1)) this.tabifier.cleanlevel--;
+					if ('\n' == out.charAt(out.length - 1)) out += this.tabifier.getTabs();
+					if (nl && '/' != tag.charAt(1)) this.tabifier.cleanlevel++;
 
-					this.insert.html(link);
+					out += tag;
 
-					if (typeof json == 'string') return;
-
-					var linkmarker = $(this.$editor.find('a#filelink-marker'));
-					if (linkmarker.size() !== 0) linkmarker.removeAttr('id');
-					else linkmarker = false;
-
-					this.core.setCallback('fileUpload', linkmarker, json);
+					if (tag.match(this.tabifier.lineAfter) || tag.match(this.tabifier.newLevel))
+					{
+						out = out.replace(/ *$/, '');
+						out += '\n';
+					}
 
+					return out;
 				}
 			};
 		},
@@ -2988,7 +2937,7 @@
 					{
 						first = first.find('li').first();
 						var child = first.children().first();
-						if (!this.utils.isBlock(child) && child.text() === '')
+						if (!this.utils.isBlock(child) && child.text() == '')
 						{
 							// empty inline tag in li
 							this.caret.setStart(child);
@@ -3042,461 +2991,163 @@
 				}
 			};
 		},
-		image: function()
+		placeholder: function()
 		{
 			return {
-				show: function()
+				enable: function()
 				{
-					this.modal.load('image', this.lang.get('image'), 700);
-					this.upload.init('#redactor-modal-image-droparea', this.opts.imageUpload, this.image.insert);
+					if (!this.placeholder.is()) return;
 
+					this.$editor.attr('placeholder', this.$element.attr('placeholder'));
+
+					this.placeholder.toggle();
+					this.$editor.on('keyup.redactor-placeholder', $.proxy(this.placeholder.toggle, this));
+
+				},
+				toggle: function()
+				{
+					var func = 'removeClass';
+					if (this.utils.isEmpty(this.$editor.html(), false)) func = 'addClass';
+					this.$editor[func]('redactor-placeholder');
+				},
+				remove: function()
+				{
+					this.$editor.removeClass('redactor-placeholder');
+				},
+				is: function()
+				{
+					if (this.opts.placeholder)
+					{
+						return this.$element.attr('placeholder', this.opts.placeholder);
+					}
+					else
+					{
+						return !(typeof this.$element.attr('placeholder') == 'undefined' || this.$element.attr('placeholder') === '');
+					}
+				}
+			};
+		},
+		autosave: function()
+		{
+			return {
+				enable: function()
+				{
+					if (!this.opts.autosave) return;
+
+					this.autosave.html = false;
+					this.autosave.name = (this.opts.autosaveName) ? this.opts.autosaveName : this.$textarea.attr('name');
+
+					if (!this.opts.autosaveOnChange)
+					{
+						this.autosaveInterval = setInterval($.proxy(this.autosave.load, this), this.opts.autosaveInterval * 1000);
+					}
+				},
+				onChange: function()
+				{
+					if (!this.opts.autosaveOnChange) return;
+
+					this.autosave.load();
+				},
+				load: function()
+				{
+					var html = this.code.get();
+					if (this.autosave.html === html) return;
+					if (this.utils.isEmpty(html)) return;
+
+					$.ajax({
+						url: this.opts.autosave,
+						type: 'post',
+						data: 'name=' + this.autosave.name + '&' + this.autosave.name + '=' + escape(encodeURIComponent(html)),
+						success: $.proxy(function(data)
+						{
+							this.autosave.success(data, html);
+
+						}, this)
+					});
+				},
+				success: function(data, html)
+				{
+					var json;
+					try
+					{
+						json = $.parseJSON(data);
+					}
+					catch(e)
+					{
+						//data has already been parsed
+						json = data;
+					}
+
+					var callbackName = (typeof json.error == 'undefined') ? 'autosave' :  'autosaveError';
+
+					this.core.setCallback(callbackName, this.autosave.name, json);
+					this.autosave.html = html;
+				},
+				disable: function()
+				{
+					clearInterval(this.autosaveInterval);
+				}
+			};
+		},
+		buffer: function()
+		{
+			return {
+				set: function(type)
+				{
+					if (typeof type == 'undefined' || type == 'undo')
+					{
+						this.buffer.setUndo();
+					}
+					else
+					{
+						this.buffer.setRedo();
+					}
+				},
+				setUndo: function()
+				{
 					this.selection.save();
-					this.modal.show();
-
+					this.opts.buffer.push(this.$editor.html());
+					this.selection.restore();
 				},
-				showEdit: function($image)
+				setRedo: function()
 				{
-					var $link = $image.closest('a');
-
-					this.modal.load('imageEdit', this.lang.get('edit'), 705);
-
-					this.modal.createCancelButton();
-					this.image.buttonDelete = this.modal.createDeleteButton(this.lang.get('_delete'));
-					this.image.buttonSave = this.modal.createActionButton(this.lang.get('save'));
-
-					this.image.buttonDelete.on('click', $.proxy(function()
-					{
-						this.image.remove($image);
-
-					}, this));
-
-					this.image.buttonSave.on('click', $.proxy(function()
-					{
-						this.image.update($image);
-
-					}, this));
-
-
-					$('#redactor-image-title').val($image.attr('alt'));
-
-					if (!this.opts.imageLink) $('.redactor-image-link-option').hide();
-					else
-					{
-						var $redactorImageLink = $('#redactor-image-link');
-
-						$redactorImageLink.attr('href', $image.attr('src'));
-						if ($link.size() !== 0)
-						{
-							$redactorImageLink.val($link.attr('href'));
-							if ($link.attr('target') == '_blank') $('#redactor-image-link-blank').prop('checked', true);
-						}
-					}
-
-					if (!this.opts.imagePosition) $('.redactor-image-position-option').hide();
-					else
-					{
-						var floatValue = ($image.css('display') == 'block' && $image.css('float') == 'none') ? 'center' : $image.css('float');
-						$('#redactor-image-align').val(floatValue);
-					}
-
-					this.modal.show();
-
+					this.selection.save();
+					this.opts.rebuffer.push(this.$editor.html());
+					this.selection.restore();
 				},
-				setFloating: function($image)
+				getUndo: function()
 				{
-					var floating = $('#redactor-image-align').val();
-
-					var imageFloat = '';
-					var imageDisplay = '';
-					var imageMargin = '';
-
-					switch (floating)
-					{
-						case 'left':
-							imageFloat = 'left';
-							imageMargin = '0 ' + this.opts.imageFloatMargin + ' ' + this.opts.imageFloatMargin + ' 0';
-						break;
-						case 'right':
-							imageFloat = 'right';
-							imageMargin = '0 0 ' + this.opts.imageFloatMargin + ' ' + this.opts.imageFloatMargin;
-						break;
-						case 'center':
-							imageDisplay = 'block';
-							imageMargin = 'auto';
-						break;
-					}
-
-					$image.css({ 'float': imageFloat, display: imageDisplay, margin: imageMargin });
-					$image.attr('rel', $image.attr('style'));
+					this.$editor.html(this.opts.buffer.pop());
 				},
-				update: function($image)
+				getRedo: function()
 				{
-					this.image.hideResize();
-					this.buffer.set();
-
-					var $link = $image.closest('a');
-
-					$image.attr('alt', $('#redactor-image-title').val());
-
-					this.image.setFloating($image);
-
-					// as link
-					var link = $.trim($('#redactor-image-link').val());
-					if (link !== '')
-					{
-						var target = ($('#redactor-image-link-blank').prop('checked')) ? true : false;
-
-						if ($link.size() === 0)
-						{
-							var a = $('<a href="' + link + '">' + this.utils.getOuterHtml($image) + '</a>');
-							if (target) a.attr('target', '_blank');
-
-							$image.replaceWith(a);
-						}
-						else
-						{
-							$link.attr('href', link);
-							if (target)
-							{
-								$link.attr('target', '_blank');
-							}
-							else
-							{
-								$link.removeAttr('target');
-							}
-						}
-					}
-					else if ($link.size() !== 0)
-					{
-						$link.replaceWith(this.utils.getOuterHtml($image));
-
-					}
-
-					this.modal.close();
-					this.observe.images();
-					this.code.sync();
-
-
+					this.$editor.html(this.opts.rebuffer.pop());
 				},
-				setEditable: function($image)
+				add: function()
 				{
-					if (!this.opts.imageEditable) return;
-
-					$image.on('dragstart', $.proxy(this.image.onDrag, this));
-
-					$image.on('mousedown', $.proxy(this.image.hideResize, this));
-					$image.on('click touchstart', $.proxy(function(e)
-					{
-						this.observe.image = $image;
-
-						if (this.$editor.find('#redactor-image-box').size() !== 0) return false;
-
-
-						this.image.resizer = this.image.loadEditableControls($image);
-
-						$(document).on('click.redactor-image-resize-hide', $.proxy(this.image.hideResize, this));
-						this.$editor.on('click.redactor-image-resize-hide', $.proxy(this.image.hideResize, this));
-
-						// resize
-						if (!this.opts.imageResizable) return;
-
-						this.image.resizer.on('mousedown.redactor touchstart.redactor', $.proxy(function(e)
-						{
-							e.preventDefault();
-
-						    this.image.resizeHandle = {
-						        x : e.pageX,
-						        y : e.pageY,
-						        el : $image,
-						        ratio: $image.width() / $image.height(),
-						        h: $image.height()
-						    };
-
-						    e = e.originalEvent || e;
-
-						    if (e.targetTouches)
-						    {
-						         this.image.resizeHandle.x = e.targetTouches[0].pageX;
-						         this.image.resizeHandle.y = e.targetTouches[0].pageY;
-						    }
-
-							this.image.startResize();
-
-						}, this));
-
-
-					}, this));
+					this.opts.buffer.push(this.$editor.html());
 				},
-				startResize: function()
+				undo: function()
 				{
-					$(document).on('mousemove.redactor-image-resize touchmove.redactor-image-resize', $.proxy(this.image.moveResize, this));
-					$(document).on('mouseup.redactor-image-resize touchend.redactor-image-resize', $.proxy(this.image.stopResize, this));
-				},
-				moveResize: function(e)
-				{
-					e.preventDefault();
+					if (this.opts.buffer.length === 0) return;
 
-					e = e.originalEvent || e;
-
-					var height = this.image.resizeHandle.h;
-
-		            if (e.targetTouches) height += (e.targetTouches[0].pageY -  this.image.resizeHandle.y);
-		            else height += (e.pageY -  this.image.resizeHandle.y);
-
-					var width = Math.round(height * this.image.resizeHandle.ratio);
-
-					if (height < 50 || width < 100) return;
-
-		            this.image.resizeHandle.el.width(width);
-		            this.image.resizeHandle.el.height(this.image.resizeHandle.el.width()/this.image.resizeHandle.ratio);
-
-		            this.code.sync();
-				},
-				stopResize: function()
-				{
-					this.handle = false;
-					$(document).off('.redactor-image-resize');
-
-					this.image.hideResize();
-				},
-				onDrag: function(e)
-				{
-					if (this.$editor.find('#redactor-image-box').size() !== 0)
-					{
-						e.preventDefault();
-						return false;
-					}
-
-					this.$editor.on('drop.redactor-image-inside-drop', $.proxy(function()
-					{
-						setTimeout($.proxy(this.image.onDrop, this), 1);
-
-					}, this));
-				},
-				onDrop: function()
-				{
-					this.image.fixImageSourceAfterDrop();
-					this.observe.images();
-					this.$editor.off('drop.redactor-image-inside-drop');
-					this.clean.clearUnverified();
-					this.code.sync();
-				},
-				fixImageSourceAfterDrop: function()
-				{
-					this.$editor.find('img[data-save-url]').each(function()
-					{
-						var $el = $(this);
-						$el.attr('src', $el.attr('data-save-url'));
-						$el.removeAttr('data-save-url');
-					});
-				},
-				hideResize: function(e)
-				{
-					if (e && $(e.target).closest('#redactor-image-box').length !== 0) return;
-					if (e && e.target.tagName == 'IMG')
-					{
-						var $image = $(e.target);
-						$image.attr('data-save-url', $image.attr('src'));
-					}
-
-					var imageBox = this.$editor.find('#redactor-image-box');
-					if (imageBox.size() === 0) return;
-
-					this.image.editter.remove();
-					$(this.image.resizer).remove();
-
-					imageBox.find('img').css({
-						marginTop: imageBox[0].style.marginTop,
-						marginBottom: imageBox[0].style.marginBottom,
-						marginLeft: imageBox[0].style.marginLeft,
-						marginRight: imageBox[0].style.marginRight
-					});
-
-					imageBox.css('margin', '');
-					imageBox.find('img').css('opacity', '');
-					imageBox.replaceWith(function()
-					{
-						return $(this).contents();
-					});
-
-					$(document).off('click.redactor-image-resize-hide');
-					this.$editor.off('click.redactor-image-resize-hide');
-
-					if (typeof this.image.resizeHandle !== 'undefined')
-					{
-						this.image.resizeHandle.el.attr('rel', this.image.resizeHandle.el.attr('style'));
-					}
-
-					this.code.sync();
-
-				},
-				loadEditableControls: function($image)
-				{
-					var imageBox = $('<span id="redactor-image-box" data-redactor="verified">');
-					imageBox.css('float', $image.css('float')).attr('contenteditable', false);
-
-					if ($image[0].style.margin != 'auto')
-					{
-						imageBox.css({
-							marginTop: $image[0].style.marginTop,
-							marginBottom: $image[0].style.marginBottom,
-							marginLeft: $image[0].style.marginLeft,
-							marginRight: $image[0].style.marginRight
-						});
-
-						$image.css('margin', '');
-					}
-					else
-					{
-						imageBox.css({ 'display': 'block', 'margin': 'auto' });
-					}
-
-					$image.css('opacity', '.5').after(imageBox);
-
-					// editter
-					this.image.editter = $('<span id="redactor-image-editter" data-redactor="verified">' + this.lang.get('edit') + '</span>');
-					this.image.editter.attr('contenteditable', false);
-					this.image.editter.on('click', $.proxy(function()
-					{
-						this.image.showEdit($image);
-					}, this));
-
-					imageBox.append(this.image.editter);
-
-					// position correction
-					var editerWidth = this.image.editter.innerWidth();
-					this.image.editter.css('margin-left', '-' + editerWidth/2 + 'px');
-
-
-					// resizer
-					if (this.opts.imageResizable && !this.utils.isMobile())
-					{
-						var imageResizer = $('<span id="redactor-image-resizer" data-redactor="verified"></span>');
-
-						if (!this.utils.isDesktop())
-						{
-							imageResizer.css({ width: '15px', height: '15px' });
-						}
-
-						imageResizer.attr('contenteditable', false);
-						imageBox.append(imageResizer);
-						imageBox.append($image);
-
-						return imageResizer;
-					}
-					else
-					{
-						imageBox.append($image);
-						return false;
-					}
-				},
-				remove: function(image)
-				{
-					var $image = $(image);
-					var $link = $image.closest('a');
-					var $figure = $image.closest('figure');
-					var $parent = $image.parent();
-					if ($('#redactor-image-box').size() !== 0)
-					{
-						$parent = $('#redactor-image-box').parent();
-					}
-
-					var $next;
-					if ($figure.size() !== 0)
-					{
-						$next = $figure.next();
-						$figure.remove();
-					}
-					else if ($link.size() !== 0)
-					{
-						$parent = $link.parent();
-						$link.remove();
-					}
-					else
-					{
-						$image.remove();
-					}
-
-					$('#redactor-image-box').remove();
-
-					if ($figure.size() !== 0)
-					{
-						this.caret.setStart($next);
-					}
-					else
-					{
-						this.caret.setStart($parent);
-					}
-
-					// delete callback
-					this.core.setCallback('imageDelete', $image[0].src, $image);
-
-					this.modal.close();
-					this.code.sync();
-				},
-				insert: function(json, direct, e)
-				{
-					// error callback
-					if (typeof json.error != 'undefined')
-					{
-						this.modal.close();
-						this.selection.restore();
-						this.core.setCallback('imageUploadError', json);
-						return;
-					}
-
-					var $img;
-					if (typeof json == 'string')
-					{
-						$img = $(json).attr('data-redactor-inserted-image', 'true');
-					}
-					else
-					{
-						$img = $('<img>');
-						$img.attr('src', json.filelink).attr('data-redactor-inserted-image', 'true');
-					}
-
-
-					var node = $img;
-					var isP = this.utils.isCurrentOrParent('P');
-					if (isP)
-					{
-						// will replace
-						node = $('<blockquote />').append($img);
-					}
-
-					if (direct)
-					{
-						this.selection.removeMarkers();
-						var marker = this.selection.getMarker();
-						this.insert.nodeToCaretPositionFromPoint(e, marker);
-					}
-					else
-					{
-						this.modal.close();
-					}
+					this.buffer.set('redo');
+					this.buffer.getUndo();
 
 					this.selection.restore();
-					this.buffer.set();
 
+					setTimeout($.proxy(this.observe.load, this), 50);
+				},
+				redo: function()
+				{
+					if (this.opts.rebuffer.length === 0) return;
 
-					this.insert.html(this.utils.getOuterHtml(node), false);
+					this.buffer.set('undo');
+					this.buffer.getRedo();
 
-					var $image = this.$editor.find('img[data-redactor-inserted-image=true]').removeAttr('data-redactor-inserted-image');
-
-					if (isP)
-					{
-						$image.parent().contents().unwrap().wrap('<p />');
-					}
-					else if (this.opts.linebreaks)
-					{
-						$image.before('<br>').after('<br>');
-					}
-
-					if (typeof json == 'string') return;
-
-					this.core.setCallback('imageUpload', $image, json);
+					this.selection.restore();
 
+					setTimeout($.proxy(this.observe.load, this), 50);
 				}
 			};
 		},
@@ -3636,623 +3287,141 @@
 				}
 			};
 		},
-		inline: function()
+		alignment: function()
 		{
 			return {
-				formatting: function(name)
+				left: function()
 				{
-					var type, value;
-
-					if (typeof this.formatting[name].style != 'undefined') type = 'style';
-					else if (typeof this.formatting[name].class != 'undefined') type = 'class';
-
-					if (type) value = this.formatting[name][type];
-
-					this.inline.format(this.formatting[name].tag, type, value);
-
+					this.alignment.set('');
 				},
-				format: function(tag, type, value)
+				right: function()
 				{
-					// Stop formatting pre
-					if (this.utils.isCurrentOrParent('PRE')) return;
-
-					var tags = ['b', 'bold', 'i', 'italic', 'underline', 'strikethrough', 'deleted', 'superscript', 'subscript'];
-					var replaced = ['strong', 'strong', 'em', 'em', 'u', 'del', 'del', 'sup', 'sub'];
-
-					for (var i = 0; i < tags.length; i++)
-					{
-						if (tag == tags[i]) tag = replaced[i];
-					}
-
-					this.inline.type = type || false;
-					this.inline.value = value || false;
+					this.alignment.set('right');
+				},
+				center: function()
+				{
+					this.alignment.set('center');
+				},
+				justify: function()
+				{
+					this.alignment.set('justify');
+				},
+				set: function(type)
+				{
+					if (!this.utils.browser('msie')) this.$editor.focus();
 
 					this.buffer.set();
-					this.$editor.focus();
+					this.selection.save();
 
-					this.selection.get();
-
-					if (this.range.collapsed)
+					this.alignment.blocks = this.selection.getBlocks();
+					if (this.opts.linebreaks && this.alignment.blocks[0] === false)
 					{
-						this.inline.formatCollapsed(tag);
+						this.alignment.setText(type);
 					}
 					else
 					{
-						this.inline.formatMultiple(tag);
-					}
-				},
-				formatCollapsed: function(tag)
-				{
-					var current = this.selection.getCurrent();
-					var $parent = $(current).closest(tag + '[data-redactor-tag=' + tag + ']');
-
-					// inline there is
-					if ($parent.size() !== 0)
-					{
-						this.caret.setAfter($parent[0]);
-
-						// remove empty
-						if (this.utils.isEmpty($parent.text())) $parent.remove();
-
-						this.code.sync();
-
-						return;
+						this.alignment.setBlocks(type);
 					}
 
-					// create empty inline
-					var node = $('<' + tag + '>').attr('data-verified', 'redactor').attr('data-redactor-tag', tag);
-					node.html(this.opts.invisibleSpace);
-
-					node = this.inline.setFormat(node);
-
-					this.insert.node(node);
-
-					// 10.0.5 inline focus issue
-					//this.caret.setEnd(node);
-
+					this.selection.restore();
 					this.code.sync();
-
-					return;
 				},
-				formatMultiple: function(tag)
+				setText: function(type)
 				{
-					this.inline.formatConvert(tag);
-
-					this.selection.save();
-					document.execCommand('strikethrough');
-
-
-					this.$editor.find('strike').each($.proxy(function(i,s)
+					var wrapper = this.selection.wrap('div');
+					$(wrapper).attr('data-tagblock', 'redactor');
+					$(wrapper).css('text-align', type);
+				},
+				setBlocks: function(type)
+				{
+					$.each(this.alignment.blocks, $.proxy(function(i, el)
 					{
-						var $el = $(s);
+						var $el = this.utils.getAlignmentElement(el);
 
-						this.inline.formatRemoveSameChildren($el, tag);
+						if (!$el) return;
 
-						var $span;
-						if (this.inline.type)
+						if (type === '' && typeof($el.data('tagblock')) !== 'undefined')
 						{
-							$span = $('<span>').attr('data-redactor-tag', tag).attr('data-verified', 'redactor');
-							$span = this.inline.setFormat($span);
+							$el.replaceWith($el.html());
 						}
 						else
 						{
-							$span = $('<' + tag + '>').attr('data-redactor-tag', tag).attr('data-verified', 'redactor');
+							$el.css('text-align', type);
+							this.utils.removeEmptyAttr($el, 'style');
 						}
 
-						$el.replaceWith($span.html($el.contents()));
-
-						if (tag == 'span')
-						{
-							var $parent = $span.parent();
-							if ($parent && $parent[0].tagName == 'SPAN' && this.inline.type == 'style')
-							{
-								var arr = this.inline.value.split(';');
-
-								for (var z = 0; z < arr.length; z++)
-								{
-									if (arr[z] === '') return;
-									var style = arr[z].split(':');
-									$parent.css(style[0], '');
-
-									if (this.utils.removeEmptyAttr($parent, 'style'))
-									{
-										$parent.replaceWith($parent.contents());
-									}
-
-								}
-
-							}
-						}
 
 					}, this));
-
-					// clear text decoration
-					if (tag != 'span')
-					{
-						this.$editor.find(this.opts.inlineTags.join(', ')).each($.proxy(function(i,s)
-						{
-							var $el = $(s);
-							var property = $el.css('text-decoration');
-							if (property == 'line-through')
-							{
-								$el.css('text-decoration', '');
-								this.utils.removeEmptyAttr($el, 'style');
-							}
-						}, this));
-					}
-
-					if (tag != 'del')
-					{
-						var _this = this;
-						this.$editor.find('inline').each(function(i,s)
-						{
-							_this.utils.replaceToTag(s, 'del');
-						});
-					}
-
-					this.selection.restore();
-					this.code.sync();
-
-				},
-				formatRemoveSameChildren: function($el, tag)
-				{
-					$el.children(tag).each(function()
-					{
-						var $child = $(this);
-						if (!$child.hasClass('redactor-selection-marker'))
-						{
-							$child.contents().unwrap();
-						}
-					});
-				},
-				formatConvert: function(tag)
-				{
-					this.selection.save();
-
-					var find = '';
-					if (this.inline.type == 'class') find = '[data-redactor-class=' + this.inline.value + ']';
-					else if (this.inline.type == 'style')
-					{
-						find = '[data-redactor-style="' + this.inline.value + '"]';
-					}
-
-					if (tag != 'del')
-					{
-						var self = this;
-						this.$editor.find('del').each(function(i,s)
-						{
-							self.utils.replaceToTag(s, 'inline');
-						});
-					}
-
-					this.$editor.find('[data-redactor-tag="' + tag + '"]' + find).each(function()
-					{
-						if (find === '' && tag == 'span' && this.tagName.toLowerCase() == tag) return;
-
-						var $el = $(this);
-						$el.replaceWith($('<strike />').html($el.contents()));
-
-					});
-
-					this.selection.restore();
-				},
-				setFormat: function(node)
-				{
-					switch (this.inline.type)
-					{
-						case 'class':
-
-							if (node.hasClass(this.inline.value))
-							{
-								node.removeClass(this.inline.value);
-								node.removeAttr('data-redactor-class');
-							}
-							else
-							{
-								node.addClass(this.inline.value);
-								node.attr('data-redactor-class', this.inline.value);
-							}
-
-
-						break;
-						case 'style':
-
-							node[0].style.cssText = this.inline.value;
-							node.attr('data-redactor-style', this.inline.value);
-
-						break;
-					}
-
-					return node;
-				},
-				removeStyle: function()
-				{
-					this.buffer.set();
-					var current = this.selection.getCurrent();
-					var nodes = this.selection.getInlines();
-
-					this.selection.save();
-
-					if (current && current.tagName === 'SPAN')
-					{
-						var $s = $(current);
-
-						$s.removeAttr('style');
-						if ($s[0].attributes.length === 0)
-						{
-							$s.replaceWith($s.contents());
-						}
-					}
-
-					$.each(nodes, $.proxy(function(i,s)
-					{
-						var $s = $(s);
-						if ($.inArray(s.tagName.toLowerCase(), this.opts.inlineTags) != -1 && !$s.hasClass('redactor-selection-marker'))
-						{
-							$s.removeAttr('style');
-							if ($s[0].attributes.length === 0)
-							{
-								$s.replaceWith($s.contents());
-							}
-						}
-					}, this));
-
-					this.selection.restore();
-					this.code.sync();
-
-				},
-				removeStyleRule: function(name)
-				{
-					this.buffer.set();
-					var parent = this.selection.getParent();
-					var nodes = this.selection.getInlines();
-
-					this.selection.save();
-
-					if (parent && parent.tagName === 'SPAN')
-					{
-						var $s = $(parent);
-
-						$s.css(name, '');
-						this.utils.removeEmptyAttr($s, 'style');
-						if ($s[0].attributes.length === 0)
-						{
-							$s.replaceWith($s.contents());
-						}
-					}
-
-					$.each(nodes, $.proxy(function(i,s)
-					{
-						var $s = $(s);
-						if ($.inArray(s.tagName.toLowerCase(), this.opts.inlineTags) != -1 && !$s.hasClass('redactor-selection-marker'))
-						{
-							$s.css(name, '');
-							this.utils.removeEmptyAttr($s, 'style');
-							if ($s[0].attributes.length === 0)
-							{
-								$s.replaceWith($s.contents());
-							}
-						}
-					}, this));
-
-					this.selection.restore();
-					this.code.sync();
-				},
-				removeFormat: function()
-				{
-					this.buffer.set();
-					var current = this.selection.getCurrent();
-
-					this.selection.save();
-
-					document.execCommand('removeFormat');
-
-					if (current && current.tagName === 'SPAN')
-					{
-						$(current).replaceWith($(current).contents());
-					}
-
-
-					$.each(this.selection.getNodes(), $.proxy(function(i,s)
-					{
-						var $s = $(s);
-						if ($.inArray(s.tagName.toLowerCase(), this.opts.inlineTags) != -1 && !$s.hasClass('redactor-selection-marker'))
-						{
-							$s.replaceWith($s.contents());
-						}
-					}, this));
-
-					this.selection.restore();
-					this.code.sync();
-
-				},
-				toggleClass: function(className)
-				{
-					this.inline.format('span', 'class', className);
-				},
-				toggleStyle: function(value)
-				{
-					this.inline.format('span', 'style', value);
 				}
 			};
 		},
-		insert: function()
+		paste: function()
 		{
 			return {
-				set: function(html, clean)
+				init: function(e)
 				{
-					this.placeholder.remove();
+					if (!this.opts.cleanOnPaste) return;
 
-					html = this.clean.setVerified(html);
+					this.rtePaste = true;
 
-					if (typeof clean == 'undefined')
+					this.buffer.set();
+					this.selection.save();
+					this.utils.saveScroll();
+
+					this.paste.createPasteBox();
+
+					$(window).on('scroll.redactor-freeze', $.proxy(function()
 					{
-						html = this.clean.onPaste(html, false);
-					}
+						$(window).scrollTop(this.saveBodyScroll);
 
-					this.$editor.html(html);
-					this.selection.remove();
-					this.focus.setEnd();
-					this.clean.normalizeLists();
-					this.code.sync();
-					this.observe.load();
+					}, this));
 
-					if (typeof clean == 'undefined')
+					setTimeout($.proxy(function()
 					{
-						setTimeout($.proxy(this.clean.clearUnverified, this), 10);
-					}
+						var html = this.$pasteBox.html();
+
+						this.$pasteBox.remove();
+
+						this.selection.restore();
+						this.utils.restoreScroll();
+
+						this.paste.insert(html);
+
+						$(window).off('scroll.redactor-freeze');
+
+					}, this), 1);
+
 				},
-				text: function(text)
+				createPasteBox: function()
 				{
-					this.placeholder.remove();
+					this.$pasteBox = $('<div>').html(' ').attr('contenteditable', 'true').css({ position: 'fixed', width: 0, top: 0, left: '-9999px' });
 
-					text = text.toString();
-					text = $.trim(text);
-					text = this.clean.getPlainText(text, false);
+					$(document.body).append(this.$pasteBox);
+					this.$pasteBox.focus();
+				},
+				insert: function(html)
+				{
+					html = this.core.setCallback('pasteBefore', html);
 
-					this.$editor.focus();
+					// clean
+					html = (this.utils.isSelectAll()) ? this.clean.onPaste(html, false) : this.clean.onPaste(html);
 
-					if (this.utils.browser('msie'))
+					html = this.core.setCallback('paste', html);
+
+					if (this.utils.isSelectAll())
 					{
-						this.insert.htmlIe(text);
+						this.insert.set(html, false);
 					}
 					else
 					{
-						this.selection.get();
-
-						this.range.deleteContents();
-						var el = document.createElement("div");
-						el.innerHTML = text;
-						var frag = document.createDocumentFragment(), node, lastNode;
-						while ((node = el.firstChild))
-						{
-							lastNode = frag.appendChild(node);
-						}
-
-						this.range.insertNode(frag);
-
-						if (lastNode)
-						{
-							var range = this.range.cloneRange();
-							range.setStartAfter(lastNode);
-							range.collapse(true);
-							this.sel.removeAllRanges();
-							this.sel.addRange(range);
-						}
+						this.insert.html(html, false);
 					}
 
-					this.code.sync();
-					this.clean.clearUnverified();
-				},
-				htmlWithoutClean: function(html)
-				{
-					this.insert.html(html, false);
-				},
-				html: function(html, clean)
-				{
-					this.placeholder.remove();
+					this.utils.disableSelectAll();
+					this.rtePaste = false;
 
-					if (typeof clean == 'undefined') clean = true;
+					setTimeout($.proxy(this.clean.clearUnverified, this), 10);
 
-					this.$editor.focus();
-
-					html = this.clean.setVerified(html);
-
-					if (clean)
-					{
-						html = this.clean.onPaste(html);
-					}
-
-					if (this.utils.browser('msie'))
-					{
-						this.insert.htmlIe(html);
-					}
-					else
-					{
-						if (this.clean.singleLine) this.insert.execHtml(html);
-						else document.execCommand('insertHTML', null, html);
-
-						this.insert.htmlFixMozilla();
-					}
-
-					this.clean.normalizeLists();
-
-					// remove empty paragraphs finaly
-					if (!this.opts.linebreaks)
-					{
-						this.$editor.find('p').each($.proxy(this.utils.removeEmpty, this));
-					}
-
-					this.code.sync();
-					this.observe.load();
-
-					if (clean)
-					{
-						this.clean.clearUnverified();
-					}
-
-				},
-				htmlFixMozilla: function()
-				{
-					// FF inserts empty p when content was selected dblclick
-					if (!this.utils.browser('mozilla')) return;
-
-					var $next = $(this.selection.getBlock()).next();
-					if ($next.length > 0 && $next[0].tagName == 'P' && $next.html() === '')
-					{
-						$next.remove();
-					}
-
-				},
-				htmlIe: function(html)
-				{
-					if (this.utils.isIe11())
-					{
-						var parent = this.utils.isCurrentOrParent('P');
-						var $html = $('<div>').append(html);
-						var blocksMatch = $html.contents().is('p, :header, dl, ul, ol, div, table, td, blockquote, pre, address, section, header, footer, aside, article');
-
-						if (parent && blocksMatch) this.insert.ie11FixInserting(parent, html);
-						else this.insert.ie11PasteFrag(html);
-
-						return;
-					}
-
-					document.selection.createRange().pasteHTML(html);
-
-				},
-				execHtml: function(html)
-				{
-					html = this.clean.setVerified(html);
-
-					this.selection.get();
-
-					this.range.deleteContents();
-
-					var el = document.createElement('div');
-					el.innerHTML = html;
-
-					var frag = document.createDocumentFragment(), node, lastNode;
-					while ((node = el.firstChild))
-					{
-						lastNode = frag.appendChild(node);
-					}
-
-					this.range.insertNode(frag);
-
-					this.range.collapse(true);
-					this.caret.setAfter(lastNode);
-
-				},
-				node: function(node, deleteContents)
-				{
-					node = node[0] || node;
-
-					var html = this.utils.getOuterHtml(node);
-					html = this.clean.setVerified(html);
-
-					node = $(html)[0];
-
-					this.selection.get();
-
-					if (deleteContents !== false)
-					{
-						this.range.deleteContents();
-					}
-
-					this.range.insertNode(node);
-					this.range.collapse(false);
-					this.selection.addRange();
-
-					return node;
-				},
-				nodeToPoint: function(node, x, y)
-				{
-					node = node[0] || node;
-
-					this.selection.get();
-
-					var range;
-					if (document.caretPositionFromPoint)
-					{
-					    var pos = document.caretPositionFromPoint(x, y);
-
-					    this.range.setStart(pos.offsetNode, pos.offset);
-					    this.range.collapse(true);
-					    this.range.insertNode(node);
-					}
-					else if (document.caretRangeFromPoint)
-					{
-					    range = document.caretRangeFromPoint(x, y);
-					    range.insertNode(node);
-					}
-					else if (typeof document.body.createTextRange != "undefined")
-					{
-				        range = document.body.createTextRange();
-				        range.moveToPoint(x, y);
-				        var endRange = range.duplicate();
-				        endRange.moveToPoint(x, y);
-				        range.setEndPoint("EndToEnd", endRange);
-				        range.select();
-					}
-				},
-				nodeToCaretPositionFromPoint: function(e, node)
-				{
-					node = node[0] || node;
-
-					var range;
-					var x = e.clientX, y = e.clientY;
-					if (document.caretPositionFromPoint)
-					{
-					    var pos = document.caretPositionFromPoint(x, y);
-					    var sel = document.getSelection();
-					    range = sel.getRangeAt(0);
-					    range.setStart(pos.offsetNode, pos.offset);
-					    range.collapse(true);
-					    range.insertNode(node);
-					}
-					else if (document.caretRangeFromPoint)
-					{
-					    range = document.caretRangeFromPoint(x, y);
-					    range.insertNode(node);
-					}
-					else if (typeof document.body.createTextRange != "undefined")
-					{
-				        range = document.body.createTextRange();
-				        range.moveToPoint(x, y);
-				        var endRange = range.duplicate();
-				        endRange.moveToPoint(x, y);
-				        range.setEndPoint("EndToEnd", endRange);
-				        range.select();
-					}
-
-				},
-				ie11FixInserting: function(parent, html)
-				{
-					var node = document.createElement('span');
-					node.className = 'redactor-ie-paste';
-					this.insert.node(node);
-
-					var parHtml = $(parent).html();
-
-					parHtml = '<p>' + parHtml.replace(/<span class="redactor-ie-paste"><\/span>/gi, '</p>' + html + '<p>') + '</p>';
-					$(parent).replaceWith(parHtml);
-				},
-				ie11PasteFrag: function(html)
-				{
-					this.selection.get();
-					this.range.deleteContents();
-
-					var el = document.createElement("div");
-					el.innerHTML = html;
-
-					var frag = document.createDocumentFragment(), node, lastNode;
-					while ((node = el.firstChild))
-					{
-						lastNode = frag.appendChild(node);
-					}
-
-					this.range.insertNode(frag);
 				}
 			};
 		},
@@ -4357,12 +3526,14 @@
 							}
 							else
 							{
-								if ($next.length === 0 && current === false && typeof $next.context != 'undefined')
+								if (typeof $next[0] == 'undefined')
 								{
 									return this.keydown.insertDblBreakLine(e);
 								}
-
-								return this.keydown.insertBreakLine(e);
+								else
+								{
+									return this.keydown.insertBreakLine(e);
+								}
 							}
 						}
 						else if (this.opts.linebreaks && this.keydown.block)
@@ -4370,7 +3541,7 @@
 							setTimeout($.proxy(this.keydown.replaceDivToBreakLine, this), 1);
 						}
 						// paragraphs
-						else if (!this.opts.linebreaks && this.keydown.block && this.keydown.block.tagName !== 'LI')
+						else if (!this.opts.linebreaks && this.keydown.block)
 						{
 							setTimeout($.proxy(this.keydown.replaceDivToParagraph, this), 1);
 						}
@@ -4769,7 +3940,6 @@
 					this.keyup.parent = this.selection.getParent();
 					var $parent = this.utils.isRedactorParent($(this.keyup.parent).parent());
 
-
 					// callback
 					var keyupStop = this.core.setCallback('keyup', e);
 					if (keyupStop === false)
@@ -4784,7 +3954,7 @@
 						this.keyup.replaceToParagraph();
 					}
 
-					if (!this.opts.linebreaks && $(this.keyup.parent).hasClass('redactor-invisible-space') && ($parent === false || $parent[0].tagName == 'BODY'))
+					if ($(this.keyup.parent).hasClass('redactor-invisible-space') && ($parent === false || $parent[0].tagName == 'BODY'))
 					{
 						$(this.keyup.parent).contents().unwrap();
 						this.keyup.replaceToParagraph();
@@ -4875,16 +4045,107 @@
 				}
 			};
 		},
-		lang: function()
+		shortcuts: function()
 		{
 			return {
-				load: function()
+				init: function(e, key)
 				{
-					this.opts.curLang = this.opts.langs[this.opts.lang];
+					// disable browser's hot keys for bold and italic
+					if (!this.opts.shortcuts)
+					{
+						if ((e.ctrlKey || e.metaKey) && (key === 66 || key === 73)) e.preventDefault();
+						return false;
+					}
+
+					$.each(this.opts.shortcuts, $.proxy(function(str, command)
+					{
+						var keys = str.split(',');
+						var len = keys.length;
+						for (var i = 0; i < len; i++)
+						{
+							if (typeof keys[i] === 'string')
+							{
+								this.shortcuts.handler(e, $.trim(keys[i]), $.proxy(function()
+								{
+									var func;
+									if (command.func.search(/\./) != '-1')
+									{
+										func = command.func.split('.');
+										if (typeof this[func[0]] != 'undefined')
+										{
+											this[func[0]][func[1]].apply(this, command.params);
+										}
+									}
+									else
+									{
+										this[command.func].apply(this, command.params);
+									}
+
+								}, this));
+							}
+
+						}
+
+					}, this));
 				},
-				get: function(name)
+				handler: function(e, keys, origHandler)
 				{
-					return (typeof this.opts.curLang[name] != 'undefined') ? this.opts.curLang[name] : '';
+					// based on https://github.com/jeresig/jquery.hotkeys
+					var hotkeysSpecialKeys =
+					{
+						8: "backspace", 9: "tab", 10: "return", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
+						20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
+						37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", 59: ";", 61: "=",
+						96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
+						104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/",
+						112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8",
+						120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 173: "-", 186: ";", 187: "=",
+						188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\", 221: "]", 222: "'"
+					};
+
+
+					var hotkeysShiftNums =
+					{
+						"`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&",
+						"8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<",
+						".": ">",  "/": "?",  "\\": "|"
+					};
+
+					keys = keys.toLowerCase().split(" ");
+					var special = hotkeysSpecialKeys[e.keyCode],
+						character = String.fromCharCode( e.which ).toLowerCase(),
+						modif = "", possible = {};
+
+					$.each([ "alt", "ctrl", "meta", "shift"], function(index, specialKey)
+					{
+						if (e[specialKey + 'Key'] && special !== specialKey)
+						{
+							modif += specialKey + '+';
+						}
+					});
+
+
+					if (special) possible[modif + special] = true;
+					if (character)
+					{
+						possible[modif + character] = true;
+						possible[modif + hotkeysShiftNums[character]] = true;
+
+						// "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
+						if (modif === "shift+")
+						{
+							possible[hotkeysShiftNums[character]] = true;
+						}
+					}
+
+					for (var i = 0, len = keys.length; i < len; i++)
+					{
+						if (possible[keys[i]])
+						{
+							e.preventDefault();
+							return origHandler.apply(this, arguments);
+						}
+					}
 				}
 			};
 		},
@@ -4967,224 +4228,6 @@
 				}
 			};
 		},
-		link: function()
-		{
-			return {
-				show: function(e)
-				{
-					if (typeof e != 'undefined' && e.preventDefault) e.preventDefault();
-
-					this.modal.load('link', this.lang.get('link_insert'), 600);
-
-					this.modal.createCancelButton();
-					this.link.buttonInsert = this.modal.createActionButton(this.lang.get('insert'));
-
-					this.selection.get();
-
-					this.link.getData();
-					this.link.cleanUrl();
-
-					if (this.link.target == '_blank') $('#redactor-link-blank').prop('checked', true);
-
-					this.link.$inputUrl = $('#redactor-link-url');
-					this.link.$inputText = $('#redactor-link-url-text');
-
-					this.link.$inputText.val(this.link.text);
-					this.link.$inputUrl.val(this.link.url);
-
-					this.link.buttonInsert.on('click', $.proxy(this.link.insert, this));
-
-					// hide link's tooltip
-					$('.redactor-link-tooltip').remove();
-
-					// show modal
-					this.selection.save();
-					this.modal.show();
-					this.link.$inputUrl.focus();
-				},
-				cleanUrl: function()
-				{
-					var thref = self.location.href.replace(/\/$/i, '');
-					this.link.url = this.link.url.replace(thref, '');
-					this.link.url = this.link.url.replace(/^\/#/, '#');
-					this.link.url = this.link.url.replace('mailto:', '');
-
-					// remove host from href
-					if (!this.opts.linkProtocol)
-					{
-						var re = new RegExp('^(http|ftp|https)://' + self.location.host, 'i');
-						this.link.url = this.link.url.replace(re, '');
-					}
-
-				},
-				getData: function()
-				{
-					this.link.$node = false;
-
-					var $el = $(this.selection.getCurrent()).closest('a');
-					if ($el.size() !== 0 && $el[0].tagName === 'A')
-					{
-						this.link.$node = $el;
-
-						this.link.url = $el.attr('href');
-						this.link.text = $el.text();
-						this.link.target = $el.attr('target');
-					}
-					else
-					{
-						this.link.text = this.sel.toString();
-						this.link.url = '';
-						this.link.target = '';
-					}
-
-				},
-				insert: function()
-				{
-					var target = '';
-					var link = this.link.$inputUrl.val();
-					var text = this.link.$inputText.val();
-
-					if ($.trim(link) === '')
-					{
-						this.link.$inputUrl.addClass('redactor-input-error').on('keyup', function()
-						{
-							$(this).removeClass('redactor-input-error');
-							$(this).off('keyup');
-
-						});
-
-						return;
-					}
-
-					// mailto
-					if (link.search('@') != -1 && /(http|ftp|https):\/\//i.test(link) === false)
-					{
-						link = 'mailto:' + link;
-					}
-					// url, not anchor
-					else if (link.search('#') !== 0)
-					{
-						if ($('#redactor-link-blank').prop('checked'))
-						{
-							target = '_blank';
-						}
-
-						// test url (add protocol)
-						var pattern = '((xn--)?[a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,}';
-						var re = new RegExp('^(http|ftp|https)://' + pattern, 'i');
-						var re2 = new RegExp('^' + pattern, 'i');
-
-						if (link.search(re) == -1 && link.search(re2) === 0 && this.opts.linkProtocol)
-						{
-							link = this.opts.linkProtocol + '://' + link;
-						}
-					}
-
-					this.link.set(text, link, target);
-					this.modal.close();
-				},
-				set: function(text, link, target)
-				{
-					text = $.trim(text.replace(/<|>/g, ''));
-
-					this.selection.restore();
-
-					if (text === '' && link === '') return;
-					if (text === '' && link !== '') text = link;
-
-					if (this.link.$node)
-					{
-						this.buffer.set();
-
-						this.link.$node.text(text).attr('href', link);
-						if (target !== '')
-						{
-							this.link.$node.attr('target', target);
-						}
-						else
-						{
-							this.link.$node.removeAttr('target');
-						}
-
-						this.code.sync();
-					}
-					else
-					{
-						if (this.utils.browser('mozilla') && this.link.text === '')
-						{
-							var $a = $('<a />').attr('href', link).text(text);
-							if (target !== '') $a.attr('target', target);
-
-							this.insert.node($a);
-							this.selection.selectElement($a);
-						}
-						else
-						{
-							var $a;
-							if (this.utils.browser('msie'))
-							{
-								$a = $('<a href="' + link + '">').text(text);
-								if (target !== '') $a.attr('target', target);
-
-								$a = $(this.insert.node($a));
-								this.selection.selectElement($a);
-							}
-							else
-							{
-								document.execCommand('createLink', false, link);
-
-								$a = $(this.selection.getCurrent()).closest('a');
-
-								if (target !== '') $a.attr('target', target);
-								$a.removeAttr('style');
-
-								if (this.link.text === '')
-								{
-									$a.text(text);
-									this.selection.selectElement($a);
-								}
-							}
-						}
-
-						this.code.sync();
-						this.core.setCallback('insertedLink', $a);
-
-					}
-
-					// link tooltip
-					setTimeout($.proxy(function()
-					{
-						this.observe.links();
-
-					}, this), 5);
-				},
-				unlink: function(e)
-				{
-					if (typeof e != 'undefined' && e.preventDefault) e.preventDefault();
-
-					var nodes = this.selection.getNodes();
-					if (!nodes) return;
-
-					this.buffer.set();
-
-					var len = nodes.length;
-					for (var i = 0; i < len; i++)
-					{
-						if (nodes[i].tagName == 'A')
-						{
-							var $node = $(nodes[i]);
-							$node.replaceWith($node.contents());
-						}
-					}
-
-					// hide link's tooltip
-					$('.redactor-link-tooltip').remove();
-
-					this.code.sync();
-
-				}
-			};
-		},
 		list: function()
 		{
 			return {
@@ -5252,7 +4295,7 @@
 					var parent = this.selection.getParent();
 					var $list = $(parent).closest('ol, ul');
 
-					if (this.utils.isEmpty($list.find('li').text()))
+					if (!this.opts.linebreaks && this.utils.isEmpty($list.find('li').text()))
 					{
 						var $children = $list.children('li');
 						$children.find('br').remove();
@@ -5323,7 +4366,7 @@
 					if (!this.opts.linebreaks && $current.closest('li, th, td').size() === 0)
 					{
 						document.execCommand('formatblock', false, 'p');
-						this.$editor.find('ul, ol, blockquote').each($.proxy(this.utils.removeEmpty, this));
+						this.$editor.find('ul, ol, blockquote, p').each($.proxy(this.utils.removeEmpty, this));
 					}
 
 					var $table = $(this.selection.getCurrent()).closest('table');
@@ -5338,741 +4381,1239 @@
 				}
 			};
 		},
-		modal: function()
+		block: function()
 		{
 			return {
-				callbacks: {},
-				loadTemplates: function()
+				formatting: function(name)
 				{
-					this.opts.modal = {
-						imageEdit: String()
-						+ '<section id="redactor-modal-image-edit">'
-							+ '<label>' + this.lang.get('title') + '</label>'
-							+ '<input type="text" id="redactor-image-title" />'
-							+ '<label class="redactor-image-link-option">' + this.lang.get('link') + '</label>'
-							+ '<input type="text" id="redactor-image-link" class="redactor-image-link-option" />'
-							+ '<label class="redactor-image-link-option"><input type="checkbox" id="redactor-image-link-blank"> ' + this.lang.get('link_new_tab') + '</label>'
-							+ '<label class="redactor-image-position-option">' + this.lang.get('image_position') + '</label>'
-							+ '<select class="redactor-image-position-option" id="redactor-image-align">'
-								+ '<option value="none">' + this.lang.get('none') + '</option>'
-								+ '<option value="left">' + this.lang.get('left') + '</option>'
-								+ '<option value="center">' + this.lang.get('center') + '</option>'
-								+ '<option value="right">' + this.lang.get('right') + '</option>'
-							+ '</select>'
-						+ '</section>',
+					var type, value;
 
-						image: String()
-						+ '<section id="redactor-modal-image-insert">'
-							+ '<div id="redactor-modal-image-droparea"></div>'
- 						+ '</section>',
+					if (typeof this.formatting[name].data != 'undefined') type = 'data';
+					else if (typeof this.formatting[name].attr != 'undefined') type = 'attr';
+					else if (typeof this.formatting[name].class != 'undefined') type = 'class';
 
-						file: String()
-						+ '<section id="redactor-modal-file-insert">'
-							+ '<div id="redactor-modal-file-upload-box">'
-								+ '<label>' + this.lang.get('filename') + '</label>'
-								+ '<input type="text" id="redactor-filename" /><br><br>'
-								+ '<div id="redactor-modal-file-upload"></div>'
-							+ '</div>'
-						+ '</section>',
+					if (type) value = this.formatting[name][type];
 
-						link: String()
-						+ '<section id="redactor-modal-link-insert">'
-							+ '<label>URL</label>'
-							+ '<input type="url" id="redactor-link-url" />'
-							+ '<label>' + this.lang.get('text') + '</label>'
-							+ '<input type="text" id="redactor-link-url-text" />'
-							+ '<label><input type="checkbox" id="redactor-link-blank"> ' + this.lang.get('link_new_tab') + '</label>'
-						+ '</section>'
-					};
-
-
-					$.extend(this.opts, this.opts.modal);
+					this.block.format(this.formatting[name].tag, type, value);
 
 				},
-				addCallback: function(name, callback)
+				format: function(tag, type, value)
 				{
-					this.modal.callbacks[name] = callback;
-				},
-				createTabber: function($modal)
-				{
-					this.modal.$tabber = $('<div>').attr('id', 'redactor-modal-tabber');
+					if (tag == 'quote') tag = 'blockquote';
 
-					$modal.prepend(this.modal.$tabber);
-				},
-				addTab: function(id, name, active)
-				{
-					var $tab = $('<a href="#" rel="tab' + id + '">').text(name);
-					if (active)
-					{
-						$tab.addClass('active');
-					}
+					var formatTags = ['p', 'pre', 'blockquote', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
+					if ($.inArray(tag, formatTags) == -1) return;
 
-					var self = this;
-					$tab.on('click', function(e)
-					{
-						e.preventDefault();
-						$('.redactor-tab').hide();
-						$('.redactor-' + $(this).attr('rel')).show();
+					this.block.isRemoveInline = (tag == 'pre' || tag.search(/h[1-6]/i) != -1);
 
-						self.modal.$tabber.find('a').removeClass('active');
-						$(this).addClass('active');
+					// focus
+					if (!this.utils.browser('msie')) this.$editor.focus();
 
-					});
+					this.block.blocks = this.selection.getBlocks();
 
-					this.modal.$tabber.append($tab);
-				},
-				addTemplate: function(name, template)
-				{
-					this.opts.modal[name] = template;
-				},
-				getTemplate: function(name)
-				{
-					return this.opts.modal[name];
-				},
-				getModal: function()
-				{
-					return this.$modalBody.find('section');
-				},
-				load: function(templateName, title, width)
-				{
-					this.modal.templateName = templateName;
-					this.modal.width = width;
-
-					this.modal.build();
-					this.modal.enableEvents();
-					this.modal.setTitle(title);
-					this.modal.setDraggable();
-					this.modal.setContent();
-
-					// callbacks
-					if (typeof this.modal.callbacks[templateName] != 'undefined')
-					{
-						this.modal.callbacks[templateName].call(this);
-					}
-
-				},
-				show: function()
-				{
-					// ios keyboard hide
-					document.activeElement.blur();
-
-					$(document.body).removeClass('body-hidden');
-					this.modal.bodyOveflow = $(document.body).css('overflow');
-					$(document.body).css('overflow', 'hidden');
-
-					if (this.utils.isMobile())
-					{
-						this.modal.showOnMobile();
-					}
-					else
-					{
-						this.modal.showOnDesktop();
-					}
-
-					this.$modalOverlay.show();
-					this.$modalBox.show();
-
-					this.modal.setButtonsWidth();
-
-					this.utils.saveScroll();
-
-					// resize
-					if (!this.utils.isMobile())
-					{
-						setTimeout($.proxy(this.modal.showOnDesktop, this), 0);
-						$(window).on('resize.redactor-modal', $.proxy(this.modal.resize, this));
-					}
-
-					// modal shown callback
-					this.core.setCallback('modalOpened', this.modal.templateName, this.$modal);
-
-					// fix bootstrap modal focus
-					$(document).off('focusin.modal');
-
-					// enter
-					this.$modal.find('input[type=text]').on('keydown.redactor-modal', $.proxy(this.modal.setEnter, this));
-
-				},
-				showOnDesktop: function()
-				{
-					var height = this.$modal.outerHeight();
-					var windowHeight = $(window).height();
-					var windowWidth = $(window).width();
-
-					if (this.modal.width > windowWidth)
-					{
-						this.$modal.css({
-							width: '96%',
-							marginTop: (windowHeight/2 - height/2) + 'px'
-						});
-						return;
-					}
-
-					if (height > windowHeight)
-					{
-						this.$modal.css({
-							width: this.modal.width + 'px',
-							marginTop: '20px'
-						});
-					}
-					else
-					{
-						this.$modal.css({
-							width: this.modal.width + 'px',
-							marginTop: (windowHeight/2 - height/2) + 'px'
-						});
-					}
-				},
-				showOnMobile: function()
-				{
-					this.$modal.css({
-						width: '96%',
-						marginTop: '2%'
-					});
-
-				},
-				resize: function()
-				{
-					if (this.utils.isMobile())
-					{
-						this.modal.showOnMobile();
-					}
-					else
-					{
-						this.modal.showOnDesktop();
-					}
-				},
-				setTitle: function(title)
-				{
-					this.$modalHeader.html(title);
-				},
-				setContent: function()
-				{
-					this.$modalBody.html(this.modal.getTemplate(this.modal.templateName));
-				},
-				setDraggable: function()
-				{
-					if (typeof $.fn.draggable === 'undefined') return;
-
-					this.$modal.draggable({ handle: this.$modalHeader });
-					this.$modalHeader.css('cursor', 'move');
-				},
-				setEnter: function(e)
-				{
-					if (e.which != 13) return;
-
-					e.preventDefault();
-					this.$modal.find('button.redactor-modal-action-btn').click();
-				},
-				createCancelButton: function()
-				{
-					var button = $('<button>').addClass('redactor-modal-btn redactor-modal-close-btn').html(this.lang.get('cancel'));
-					button.on('click', $.proxy(this.modal.close, this));
-
-					this.$modalFooter.append(button);
-				},
-				createDeleteButton: function(label)
-				{
-					return this.modal.createButton(label, 'delete');
-				},
-				createActionButton: function(label)
-				{
-					return this.modal.createButton(label, 'action');
-				},
-				createButton: function(label, className)
-				{
-					var button = $('<button>').addClass('redactor-modal-btn').addClass('redactor-modal-' + className + '-btn').html(label);
-					this.$modalFooter.append(button);
-
-					return button;
-				},
-				setButtonsWidth: function()
-				{
-					var buttons = this.$modalFooter.find('button');
-					var buttonsSize = buttons.size();
-					if (buttonsSize === 0) return;
-
-					buttons.css('width', (100/buttonsSize) + '%');
-				},
-				build: function()
-				{
-					this.modal.buildOverlay();
-
-					this.$modalBox = $('<div id="redactor-modal-box" />').hide();
-					this.$modal = $('<div id="redactor-modal" />');
-					this.$modalHeader = $('<header />');
-					this.$modalClose = $('<span id="redactor-modal-close" />').html('&times;');
-					this.$modalBody = $('<div id="redactor-modal-body" />');
-					this.$modalFooter = $('<footer />');
-
-					this.$modal.append(this.$modalHeader);
-					this.$modal.append(this.$modalClose);
-					this.$modal.append(this.$modalBody);
-					this.$modal.append(this.$modalFooter);
-					this.$modalBox.append(this.$modal);
-					this.$modalBox.appendTo(document.body);
-				},
-				buildOverlay: function()
-				{
-					this.$modalOverlay = $('<div id="redactor-modal-overlay">').hide();
-					$('body').prepend(this.$modalOverlay);
-				},
-				enableEvents: function()
-				{
-					this.$modalClose.on('click.redactor-modal', $.proxy(this.modal.close, this));
-					$(document).on('keyup.redactor-modal', $.proxy(this.modal.closeHandler, this));
-					this.$editor.on('keyup.redactor-modal', $.proxy(this.modal.closeHandler, this));
-					this.$modalBox.on('click.redactor-modal', $.proxy(this.modal.close, this));
-				},
-				disableEvents: function()
-				{
-					this.$modalClose.off('click.redactor-modal');
-					$(document).off('keyup.redactor-modal');
-					this.$editor.off('keyup.redactor-modal');
-					this.$modalBox.off('click.redactor-modal');
-					$(window).off('resize.redactor-modal');
-				},
-				closeHandler: function(e)
-				{
-					if (e.which != this.keyCode.ESC) return;
-
-					this.modal.close(false);
-				},
-				close: function(e)
-				{
-					if (e)
-					{
-						if (!$(e.target).hasClass('redactor-modal-close-btn') && e.target != this.$modalClose[0] && e.target != this.$modalBox[0])
-						{
-							return;
-						}
-
-						e.preventDefault();
-					}
-
-					if (!this.$modalBox) return;
-
-					this.modal.disableEvents();
-
-					this.$modalOverlay.remove();
-
-					this.$modalBox.fadeOut('fast', $.proxy(function()
-					{
-						this.$modalBox.remove();
-
-						setTimeout($.proxy(this.utils.restoreScroll, this), 0);
-
-						if (e !== undefined) this.selection.restore();
-
-						$(document.body).css('overflow', this.modal.bodyOveflow);
-						this.core.setCallback('modalClosed', this.modal.templateName);
-
-					}, this));
-
-				}
-			};
-		},
-		observe: function()
-		{
-			return {
-				load: function()
-				{
-					this.observe.images();
-					this.observe.links();
-				},
-				buttons: function(e, btnName)
-				{
-					var current = this.selection.getCurrent();
-					var parent = this.selection.getParent();
-
-					this.button.setInactiveAll(btnName);
-
-					if (e === false && btnName !== 'html')
-					{
-						if ($.inArray(btnName, this.opts.activeButtons) != -1) this.button.toggleActive(btnName);
-						return;
-					}
-
-					//var linkButtonName = (this.utils.isCurrentOrParent('A')) ? this.lang.get('link_edit') : this.lang.get('link_insert');
-					//$('body').find('a.redactor-dropdown-link').text(linkButtonName);
-
-					$.each(this.opts.activeButtonsStates, $.proxy(function(key, value)
-					{
-						var parentEl = $(parent).closest(key);
-						var currentEl = $(current).closest(key);
-
-						if (parentEl.length !== 0 && !this.utils.isRedactorParent(parentEl)) return;
-						if (!this.utils.isRedactorParent(currentEl)) return;
-						if (parentEl.length !== 0 || currentEl.closest(key).length !== 0)
-						{
-							this.button.setActive(value);
-						}
-
-					}, this));
-
-					var $parent = $(parent).closest(this.opts.alignmentTags.toString().toLowerCase());
-					if (this.utils.isRedactorParent(parent) && $parent.length)
-					{
-						var align = ($parent.css('text-align') === '') ? 'left' : $parent.css('text-align');
-						this.button.setActive('align' + align);
-					}
-				},
-				addButton: function(tag, btnName)
-				{
-					this.opts.activeButtons.push(btnName);
-					this.opts.activeButtonsStates[tag] = btnName;
-				},
-				images: function()
-				{
-					this.$editor.find('img').each($.proxy(function(i, img)
-					{
-						var $img = $(img);
-
-						// IE fix (when we clicked on an image and then press backspace IE does goes to image's url)
-						$img.closest('a').on('click', function(e) { e.preventDefault(); });
-
-						if (this.utils.browser('msie')) $img.attr('unselectable', 'on');
-
-						this.image.setEditable($img);
-
-					}, this));
-
-					$(document).on('click.redactor-image-delete', $.proxy(function(e)
-					{
-						this.observe.image = false;
-						if (e.target.tagName == 'IMG' && this.utils.isRedactorParent(e.target))
-						{
-							this.observe.image = (this.observe.image && this.observe.image == e.target) ? false : e.target;
-						}
-
-					}, this));
-
-				},
-				links: function()
-				{
-					if (!this.opts.linkTooltip) return;
-
-					this.$editor.find('a').on('touchstart click', $.proxy(this.observe.showTooltip, this));
-					this.$editor.on('touchstart click.redactor', $.proxy(this.observe.closeTooltip, this));
-					$(document).on('touchstart click.redactor', $.proxy(this.observe.closeTooltip, this));
-				},
-				getTooltipPosition: function($link)
-				{
-					return $link.offset();
-				},
-				showTooltip: function(e)
-				{
-					var $link = $(e.target);
-					var $parent = $link.closest('a');
-					if ($parent.size() !== 0 && $parent[0].tagName === 'A' && $link[0].tagName !== 'A')
-					{
-						$link = $parent;
-					}
-					else if ($link.size() === 0 || $link[0].tagName !== 'A')
-					{
-						return;
-					}
-
-					var pos = this.observe.getTooltipPosition($link);
-					var tooltip = $('<span class="redactor-link-tooltip"></span>');
-
-					var href = $link.attr('href');
-					if (href === undefined)
-					{
-						href = '';
-					}
-
-					if (href.length > 24) href = href.substring(0, 24) + '...';
-
-					var aLink = $('<a href="' + $link.attr('href') + '" target="_blank" />').html(href).addClass('redactor-link-tooltip-action');
-					var aEdit = $('<a href="#" />').html(this.lang.get('edit')).on('click', $.proxy(this.link.show, this)).addClass('redactor-link-tooltip-action');
-					var aUnlink = $('<a href="#" />').html(this.lang.get('unlink')).on('click', $.proxy(this.link.unlink, this)).addClass('redactor-link-tooltip-action');
-
-					tooltip.append(aLink).append(' | ').append(aEdit).append(' | ').append(aUnlink);
-					tooltip.css({
-						top: (pos.top + 20) + 'px',
-						left: pos.left + 'px'
-					});
-
-					$('.redactor-link-tooltip').remove();
-					$('body').append(tooltip);
-				},
-				closeTooltip: function(e)
-				{
-					e = e.originalEvent || e;
-
-					var target = e.target;
-					var $parent = $(target).closest('a');
-					if ($parent.size() !== 0 && $parent[0].tagName === 'A' && target.tagName !== 'A')
-					{
-						return;
-					}
-					else if ((target.tagName === 'A' && this.utils.isRedactorParent(target)) || $(target).hasClass('redactor-link-tooltip-action'))
-					{
-						return;
-					}
-
-					$('.redactor-link-tooltip').remove();
-				}
-
-			};
-		},
-		paragraphize: function()
-		{
-			return {
-				load: function(html)
-				{
-					if (this.opts.linebreaks) return html;
-					if (html === '' || html === '<p></p>') return this.opts.emptyHtml;
-
-					this.paragraphize.blocks = ['table', 'div', 'pre', 'form', 'ul', 'ol', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'dl', 'blockquote', 'figcaption',
-					'address', 'section', 'header', 'footer', 'aside', 'article', 'object', 'style', 'script', 'iframe', 'select', 'input', 'textarea',
-					'button', 'option', 'map', 'area', 'math', 'hr', 'fieldset', 'legend', 'hgroup', 'nav', 'figure', 'details', 'menu', 'summary', 'p'];
-
-					html = html + "\n";
-
-					this.paragraphize.safes = [];
-					this.paragraphize.z = 0;
-
-					html = html.replace(/(<br\s?\/?>){1,}\n?<\/blockquote>/gi, '</blockquote>');
-
-					html = this.paragraphize.getSafes(html);
-					html = this.paragraphize.getSafesComments(html);
-					html = this.paragraphize.replaceBreaksToNewLines(html);
-					html = this.paragraphize.replaceBreaksToParagraphs(html);
-					html = this.paragraphize.clear(html);
-					html = this.paragraphize.restoreSafes(html);
-
-					html = html.replace(new RegExp('<br\\s?/?>\n?<(' + this.paragraphize.blocks.join('|') + ')(.*?[^>])>', 'gi'), '<p><br /></p>\n<$1$2>');
-
-					return $.trim(html);
-				},
-				getSafes: function(html)
-				{
-					var $div = $('<div />').append(html);
-
-					// remove paragraphs in blockquotes
-					$div.find('blockquote p').replaceWith(function()
-					{
-						return $(this).append('<br />').contents();
-					});
-
-					html = $div.html();
-
-					$div.find(this.paragraphize.blocks.join(', ')).each($.proxy(function(i,s)
-					{
-						this.paragraphize.z++;
-						this.paragraphize.safes[this.paragraphize.z] = s.outerHTML;
-						html = html.replace(s.outerHTML, '\n{replace' + this.paragraphize.z + '}');
-
-					}, this));
-
-					return html;
-				},
-				getSafesComments: function(html)
-				{
-					var commentsMatches = html.match(/<!--([\w\W]*?)-->/gi);
-
-					if (!commentsMatches) return html;
-
-					$.each(commentsMatches, $.proxy(function(i,s)
-					{
-						this.paragraphize.z++;
-						this.paragraphize.safes[this.paragraphize.z] = s;
-						html = html.replace(s, '\n{replace' + this.paragraphize.z + '}');
-					}, this));
-
-					return html;
-				},
-				restoreSafes: function(html)
-				{
-					$.each(this.paragraphize.safes, function(i,s)
-					{
-						html = html.replace('{replace' + i + '}', s);
-					});
-
-					return html;
-				},
-				replaceBreaksToParagraphs: function(html)
-				{
-					var htmls = html.split(new RegExp('\n', 'g'), -1);
-
-					html = '';
-					if (htmls)
-					{
-						var len = htmls.length;
-						for (var i = 0; i < len; i++)
-						{
-							if (!htmls.hasOwnProperty(i)) return;
-
-							if (htmls[i].search('{replace') == -1)
-							{
-								htmls[i] = htmls[i].replace(/<p>\n\t?<\/p>/gi, '');
-								htmls[i] = htmls[i].replace(/<p><\/p>/gi, '');
-
-								if (htmls[i] !== '')
-								{
-									html += '<p>' +  htmls[i].replace(/^\n+|\n+$/g, "") + "</p>";
-								}
-							}
-							else html += htmls[i];
-						}
-					}
-
-					return html;
-				},
-				replaceBreaksToNewLines: function(html)
-				{
-					html = html.replace(/<br \/>\s*<br \/>/gi, "\n\n");
-					html = html.replace(/<br\s?\/?>\n?<br\s?\/?>/gi, "\n<br /><br />");
-
-					html = html.replace(new RegExp("\r\n", 'g'), "\n");
-					html = html.replace(new RegExp("\r", 'g'), "\n");
-					html = html.replace(new RegExp("/\n\n+/"), 'g', "\n\n");
-
-					return html;
-				},
-				clear: function(html)
-				{
-					html = html.replace(new RegExp('</blockquote></p>', 'gi'), '</blockquote>');
-					html = html.replace(new RegExp('<p></blockquote>', 'gi'), '</blockquote>');
-					html = html.replace(new RegExp('<p><blockquote>', 'gi'), '<blockquote>');
-					html = html.replace(new RegExp('<blockquote></p>', 'gi'), '<blockquote>');
-
-					html = html.replace(new RegExp('<p><p ', 'gi'), '<p ');
-					html = html.replace(new RegExp('<p><p>', 'gi'), '<p>');
-					html = html.replace(new RegExp('</p></p>', 'gi'), '</p>');
-					html = html.replace(new RegExp('<p>\\s?</p>', 'gi'), '');
-					html = html.replace(new RegExp("\n</p>", 'gi'), '</p>');
-					html = html.replace(new RegExp('<p>\t?\t?\n?<p>', 'gi'), '<p>');
-					html = html.replace(new RegExp('<p>\t*</p>', 'gi'), '');
-
-					return html;
-				}
-			};
-		},
-		paste: function()
-		{
-			return {
-				init: function(e)
-				{
-					if (!this.opts.cleanOnPaste) return;
-
-					this.rtePaste = true;
+					this.block.blocksSize = this.block.blocks.length;
+					this.block.type = type;
+					this.block.value = value;
 
 					this.buffer.set();
 					this.selection.save();
-					this.utils.saveScroll();
 
-					this.paste.createPasteBox();
+					this.block.set(tag);
 
-					$(window).on('scroll.redactor-freeze', $.proxy(function()
+					this.selection.restore();
+					this.code.sync();
+
+				},
+				set: function(tag)
+				{
+					this.selection.get();
+					this.block.containerTag = this.range.commonAncestorContainer.tagName;
+
+					if (this.range.collapsed)
 					{
-						$(window).scrollTop(this.saveBodyScroll);
+						this.block.setCollapsed(tag);
+					}
+					else
+					{
+						this.block.setMultiple(tag);
+					}
+				},
+				setCollapsed: function(tag)
+				{
+					var block = this.block.blocks[0];
+					if (block === false) return;
+
+					if (block.tagName == 'LI')
+					{
+						if (tag != 'blockquote') return;
+
+						this.block.formatListToBlockquote();
+						return;
+					}
+
+					var isContainerTable = (this.block.containerTag  == 'TD' || this.block.containerTag  == 'TH');
+					if (isContainerTable)
+					{
+						if (!this.opts.linebreaks && tag == 'p')
+						{
+							document.execCommand('formatblock', false, '<' + tag + '>');
+
+							block = this.selection.getBlock();
+							this.block.toggle($(block));
+						}
+					}
+					else if (block.tagName.toLowerCase() != tag)
+					{
+						if (this.opts.linebreaks && tag == 'p')
+						{
+							$(block).prepend('<br>').append('<br>');
+							this.utils.replaceWithContents(block);
+						}
+						else
+						{
+							var $formatted = this.utils.replaceToTag(block, tag);
+
+							this.block.toggle($formatted);
+
+							if (tag != 'p' && tag != 'blockquote') $formatted.find('img').remove();
+							if (this.block.isRemoveInline) this.utils.removeInlineTags($formatted);
+							if (tag == 'p' || this.block.headTag) $formatted.find('p').contents().unwrap();
+						}
+					}
+					else if (tag == 'blockquote' && block.tagName.toLowerCase() == tag)
+					{
+						// blockquote off
+						if (this.opts.linebreaks)
+						{
+							$(block).prepend('<br>').append('<br>');
+							this.utils.replaceWithContents(block);
+						}
+						else
+						{
+							var $el = this.utils.replaceToTag(block, 'p');
+							this.block.toggle($el);
+						}
+					}
+					else if (block.tagName.toLowerCase() == tag)
+					{
+						this.block.toggle($(block));
+					}
+
+				},
+				setMultiple: function(tag)
+				{
+					var block = this.block.blocks[0];
+					var isContainerTable = (this.block.containerTag  == 'TD' || this.block.containerTag  == 'TH');
+
+					if (block !== false && this.block.blocksSize === 1)
+					{
+						if (block.tagName.toLowerCase() == tag &&  tag == 'blockquote')
+						{
+							// blockquote off
+							if (this.opts.linebreaks)
+							{
+								$(block).prepend('<br>').append('<br>');
+								this.utils.replaceWithContents(block);
+							}
+							else
+							{
+								var $el = this.utils.replaceToTag(block, 'p');
+								this.block.toggle($el);
+							}
+						}
+						else if (block.tagName == 'LI')
+						{
+							if (tag != 'blockquote') return;
+
+							this.block.formatListToBlockquote();
+						}
+						else if (this.block.containerTag == 'BLOCKQUOTE')
+						{
+							this.block.formatBlockquote(tag);
+						}
+						else if (this.opts.linebreaks && ((isContainerTable) || (this.range.commonAncestorContainer != block)))
+						{
+							this.block.formatWrap(tag);
+						}
+						else
+						{
+							if (this.opts.linebreaks && tag == 'p')
+							{
+								$(block).prepend('<br>').append('<br>');
+								this.utils.replaceWithContents(block);
+							}
+							else
+							{
+
+								var $formatted = this.utils.replaceToTag(block, tag);
+
+								this.block.toggle($formatted);
+
+								if (this.block.isRemoveInline) this.utils.removeInlineTags($formatted);
+								if (tag == 'p' || this.block.headTag) $formatted.find('p').contents().unwrap();
+							}
+						}
+					}
+					else
+					{
+						if (this.opts.linebreaks || tag != 'p')
+						{
+							if (tag == 'blockquote')
+							{
+								var count = 0;
+								for (var i = 0; i < this.block.blocksSize; i++)
+								{
+									if (this.block.blocks[i].tagName == 'BLOCKQUOTE') count++;
+								}
+
+								// only blockquote selected
+								if (count == this.block.blocksSize)
+								{
+									$.each(this.block.blocks, $.proxy(function(i,s)
+									{
+										if (this.opts.linebreaks)
+										{
+											$(s).prepend('<br>').append('<br>');
+											this.utils.replaceWithContents(s);
+										}
+										else
+										{
+											this.utils.replaceToTag(s, 'p');
+										}
+
+									}, this));
+
+									return;
+								}
+
+							}
+
+							this.block.formatWrap(tag);
+						}
+						else
+						{
+							var classSize = 0;
+							var toggleType = false;
+							if (this.block.type == 'class')
+							{
+								toggleType = 'toggle';
+								classSize = $(this.block.blocks).filter('.' + this.block.value).size();
+
+								if (this.block.blocksSize == classSize) toggleType = 'toggle';
+								else if (this.block.blocksSize > classSize) toggleType = 'set';
+								else if (classSize === 0) toggleType = 'set';
+
+							}
+
+							var exceptTags = ['ul', 'ol', 'li', 'td', 'th', 'dl', 'dt', 'dd'];
+							$.each(this.block.blocks, $.proxy(function(i,s)
+							{
+								if ($.inArray(s.tagName.toLowerCase(), exceptTags) != -1) return;
+
+								var $formatted = this.utils.replaceToTag(s, tag);
+
+								if (toggleType)
+								{
+									if (toggleType == 'toggle') this.block.toggle($formatted);
+									else if (toggleType == 'remove') this.block.remove($formatted);
+									else if (toggleType == 'set')  this.block.set2($formatted);
+								}
+								else this.block.toggle($formatted);
+
+								if (tag != 'p' && tag != 'blockquote') $formatted.find('img').remove();
+								if (this.block.isRemoveInline) this.utils.removeInlineTags($formatted);
+								if (tag == 'p' || this.block.headTag) $formatted.find('p').contents().unwrap();
+
+
+							}, this));
+						}
+					}
+				},
+				toggle: function($el)
+				{
+					if (this.block.type == 'class')
+					{
+						$el.toggleClass(this.block.value);
+						return;
+					}
+					else if (this.block.type == 'attr' || this.block.type == 'data')
+					{
+						if ($el.attr(this.block.value.name) == this.block.value.value)
+						{
+							$el.removeAttr(this.block.value.name);
+						}
+						else
+						{
+							$el.attr(this.block.value.name, this.block.value.value);
+						}
+
+						return;
+					}
+					else
+					{
+						$el.removeAttr('style class');
+						return;
+					}
+				},
+				remove: function($el)
+				{
+					$el.removeClass(this.block.value);
+				},
+				formatListToBlockquote: function()
+				{
+					var block = $(this.block.blocks[0]).closest('ul, ol');
+
+					$(block).find('ul, ol').contents().unwrap();
+					$(block).find('li').append($('<br>')).contents().unwrap();
+
+					var $el = this.utils.replaceToTag(block, 'blockquote');
+					this.block.toggle($el);
+				},
+				formatBlockquote: function(tag)
+				{
+					document.execCommand('outdent');
+					document.execCommand('formatblock', false, tag);
+
+					this.clean.clearUnverified();
+					this.$editor.find('p:empty').remove();
+
+					var formatted = this.selection.getBlock();
+
+					if (tag != 'p')
+					{
+						$(formatted).find('img').remove();
+					}
+
+					if (!this.opts.linebreaks)
+					{
+						this.block.toggle($(formatted));
+					}
+
+					this.$editor.find('ul, ol, tr, blockquote, p').each($.proxy(this.utils.removeEmpty, this));
+
+					if (this.opts.linebreaks && tag == 'p')
+					{
+						this.utils.replaceWithContents(formatted);
+					}
+
+				},
+				formatWrap: function(tag)
+				{
+					if (this.block.containerTag == 'UL' || this.block.containerTag == 'OL')
+					{
+						if (tag == 'blockquote')
+						{
+							this.block.formatListToBlockquote();
+						}
+						else
+						{
+							return;
+						}
+					}
+
+					var formatted = this.selection.wrap(tag);
+					if (formatted === false) return;
+
+					var $formatted = $(formatted);
+
+					this.block.formatTableWrapping($formatted);
+
+					var $elements = $formatted.find(this.opts.blockLevelElements.join(',') + ', td, table, thead, tbody, tfoot, th, tr');
+
+					if ((this.opts.linebreaks && tag == 'p') || tag == 'pre' || tag == 'blockquote')
+					{
+						$elements.append('<br />');
+					}
+
+					$elements.contents().unwrap();
+
+					if (tag != 'p' && tag != 'blockquote') $formatted.find('img').remove();
+
+					$.each(this.block.blocks, $.proxy(this.utils.removeEmpty, this));
+
+					$formatted.append(this.selection.getMarker(2));
+
+					if (!this.opts.linebreaks)
+					{
+						this.block.toggle($formatted);
+					}
+
+					this.$editor.find('ul, ol, tr, blockquote, p').each($.proxy(this.utils.removeEmpty, this));
+					$formatted.find('blockquote:empty').remove();
+
+					if (this.block.isRemoveInline)
+					{
+						this.utils.removeInlineTags($formatted);
+					}
+
+					if (this.opts.linebreaks && tag == 'p')
+					{
+						this.utils.replaceWithContents($formatted);
+					}
+
+				},
+				formatTableWrapping: function($formatted)
+				{
+					if ($formatted.closest('table').size() === 0) return;
+
+					if ($formatted.closest('tr').size() === 0) $formatted.wrap('<tr>');
+					if ($formatted.closest('td').size() === 0) $formatted.wrap('<td>');
+				},
+				removeData: function(name, value)
+				{
+					var blocks = this.selection.getBlocks();
+					$(blocks).removeAttr('data-' + name);
+
+					this.code.sync();
+				},
+				setData: function(name, value)
+				{
+					var blocks = this.selection.getBlocks();
+					$(blocks).attr('data-' + name, value);
+
+					this.code.sync();
+				},
+				toggleData: function(name, value)
+				{
+					var blocks = this.selection.getBlocks();
+					$.each(blocks, function()
+					{
+						if ($(this).attr('data-' + name))
+						{
+							$(this).removeAttr('data-' + name);
+						}
+						else
+						{
+							$(this).attr('data-' + name, value);
+						}
+					});
+				},
+				removeAttr: function(attr, value)
+				{
+					var blocks = this.selection.getBlocks();
+					$(blocks).removeAttr(attr);
+
+					this.code.sync();
+				},
+				setAttr: function(attr, value)
+				{
+					var blocks = this.selection.getBlocks();
+					$(blocks).attr(attr, value);
+
+					this.code.sync();
+				},
+				toggleAttr: function(attr, value)
+				{
+					var blocks = this.selection.getBlocks();
+					$.each(blocks, function()
+					{
+						if ($(this).attr(name))
+						{
+							$(this).removeAttr(name);
+						}
+						else
+						{
+							$(this).attr(name, value);
+						}
+					});
+				},
+				removeClass: function(className)
+				{
+					var blocks = this.selection.getBlocks();
+					$(blocks).removeClass(className);
+
+					this.utils.removeEmptyAttr(blocks, 'class');
+
+					this.code.sync();
+				},
+				setClass: function(className)
+				{
+					var blocks = this.selection.getBlocks();
+					$(blocks).addClass(className);
+
+					this.code.sync();
+				},
+				toggleClass: function(className)
+				{
+					var blocks = this.selection.getBlocks();
+					$(blocks).toggleClass(className);
+
+					this.code.sync();
+				}
+			};
+		},
+		inline: function()
+		{
+			return {
+				formatting: function(name)
+				{
+					var type, value;
+
+					if (typeof this.formatting[name].style != 'undefined') type = 'style';
+					else if (typeof this.formatting[name].class != 'undefined') type = 'class';
+
+					if (type) value = this.formatting[name][type];
+
+					this.inline.format(this.formatting[name].tag, type, value);
+
+				},
+				format: function(tag, type, value)
+				{
+					// Stop formatting pre
+					if (this.utils.isCurrentOrParent('PRE')) return;
+
+					var tags = ['b', 'bold', 'i', 'italic', 'underline', 'strikethrough', 'deleted', 'superscript', 'subscript'];
+					var replaced = ['strong', 'strong', 'em', 'em', 'u', 'del', 'del', 'sup', 'sub'];
+
+					for (var i = 0; i < tags.length; i++)
+					{
+						if (tag == tags[i]) tag = replaced[i];
+					}
+
+					this.inline.type = type || false;
+					this.inline.value = value || false;
+
+					this.buffer.set();
+					this.$editor.focus();
+
+					this.selection.get();
+
+					if (this.range.collapsed)
+					{
+						this.inline.formatCollapsed(tag);
+					}
+					else
+					{
+						this.inline.formatMultiple(tag);
+					}
+				},
+				formatCollapsed: function(tag)
+				{
+					var current = this.selection.getCurrent();
+					var $parent = $(current).closest(tag + '[data-redactor-tag=' + tag + ']');
+
+					// inline there is
+					if ($parent.size() !== 0)
+					{
+						this.caret.setAfter($parent[0]);
+
+						// remove empty
+						if (this.utils.isEmpty($parent.text())) $parent.remove();
+
+						this.code.sync();
+
+						return;
+					}
+
+					// create empty inline
+					var node = $('<' + tag + '>').attr('data-verified', 'redactor').attr('data-redactor-tag', tag);
+					node.html(this.opts.invisibleSpace);
+
+					node = this.inline.setFormat(node);
+
+					this.insert.node(node);
+					this.caret.setEnd(node);
+
+					this.code.sync();
+
+					return;
+				},
+				formatMultiple: function(tag)
+				{
+					this.inline.formatConvert(tag);
+
+					this.selection.save();
+					document.execCommand('strikethrough');
+
+					this.$editor.find('strike').each($.proxy(function(i,s)
+					{
+						var $el = $(s);
+
+						this.inline.formatRemoveSameChildren($el, tag);
+
+						var $span;
+						if (this.inline.type)
+						{
+							$span = $('<span>').attr('data-redactor-tag', tag).attr('data-verified', 'redactor');
+							$span = this.inline.setFormat($span);
+						}
+						else
+						{
+							$span = $('<' + tag + '>').attr('data-redactor-tag', tag).attr('data-verified', 'redactor');
+						}
+
+						$el.replaceWith($span.html($el.contents()));
+
+						if (tag == 'span')
+						{
+							var $parent = $span.parent();
+							if ($parent && $parent[0].tagName == 'SPAN' && this.inline.type == 'style')
+							{
+								var arr = this.inline.value.split(';');
+
+								for (var z = 0; z < arr.length; z++)
+								{
+									if (arr[z] === '') return;
+									var style = arr[z].split(':');
+									$parent.css(style[0], '');
+
+									if (this.utils.removeEmptyAttr($parent, 'style'))
+									{
+										$parent.replaceWith($parent.contents());
+									}
+
+								}
+
+							}
+						}
 
 					}, this));
 
-					setTimeout($.proxy(function()
+					if (tag != 'del')
 					{
-						var html = this.$pasteBox.html();
-
-						this.$pasteBox.remove();
-
-						this.selection.restore();
-						this.utils.restoreScroll();
-
-						this.paste.insert(html);
-
-						$(window).off('scroll.redactor-freeze');
-
-					}, this), 1);
-
-				},
-				createPasteBox: function()
-				{
-					this.$pasteBox = $('<div>').html(' ').attr('contenteditable', 'true').css({ position: 'fixed', width: 0, top: 0, left: '-9999px' });
-
-					this.$box.parent().append(this.$pasteBox);
-					this.$pasteBox.focus();
-				},
-				insert: function(html)
-				{
-					html = this.core.setCallback('pasteBefore', html);
-
-					// clean
-					html = (this.utils.isSelectAll()) ? this.clean.onPaste(html, false) : this.clean.onPaste(html);
-
-					html = this.core.setCallback('paste', html);
-
-					if (this.utils.isSelectAll())
-					{
-						this.insert.set(html, false);
-					}
-					else
-					{
-						this.insert.html(html, false);
+						var self = this;
+						this.$editor.find('inline').each(function(i,s)
+						{
+							self.utils.replaceToTag(s, 'del');
+						});
 					}
 
-					this.utils.disableSelectAll();
-					this.rtePaste = false;
-
-					setTimeout($.proxy(this.clean.clearUnverified, this), 10);
-
-				}
-			};
-		},
-		placeholder: function()
-		{
-			return {
-				enable: function()
-				{
-					if (!this.placeholder.is()) return;
-
-					this.$editor.attr('placeholder', this.$element.attr('placeholder'));
-
-					this.placeholder.toggle();
-					this.$editor.on('keyup.redactor-placeholder', $.proxy(this.placeholder.toggle, this));
+					this.selection.restore();
+					this.code.sync();
 
 				},
-				toggle: function()
+				formatRemoveSameChildren: function($el, tag)
 				{
-					var func = 'removeClass';
-					if (this.utils.isEmpty(this.$editor.html(), false)) func = 'addClass';
-					this.$editor[func]('redactor-placeholder');
-				},
-				remove: function()
-				{
-					this.$editor.removeClass('redactor-placeholder');
-				},
-				is: function()
-				{
-					if (this.opts.placeholder)
+					$el.children(tag).each(function()
 					{
-						return this.$element.attr('placeholder', this.opts.placeholder);
-					}
-					else
-					{
-						return !(typeof this.$element.attr('placeholder') == 'undefined' || this.$element.attr('placeholder') === '');
-					}
-				}
-			};
-		},
-		progress: function()
-		{
-			return {
-				show: function()
-				{
-					$(document.body).append($('<div id="redactor-progress"><span></span></div>'));
-					$('#redactor-progress').fadeIn();
-				},
-				hide: function()
-				{
-					$('#redactor-progress').fadeOut(1500, function()
-					{
-						$(this).remove();
+						var $child = $(this);
+						if (!$child.hasClass('redactor-selection-marker'))
+						{
+							$child.contents().unwrap();
+						}
 					});
-				}
+				},
+				formatConvert: function(tag)
+				{
+					this.selection.save();
 
+					var find = '';
+					if (this.inline.type == 'class') find = '[data-redactor-class=' + this.inline.value + ']';
+					else if (this.inline.type == 'style')
+					{
+						find = '[data-redactor-style="' + this.inline.value + '"]';
+					}
+
+					if (tag != 'del')
+					{
+						var self = this;
+						this.$editor.find('del').each(function(i,s)
+						{
+							self.utils.replaceToTag(s, 'inline');
+						});
+					}
+
+					this.$editor.find('[data-redactor-tag="' + tag + '"]' + find).each(function()
+					{
+						if (find === '' && tag == 'span' && this.tagName.toLowerCase() == tag) return;
+
+						var $el = $(this);
+						$el.replaceWith($('<strike />').html($el.contents()));
+
+					});
+
+					this.selection.restore();
+				},
+				setFormat: function(node)
+				{
+					switch (this.inline.type)
+					{
+						case 'class':
+
+							if (node.hasClass(this.inline.value))
+							{
+								node.removeClass(this.inline.value);
+								node.removeAttr('data-redactor-class');
+							}
+							else
+							{
+								node.addClass(this.inline.value);
+								node.attr('data-redactor-class', this.inline.value);
+							}
+
+
+						break;
+						case 'style':
+
+							node[0].style.cssText = this.inline.value;
+							node.attr('data-redactor-style', this.inline.value);
+
+						break;
+					}
+
+					return node;
+				},
+				removeStyle: function()
+				{
+					this.buffer.set();
+					var current = this.selection.getCurrent();
+					var nodes = this.selection.getInlines();
+
+					this.selection.save();
+
+					if (current && current.tagName === 'SPAN')
+					{
+						var $s = $(current);
+
+						$s.removeAttr('style');
+						if ($s[0].attributes.length === 0)
+						{
+							$s.replaceWith($s.contents());
+						}
+					}
+
+					$.each(nodes, $.proxy(function(i,s)
+					{
+						var $s = $(s);
+						if ($.inArray(s.tagName.toLowerCase(), this.opts.inlineTags) != -1 && !$s.hasClass('redactor-selection-marker'))
+						{
+							$s.removeAttr('style');
+							if ($s[0].attributes.length === 0)
+							{
+								$s.replaceWith($s.contents());
+							}
+						}
+					}, this));
+
+					this.selection.restore();
+					this.code.sync();
+
+				},
+				removeStyleRule: function(name)
+				{
+					this.buffer.set();
+					var parent = this.selection.getParent();
+					var nodes = this.selection.getInlines();
+
+					this.selection.save();
+
+					if (parent && parent.tagName === 'SPAN')
+					{
+						var $s = $(parent);
+
+						$s.css(name, '');
+						this.utils.removeEmptyAttr($s, 'style');
+						if ($s[0].attributes.length === 0)
+						{
+							$s.replaceWith($s.contents());
+						}
+					}
+
+					$.each(nodes, $.proxy(function(i,s)
+					{
+						var $s = $(s);
+						if ($.inArray(s.tagName.toLowerCase(), this.opts.inlineTags) != -1 && !$s.hasClass('redactor-selection-marker'))
+						{
+							$s.css(name, '');
+							this.utils.removeEmptyAttr($s, 'style');
+							if ($s[0].attributes.length === 0)
+							{
+								$s.replaceWith($s.contents());
+							}
+						}
+					}, this));
+
+					this.selection.restore();
+					this.code.sync();
+				},
+				removeFormat: function()
+				{
+					this.buffer.set();
+					var current = this.selection.getCurrent();
+
+					this.selection.save();
+
+					document.execCommand('removeFormat');
+
+					if (current && current.tagName === 'SPAN')
+					{
+						$(current).replaceWith($(current).contents());
+					}
+
+
+					$.each(this.selection.getNodes(), $.proxy(function(i,s)
+					{
+						var $s = $(s);
+						if ($.inArray(s.tagName.toLowerCase(), this.opts.inlineTags) != -1 && !$s.hasClass('redactor-selection-marker'))
+						{
+							$s.replaceWith($s.contents());
+						}
+					}, this));
+
+					this.selection.restore();
+					this.code.sync();
+
+				},
+				toggleClass: function(className)
+				{
+					this.inline.format('span', 'class', className);
+				},
+				toggleStyle: function(value)
+				{
+					this.inline.format('span', 'style', value);
+				}
+			};
+		},
+		insert: function()
+		{
+			return {
+				set: function(html, clean)
+				{
+					this.placeholder.remove();
+
+					html = this.clean.setVerified(html);
+
+					if (typeof clean == 'undefined')
+					{
+						html = this.clean.onPaste(html, false);
+					}
+
+					this.$editor.html(html);
+					this.selection.remove();
+					this.focus.setEnd();
+					this.clean.normalizeLists();
+					this.code.sync();
+					this.observe.load();
+
+					if (typeof clean == 'undefined')
+					{
+						setTimeout($.proxy(this.clean.clearUnverified, this), 10);
+					}
+				},
+				text: function(text)
+				{
+					this.placeholder.remove();
+
+					text = text.toString();
+					text = $.trim(text);
+					text = this.clean.getPlainText(text, false);
+
+					this.$editor.focus();
+
+					if (this.utils.browser('msie'))
+					{
+						this.insert.htmlIe(text);
+					}
+					else
+					{
+						this.selection.get();
+
+						this.range.deleteContents();
+						var el = document.createElement("div");
+						el.innerHTML = text;
+						var frag = document.createDocumentFragment(), node, lastNode;
+						while ((node = el.firstChild))
+						{
+							lastNode = frag.appendChild(node);
+						}
+
+						this.range.insertNode(frag);
+
+						if (lastNode)
+						{
+							var range = this.range.cloneRange();
+							range.setStartAfter(lastNode);
+							range.collapse(true);
+							this.sel.removeAllRanges();
+							this.sel.addRange(range);
+						}
+					}
+
+					this.code.sync();
+					this.clean.clearUnverified();
+				},
+				html: function(html, clean)
+				{
+					this.placeholder.remove();
+
+					if (typeof clean == 'undefined') clean = true;
+
+					this.$editor.focus();
+
+					html = this.clean.setVerified(html);
+
+					if (clean)
+					{
+						html = this.clean.onPaste(html);
+					}
+
+					if (this.utils.browser('msie'))
+					{
+						this.insert.htmlIe(html);
+					}
+					else
+					{
+						if (this.clean.singleLine) this.insert.execHtml(html);
+						else document.execCommand('insertHTML', null, html);
+
+						this.insert.htmlFixMozilla();
+					}
+
+					this.clean.normalizeLists();
+
+					// remove empty paragraphs finaly
+					if (!this.opts.linebreaks)
+					{
+						this.$editor.find('p').each($.proxy(this.utils.removeEmpty, this));
+					}
+
+					this.code.sync();
+					this.observe.load();
+
+					if (clean)
+					{
+						this.clean.clearUnverified();
+					}
+
+				},
+				htmlFixMozilla: function()
+				{
+					// FF inserts empty p when content was selected dblclick
+					if (!this.utils.browser('mozilla')) return;
+
+					var $next = $(this.selection.getBlock()).next();
+					if ($next.length > 0 && $next[0].tagName == 'P' && $next.html() === '')
+					{
+						$next.remove();
+					}
+
+				},
+				htmlIe: function(html)
+				{
+					if (this.utils.isIe11())
+					{
+						var parent = this.utils.isCurrentOrParent('P');
+						var $html = $('<div>').append(html);
+						var blocksMatch = $html.contents().is('p, :header, dl, ul, ol, div, table, td, blockquote, pre, address, section, header, footer, aside, article');
+
+						if (parent && blocksMatch) this.insert.ie11FixInserting(parent, html);
+						else this.insert.ie11PasteFrag(html);
+
+						return;
+					}
+
+					document.selection.createRange().pasteHTML(html);
+
+				},
+				execHtml: function(html)
+				{
+					html = this.clean.setVerified(html);
+
+					this.selection.get();
+
+					this.range.deleteContents();
+
+					var el = document.createElement('div');
+					el.innerHTML = html;
+
+					var frag = document.createDocumentFragment(), node, lastNode;
+					while ((node = el.firstChild))
+					{
+						lastNode = frag.appendChild(node);
+					}
+
+					this.range.insertNode(frag);
+
+					this.range.collapse(true);
+					this.caret.setAfter(lastNode);
+
+				},
+				node: function(node)
+				{
+					node = node[0] || node;
+
+					this.selection.get();
+					this.range.deleteContents();
+					this.range.insertNode(node);
+					this.range.collapse(false);
+					this.selection.addRange();
+
+					return node;
+				},
+				nodeToPoint: function(node, x, y)
+				{
+					node = node[0] || node;
+
+					this.selection.get();
+
+					var range;
+					if (document.caretPositionFromPoint)
+					{
+					    var pos = document.caretPositionFromPoint(x, y);
+
+					    this.range.setStart(pos.offsetNode, pos.offset);
+					    this.range.collapse(true);
+					    this.range.insertNode(node);
+					}
+					else if (document.caretRangeFromPoint)
+					{
+					    range = document.caretRangeFromPoint(x, y);
+					    range.insertNode(node);
+					}
+					else if (typeof document.body.createTextRange != "undefined")
+					{
+				        range = document.body.createTextRange();
+				        range.moveToPoint(x, y);
+				        var endRange = range.duplicate();
+				        endRange.moveToPoint(x, y);
+				        range.setEndPoint("EndToEnd", endRange);
+				        range.select();
+					}
+				},
+				nodeToCaretPositionFromPoint: function(e, node)
+				{
+					node = node[0] || node;
+
+					var range;
+					var x = e.clientX, y = e.clientY;
+					if (document.caretPositionFromPoint)
+					{
+					    var pos = document.caretPositionFromPoint(x, y);
+					    var sel = document.getSelection();
+					    range = sel.getRangeAt(0);
+					    range.setStart(pos.offsetNode, pos.offset);
+					    range.collapse(true);
+					    range.insertNode(node);
+					}
+					else if (document.caretRangeFromPoint)
+					{
+					    range = document.caretRangeFromPoint(x, y);
+					    range.insertNode(node);
+					}
+					else if (typeof document.body.createTextRange != "undefined")
+					{
+				        range = document.body.createTextRange();
+				        range.moveToPoint(x, y);
+				        var endRange = range.duplicate();
+				        endRange.moveToPoint(x, y);
+				        range.setEndPoint("EndToEnd", endRange);
+				        range.select();
+					}
+
+				},
+				ie11FixInserting: function(parent, html)
+				{
+					var node = document.createElement('span');
+					node.className = 'redactor-ie-paste';
+					this.insert.node(node);
+
+					var parHtml = $(parent).html();
+
+					parHtml = '<p>' + parHtml.replace(/<span class="redactor-ie-paste"><\/span>/gi, '</p>' + html + '<p>') + '</p>';
+					$(parent).replaceWith(parHtml);
+				},
+				ie11PasteFrag: function(html)
+				{
+					this.selection.get();
+					this.range.deleteContents();
+
+					var el = document.createElement("div");
+					el.innerHTML = html;
+
+					var frag = document.createDocumentFragment(), node, lastNode;
+					while ((node = el.firstChild))
+					{
+						lastNode = frag.appendChild(node);
+					}
+
+					this.range.insertNode(frag);
+				}
+			};
+		},
+		caret: function()
+		{
+			return {
+				setStart: function(node)
+				{
+					// inline tag
+					if (!this.utils.isBlock(node))
+					{
+						var space = this.utils.createSpaceElement();
+
+						$(node).prepend(space);
+						this.caret.setEnd(space);
+					}
+					else
+					{
+						this.caret.set(node, 0, node, 0);
+					}
+				},
+				setEnd: function(node)
+				{
+					this.caret.set(node, 1, node, 1);
+				},
+				set: function(orgn, orgo, focn, foco)
+				{
+					// focus
+					if (!this.utils.browser('msie')) this.$editor.focus();
+
+					orgn = orgn[0] || orgn;
+					focn = focn[0] || focn;
+
+					if (this.utils.isBlockTag(orgn.tagName) && orgn.innerHTML === '')
+					{
+						orgn.innerHTML = this.opts.invisibleSpace;
+					}
+
+					if (orgn.tagName == 'BR' && this.opts.linebreaks === false)
+					{
+						var par = $(this.opts.emptyHtml)[0];
+						$(orgn).replaceWith(par);
+						orgn = par;
+						focn = orgn;
+					}
+
+					this.selection.get();
+
+					try {
+						this.range.setStart(orgn, orgo);
+						this.range.setEnd(focn, foco);
+					}
+					catch (e) {}
+
+					this.selection.addRange();
+				},
+				setAfter: function(node)
+				{
+					var tag = $(node)[0].tagName;
+
+					// inline tag
+					if (tag != 'BR' && !this.utils.isBlock(node))
+					{
+						var space = this.utils.createSpaceElement();
+
+						$(node).after(space);
+						this.caret.setEnd(space);
+					}
+					else
+					{
+						if (tag != 'BR' && this.utils.browser('msie'))
+						{
+							this.caret.setStart($(node).next());
+						}
+						else
+						{
+							this.caret.setAfterOrBefore(node, 'after');
+						}
+					}
+				},
+				setBefore: function(node)
+				{
+					// block tag
+					if (this.utils.isBlock(node))
+					{
+						this.caret.setEnd($(node).prev());
+					}
+					else
+					{
+						this.caret.setAfterOrBefore(node, 'before');
+					}
+				},
+				setAfterOrBefore: function(node, type)
+				{
+					// focus
+					if (!this.utils.browser('msie')) this.$editor.focus();
+
+					node = node[0] || node;
+
+					this.selection.get();
+
+					if (type == 'after')
+					{
+						try {
+
+							this.range.setStartAfter(node);
+							this.range.setEndAfter(node);
+						}
+						catch (e) {}
+					}
+					else
+					{
+						try {
+							this.range.setStartBefore(node);
+							this.range.setEndBefore(node);
+						}
+						catch (e) {}
+					}
+
+
+					this.range.collapse(false);
+					this.selection.addRange();
+				},
+				getOffsetOfElement: function(node)
+				{
+					node = node[0] || node;
+
+					this.selection.get();
+
+					var cloned = this.range.cloneRange();
+					cloned.selectNodeContents(node);
+					cloned.setEnd(this.range.endContainer, this.range.endOffset);
+
+					return $.trim(cloned.toString()).length;
+				},
+				getOffset: function()
+				{
+					var offset = 0;
+				    var sel = window.getSelection();
+				    if (sel.rangeCount > 0)
+				    {
+				        var range = window.getSelection().getRangeAt(0);
+				        var preCaretRange = range.cloneRange();
+				        preCaretRange.selectNodeContents(this.$editor[0]);
+				        preCaretRange.setEnd(range.endContainer, range.endOffset);
+				        offset = preCaretRange.toString().length;
+				    }
+
+					return offset;
+				},
+				setOffset: function(start, end)
+				{
+					if (typeof end == 'undefined') end = start;
+					if (!this.focus.isFocused()) this.focus.setStart();
+
+					var range = document.createRange();
+					var sel = document.getSelection();
+					var node, offset = 0;
+					var walker = document.createTreeWalker(this.$editor[0], NodeFilter.SHOW_TEXT, null, null);
+
+					while (node = walker.nextNode())
+					{
+						offset += node.nodeValue.length;
+						if (offset > start)
+						{
+							range.setStart(node, node.nodeValue.length + start - offset);
+							start = Infinity;
+						}
+
+						if (offset >= end)
+						{
+							range.setEnd(node, node.nodeValue.length + end - offset);
+							break;
+						}
+					}
+
+					sel.removeAllRanges();
+					sel.addRange(range);
+				},
+				setToPoint: function(start, end)
+				{
+					this.caret.setOffset(start, end);
+				},
+				getCoords: function()
+				{
+					return this.caret.getOffset();
+				}
 			};
 		},
 		selection: function()
@@ -6400,954 +5941,1196 @@
 				}
 			};
 		},
-		shortcuts: function()
+		observe: function()
 		{
 			return {
-				init: function(e, key)
+				load: function()
 				{
-					// disable browser's hot keys for bold and italic
-					if (!this.opts.shortcuts)
+					this.observe.images();
+					this.observe.links();
+				},
+				buttons: function(e, btnName)
+				{
+					var current = this.selection.getCurrent();
+					var parent = this.selection.getParent();
+
+					this.button.setInactiveAll(btnName);
+
+					if (e === false && btnName !== 'html')
 					{
-						if ((e.ctrlKey || e.metaKey) && (key === 66 || key === 73)) e.preventDefault();
-						return false;
+						if ($.inArray(btnName, this.opts.activeButtons) != -1) this.button.toggleActive(btnName);
+						return;
 					}
 
-					$.each(this.opts.shortcuts, $.proxy(function(str, command)
+					var linkButtonName = (this.utils.isCurrentOrParent('A')) ? this.lang.get('link_edit') : this.lang.get('link_insert');
+					$('body').find('a.redactor-dropdown-link').text(linkButtonName);
+
+					$.each(this.opts.activeButtonsStates, $.proxy(function(key, value)
 					{
-						var keys = str.split(',');
-						var len = keys.length;
-						for (var i = 0; i < len; i++)
+						var parentEl = $(parent).closest(key);
+						var currentEl = $(current).closest(key);
+
+						if (!this.utils.isRedactorParent(parentEl)) return;
+						if (!this.utils.isRedactorParent(currentEl)) return;
+						if (parentEl.length !== 0 || currentEl.closest(key).length !== 0)
 						{
-							if (typeof keys[i] === 'string')
-							{
-								this.shortcuts.handler(e, $.trim(keys[i]), $.proxy(function()
-								{
-									var func;
-									if (command.func.search(/\./) != '-1')
-									{
-										func = command.func.split('.');
-										if (typeof this[func[0]] != 'undefined')
-										{
-											this[func[0]][func[1]].apply(this, command.params);
-										}
-									}
-									else
-									{
-										this[command.func].apply(this, command.params);
-									}
-
-								}, this));
-							}
 
+							this.button.setActive(value);
 						}
 
 					}, this));
+
+					var $parent = $(parent).closest(this.opts.alignmentTags.toString().toLowerCase());
+					if (this.utils.isRedactorParent(parent) && $parent.length)
+					{
+						var align = ($parent.css('text-align') === '') ? 'left' : $parent.css('text-align');
+						this.button.setActive('align' + align);
+					}
 				},
-				handler: function(e, keys, origHandler)
+				addButton: function(tag, btnName)
 				{
-					// based on https://github.com/jeresig/jquery.hotkeys
-					var hotkeysSpecialKeys =
+					this.opts.activeButtons.push(btnName);
+					this.opts.activeButtonsStates[tag] = btnName;
+				},
+				images: function()
+				{
+					this.$editor.find('img').each($.proxy(function(i, img)
 					{
-						8: "backspace", 9: "tab", 10: "return", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
-						20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
-						37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", 59: ";", 61: "=",
-						96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
-						104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/",
-						112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8",
-						120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 173: "-", 186: ";", 187: "=",
-						188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\", 221: "]", 222: "'"
-					};
+						var $img = $(img);
 
+						// IE fix (when we clicked on an image and then press backspace IE does goes to image's url)
+						$img.closest('a').on('click', function(e) { e.preventDefault(); });
 
-					var hotkeysShiftNums =
+						if (this.utils.browser('msie')) $img.attr('unselectable', 'on');
+
+						this.image.setEditable($img);
+
+					}, this));
+
+					$(document).on('click.redactor-image-delete', $.proxy(function(e)
 					{
-						"`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&",
-						"8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<",
-						".": ">",  "/": "?",  "\\": "|"
-					};
-
-					keys = keys.toLowerCase().split(" ");
-					var special = hotkeysSpecialKeys[e.keyCode],
-						character = String.fromCharCode( e.which ).toLowerCase(),
-						modif = "", possible = {};
-
-					$.each([ "alt", "ctrl", "meta", "shift"], function(index, specialKey)
-					{
-						if (e[specialKey + 'Key'] && special !== specialKey)
+						this.observe.image = false;
+						if (e.target.tagName == 'IMG' && this.utils.isRedactorParent(e.target))
 						{
-							modif += specialKey + '+';
+							this.observe.image = (this.observe.image && this.observe.image == e.target) ? false : e.target;
 						}
+
+					}, this));
+
+				},
+				links: function()
+				{
+					if (!this.opts.linkTooltip) return;
+
+					this.$editor.find('a').on('touchstart click', $.proxy(this.observe.showTooltip, this));
+					this.$editor.on('touchstart click.redactor', $.proxy(this.observe.closeTooltip, this));
+					$(document).on('touchstart click.redactor', $.proxy(this.observe.closeTooltip, this));
+				},
+				getTooltipPosition: function($link)
+				{
+					return $link.offset();
+				},
+				showTooltip: function(e)
+				{
+					var $link = $(e.target);
+					if ($link.size() === 0 || $link[0].tagName !== 'A') return;
+
+					var pos = this.observe.getTooltipPosition($link);
+
+					var tooltip = $('<span class="redactor-link-tooltip"></span>');
+
+					var href = $link.attr('href');
+					if (href === undefined)
+					{
+						href = '';
+					}
+
+					if (href.length > 24) href = href.substring(0, 24) + '...';
+
+					var aLink = $('<a href="' + $link.attr('href') + '" target="_blank" />').html(href).addClass('redactor-link-tooltip-action');
+					var aEdit = $('<a href="#" />').html(this.lang.get('edit')).on('click', $.proxy(this.link.show, this)).addClass('redactor-link-tooltip-action');
+					var aUnlink = $('<a href="#" />').html(this.lang.get('unlink')).on('click', $.proxy(this.link.unlink, this)).addClass('redactor-link-tooltip-action');
+
+					tooltip.append(aLink).append(' | ').append(aEdit).append(' | ').append(aUnlink);
+					tooltip.css({
+						top: (pos.top + 20) + 'px',
+						left: pos.left + 'px'
 					});
 
+					$('.redactor-link-tooltip').remove();
+					$('body').append(tooltip);
+				},
+				closeTooltip: function(e)
+				{
+					e = e.originalEvent || e;
 
-					if (special) possible[modif + special] = true;
-					if (character)
+					if (e.target.tagName == 'A' && !$(e.target).hasClass('redactor-link-tooltip-action') && this.utils.isRedactorParent(e.target))
 					{
-						possible[modif + character] = true;
-						possible[modif + hotkeysShiftNums[character]] = true;
-
-						// "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
-						if (modif === "shift+")
-						{
-							possible[hotkeysShiftNums[character]] = true;
-						}
+						return;
 					}
 
-					for (var i = 0, len = keys.length; i < len; i++)
-					{
-						if (possible[keys[i]])
-						{
-							e.preventDefault();
-							return origHandler.apply(this, arguments);
-						}
-					}
+					$('.redactor-link-tooltip').remove();
 				}
+
 			};
 		},
-		tabifier: function()
+		link: function()
 		{
 			return {
-				get: function(code)
+				show: function(e)
 				{
-					if (!this.opts.tabifier) return code;
+					if (typeof e != 'undefined' && e.preventDefault) e.preventDefault();
 
-					// clean setup
-					var ownLine = ['area', 'body', 'head', 'hr', 'i?frame', 'link', 'meta', 'noscript', 'style', 'script', 'table', 'tbody', 'thead', 'tfoot'];
-					var contOwnLine = ['li', 'dt', 'dt', 'h[1-6]', 'option', 'script'];
-					var newLevel = ['blockquote', 'div', 'dl', 'fieldset', 'form', 'frameset', 'map', 'ol', 'p', 'pre', 'select', 'td', 'th', 'tr', 'ul'];
+					this.modal.load('link', this.lang.get('link_insert'), 600);
 
-					this.tabifier.lineBefore = new RegExp('^<(/?' + ownLine.join('|/?' ) + '|' + contOwnLine.join('|') + ')[ >]');
-					this.tabifier.lineAfter = new RegExp('^<(br|/?' + ownLine.join('|/?' ) + '|/' + contOwnLine.join('|/') + ')[ >]');
-					this.tabifier.newLevel = new RegExp('^</?(' + newLevel.join('|' ) + ')[ >]');
+					this.modal.createCancelButton();
+					this.link.buttonInsert = this.modal.createActionButton(this.lang.get('insert'));
 
-					var i = 0,
-					codeLength = code.length,
-					point = 0,
-					start = null,
-					end = null,
-					tag = '',
-					out = '',
-					cont = '';
+					this.selection.get();
 
-					this.tabifier.cleanlevel = 0;
+					this.link.getData();
+					this.link.cleanUrl();
 
-					for (; i < codeLength; i++)
+					if (this.link.target == '_blank') $('#redactor-link-blank').prop('checked', true);
+
+					this.link.$inputUrl = $('#redactor-link-url');
+					this.link.$inputText = $('#redactor-link-url-text');
+
+					this.link.$inputText.val(this.link.text);
+					this.link.$inputUrl.val(this.link.url);
+
+					this.link.buttonInsert.on('click', $.proxy(this.link.insert, this));
+
+					// show modal
+					this.selection.save();
+					this.modal.show();
+					this.link.$inputUrl.focus();
+				},
+				cleanUrl: function()
+				{
+					var thref = self.location.href.replace(/\/$/i, '');
+					this.link.url = this.link.url.replace(thref, '');
+					this.link.url = this.link.url.replace(/^\/#/, '#');
+					this.link.url = this.link.url.replace('mailto:', '');
+
+					// remove host from href
+					if (!this.opts.linkProtocol)
 					{
-						point = i;
+						var re = new RegExp('^(http|ftp|https)://' + self.location.host, 'i');
+						this.link.url = this.link.url.replace(re, '');
+					}
 
-						// if no more tags, copy and exit
-						if (-1 == code.substr(i).indexOf( '<' ))
+				},
+				getData: function()
+				{
+					this.link.$node = false;
+
+					var $el = $(this.selection.getCurrent()).closest('a');
+					if ($el.size() !== 0 && $el[0].tagName === 'A')
+					{
+						this.link.$node = $el;
+
+						this.link.url = $el.attr('href');
+						this.link.text = $el.text();
+						this.link.target = $el.attr('target');
+					}
+					else
+					{
+						this.link.text = this.sel.toString();
+						this.link.url = '';
+						this.link.target = '';
+					}
+
+				},
+				insert: function()
+				{
+					var target = '';
+					var link = this.link.$inputUrl.val();
+					var text = this.link.$inputText.val();
+
+					if ($.trim(link) === '')
+					{
+						this.link.$inputUrl.addClass('redactor-input-error').on('keyup', function()
 						{
-							out += code.substr(i);
+							$(this).removeClass('redactor-input-error');
+							$(this).off('keyup');
 
-							return this.tabifier.finish(out);
+						});
+						return;
+					}
+
+					// mailto
+					if (link.search('@') != -1 && /(http|ftp|https):\/\//i.test(link) === false)
+					{
+						link = 'mailto:' + link;
+					}
+					// url, not anchor
+					else if (link.search('#') !== 0)
+					{
+						if ($('#redactor-link-blank').prop('checked'))
+						{
+							target = '_blank';
 						}
 
-						// copy verbatim until a tag
-						while (point < codeLength && code.charAt(point) != '<')
+						// test url (add protocol)
+						var pattern = '((xn--)?[a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,}';
+						var re = new RegExp('^(http|ftp|https)://' + pattern, 'i');
+						var re2 = new RegExp('^' + pattern, 'i');
+
+						if (link.search(re) == -1 && link.search(re2) === 0 && this.opts.linkProtocol)
 						{
-							point++;
+							link = this.opts.linkProtocol + '://' + link;
 						}
+					}
 
-						if (i != point)
+					this.link.set(text, link, target);
+					this.modal.close();
+				},
+				set: function(text, link, target)
+				{
+					text = $.trim(text.replace(/<|>/g, ''));
+
+					this.selection.restore();
+
+					if (text === '' && link === '') return;
+					if (text === '' && link !== '') text = link;
+
+					if (this.link.$node)
+					{
+						this.buffer.set();
+
+						this.link.$node.text(text).attr('href', link);
+						if (target !== '')
 						{
-							cont = code.substr(i, point - i);
-							if (!cont.match(/^\s{2,}$/g))
-							{
-								if ('\n' == out.charAt(out.length - 1)) out += this.tabifier.getTabs();
-								else if ('\n' == cont.charAt(0))
-								{
-									out += '\n' + this.tabifier.getTabs();
-									cont = cont.replace(/^\s+/, '');
-								}
-
-								out += cont;
-							}
-
-							if (cont.match(/\n/)) out += '\n' + this.tabifier.getTabs();
-						}
-
-						start = point;
-
-						// find the end of the tag
-						while (point < codeLength && '>' != code.charAt(point))
-						{
-							point++;
-						}
-
-						tag = code.substr(start, point - start);
-						i = point;
-
-						var t;
-
-						if ('!--' == tag.substr(1, 3))
-						{
-							if (!tag.match(/--$/))
-							{
-								while ('-->' != code.substr(point, 3))
-								{
-									point++;
-								}
-								point += 2;
-								tag = code.substr(start, point - start);
-								i = point;
-							}
-
-							if ('\n' != out.charAt(out.length - 1)) out += '\n';
-
-							out += this.tabifier.getTabs();
-							out += tag + '>\n';
-						}
-						else if ('!' == tag[1])
-						{
-							out = this.tabifier.placeTag(tag + '>', out);
-						}
-						else if ('?' == tag[1])
-						{
-							out += tag + '>\n';
-						}
-						else if (t = tag.match(/^<(script|style|pre)/i))
-						{
-							t[1] = t[1].toLowerCase();
-							tag = this.tabifier.cleanTag(tag);
-							out = this.tabifier.placeTag(tag, out);
-							end = String(code.substr(i + 1)).toLowerCase().indexOf('</' + t[1]);
-
-							if (end)
-							{
-								cont = code.substr(i + 1, end);
-								i += end;
-								out += cont;
-							}
+							this.link.$node.attr('target', target);
 						}
 						else
 						{
-							tag = this.tabifier.cleanTag(tag);
-							out = this.tabifier.placeTag(tag, out);
-						}
-					}
-
-					return this.tabifier.finish(out);
-				},
-				getTabs: function()
-				{
-					var s = '';
-					for ( var j = 0; j < this.tabifier.cleanlevel; j++ )
-					{
-						s += '\t';
-					}
-
-					return s;
-				},
-				finish: function(code)
-				{
-					code = code.replace(/\n\s*\n/g, '\n');
-					code = code.replace(/^[\s\n]*/, '');
-					code = code.replace(/[\s\n]*$/, '');
-					code = code.replace(/<script(.*?)>\n<\/script>/gi, '<script$1></script>');
-
-					this.tabifier.cleanlevel = 0;
-
-					return code;
-				},
-				cleanTag: function (tag)
-				{
-					var tagout = '';
-					tag = tag.replace(/\n/g, ' ');
-					tag = tag.replace(/\s{2,}/g, ' ');
-					tag = tag.replace(/^\s+|\s+$/g, ' ');
-
-					var suffix = '';
-					if (tag.match(/\/$/))
-					{
-						suffix = '/';
-						tag = tag.replace(/\/+$/, '');
-					}
-
-					var m;
-					while (m = /\s*([^= ]+)(?:=((['"']).*?\3|[^ ]+))?/.exec(tag))
-					{
-						if (m[2]) tagout += m[1].toLowerCase() + '=' + m[2];
-						else if (m[1]) tagout += m[1].toLowerCase();
-
-						tagout += ' ';
-						tag = tag.substr(m[0].length);
-					}
-
-					return tagout.replace(/\s*$/, '') + suffix + '>';
-				},
-				placeTag: function (tag, out)
-				{
-					var nl = tag.match(this.tabifier.newLevel);
-					if (tag.match(this.tabifier.lineBefore) || nl)
-					{
-						out = out.replace(/\s*$/, '');
-						out += '\n';
-					}
-
-					if (nl && '/' == tag.charAt(1)) this.tabifier.cleanlevel--;
-					if ('\n' == out.charAt(out.length - 1)) out += this.tabifier.getTabs();
-					if (nl && '/' != tag.charAt(1)) this.tabifier.cleanlevel++;
-
-					out += tag;
-
-					if (tag.match(this.tabifier.lineAfter) || tag.match(this.tabifier.newLevel))
-					{
-						out = out.replace(/ *$/, '');
-						out += '\n';
-					}
-
-					return out;
-				}
-			};
-		},
-		tidy: function()
-		{
-			return {
-				setupAllowed: function()
-				{
-					if (this.opts.allowedTags) this.opts.deniedTags = false;
-					if (this.opts.allowedAttr) this.opts.removeAttr = false;
-
-					if (this.opts.linebreaks) return;
-
-					var tags = ['p', 'section'];
-					if (this.opts.allowedTags) this.tidy.addToAllowed(tags);
-					if (this.opts.deniedTags) this.tidy.removeFromDenied(tags);
-
-				},
-				addToAllowed: function(tags)
-				{
-					var len = tags.length;
-					for (var i = 0; i < len; i++)
-					{
-						if ($.inArray(tags[i], this.opts.allowedTags) == -1)
-						{
-							this.opts.allowedTags.push(tags[i]);
-						}
-					}
-				},
-				removeFromDenied: function(tags)
-				{
-					var len = tags.length;
-					for (var i = 0; i < len; i++)
-					{
-						var pos = $.inArray(tags[i], this.opts.deniedTags);
-						if (pos != -1)
-						{
-							this.opts.deniedTags.splice(pos, 1);
-						}
-					}
-				},
-				load: function(html, options)
-				{
-					this.tidy.settings = {
-						deniedTags: this.opts.deniedTags,
-						allowedTags: this.opts.allowedTags,
-						removeComments: this.opts.removeComments,
-						replaceTags: this.opts.replaceTags,
-						replaceStyles: this.opts.replaceStyles,
-						removeDataAttr: this.opts.removeDataAttr,
-						removeAttr: this.opts.removeAttr,
-						allowedAttr: this.opts.allowedAttr,
-						removeWithoutAttr: this.opts.removeWithoutAttr,
-						removeEmpty: this.opts.removeEmpty
-					};
-
-					$.extend(this.tidy.settings, options);
-
-					html = this.tidy.removeComments(html);
-
-					// create container
-					this.tidy.$div = $('<div />').append(html);
-
-					// clean
-					this.tidy.replaceTags();
-					this.tidy.replaceStyles();
-					this.tidy.removeTags();
-
-					this.tidy.removeAttr();
-					this.tidy.removeEmpty();
-					this.tidy.removeParagraphsInLists();
-					this.tidy.removeDataAttr();
-					this.tidy.removeWithoutAttr();
-
-					html = this.tidy.$div.html();
-					this.tidy.$div.remove();
-
-					return html;
-				},
-				removeComments: function(html)
-				{
-					if (!this.tidy.settings.removeComments) return html;
-
-					return html.replace(/<!--[\s\S]*?-->/gi, '');
-				},
-				replaceTags: function(html)
-				{
-					if (!this.tidy.settings.replaceTags) return html;
-
-					var len = this.tidy.settings.replaceTags.length;
-					var replacement = [], rTags = [];
-					for (var i = 0; i < len; i++)
-					{
-						rTags.push(this.tidy.settings.replaceTags[i][1]);
-						replacement.push(this.tidy.settings.replaceTags[i][0]);
-					}
-
-					this.tidy.$div.find(replacement.join(',')).each($.proxy(function(n,s)
-					{
-						var tag = rTags[n];
-						$(s).replaceWith(function()
-						{
-							var replaced = $('<' + tag + ' />').append($(this).contents());
-
-							for (var i = 0; i < this.attributes.length; i++)
-							{
-								replaced.attr(this.attributes[i].name, this.attributes[i].value);
-							}
-
-							return replaced;
-						});
-
-					}, this));
-
-					return html;
-				},
-				replaceStyles: function()
-				{
-					if (!this.tidy.settings.replaceStyles) return;
-
-					var len = this.tidy.settings.replaceStyles.length;
-					this.tidy.$div.find('span').each($.proxy(function(n,s)
-					{
-						var $el = $(s);
-						var style = $el.attr('style');
-						for (var i = 0; i < len; i++)
-						{
-							if (style && style.match(new RegExp('^' + this.tidy.settings.replaceStyles[i][0], 'i')))
-							{
-								var tagName = this.tidy.settings.replaceStyles[i][1];
-								$el.replaceWith(function()
-								{
-									var tag = document.createElement(tagName);
-									return $(tag).append($(this).contents());
-								});
-							}
+							this.link.$node.removeAttr('target');
 						}
 
-					}, this));
-
-				},
-				removeTags: function()
-				{
-					if (!this.tidy.settings.deniedTags && this.tidy.settings.allowedTags)
-					{
-						this.tidy.$div.find('*').not(this.tidy.settings.allowedTags.join(',')).each(function(i, s)
-						{
-							if (s.innerHTML === '') $(s).remove();
-							else $(s).contents().unwrap();
-						});
+						this.code.sync();
 					}
-
-					if (this.tidy.settings.deniedTags)
-					{
-						this.tidy.$div.find(this.tidy.settings.deniedTags.join(',')).each(function(i, s)
-						{
-							if (s.innerHTML === '') $(s).remove();
-							else $(s).contents().unwrap();
-						});
-					}
-				},
-				removeAttr: function()
-				{
-					var len;
-					if (!this.tidy.settings.removeAttr && this.tidy.settings.allowedAttr)
-					{
-
-						var allowedAttrTags = [], allowedAttrData = [];
-						len = this.tidy.settings.allowedAttr.length;
-						for (var i = 0; i < len; i++)
-						{
-							allowedAttrTags.push(this.tidy.settings.allowedAttr[i][0]);
-							allowedAttrData.push(this.tidy.settings.allowedAttr[i][1]);
-						}
-
-
-						this.tidy.$div.find('*').each($.proxy(function(n,s)
-						{
-							var $el = $(s);
-							var pos = $.inArray($el[0].tagName.toLowerCase(), allowedAttrTags);
-							var attributesRemove = this.tidy.removeAttrGetRemoves(pos, allowedAttrData, $el);
-
-							if (attributesRemove)
-							{
-								$.each(attributesRemove, function(z,f) {
-									$el.removeAttr(f);
-								});
-							}
-						}, this));
-					}
-
-					if (this.tidy.settings.removeAttr)
-					{
-						len = this.tidy.settings.removeAttr.length;
-						for (var i = 0; i < len; i++)
-						{
-							var attrs = this.tidy.settings.removeAttr[i][1];
-							if ($.isArray(attrs)) attrs = attrs.join(' ');
-
-							this.tidy.$div.find(this.tidy.settings.removeAttr[i][0]).removeAttr(attrs);
-						}
-					}
-
-				},
-				removeAttrGetRemoves: function(pos, allowed, $el)
-				{
-					var attributesRemove = [];
-
-					// remove all attrs
-					if (pos == -1)
-					{
-						$.each($el[0].attributes, function(i, item)
-						{
-							attributesRemove.push(item.name);
-						});
-
-					}
-					// allow all attrs
-					else if (allowed[pos] == '*')
-					{
-						attributesRemove = [];
-					}
-					// allow specific attrs
 					else
 					{
-						$.each($el[0].attributes, function(i, item)
-						{
-							if ($.isArray(allowed[pos]))
-							{
-								if ($.inArray(item.name, allowed[pos]) == -1)
-								{
-									attributesRemove.push(item.name);
-								}
-							}
-							else if (allowed[pos] != item.name)
-							{
-								attributesRemove.push(item.name);
-							}
+						document.execCommand('createLink', false, link);
+
+						var $a = $(this.selection.getCurrent()).closest('a');
+						if (target !== '')
+						{
+							$a.attr('target', target);
+						}
+
+						$a.removeAttr('style');
+
+						this.code.sync();
+						this.core.setCallback('insertedLink', $a);
 
-						});
 					}
 
-					return attributesRemove;
-				},
-				removeAttrs: function (el, regex)
-				{
-					regex = new RegExp(regex, "g");
-					return el.each(function()
+					// link tooltip
+					setTimeout($.proxy(function()
 					{
-						var self = $(this);
-						var len = this.attributes.length - 1;
-						for (var i = len; i >= 0; i--)
+						this.observe.links();
+
+					}, this), 5);
+				},
+				unlink: function(e)
+				{
+					if (typeof e != 'undefined' && e.preventDefault) e.preventDefault();
+
+					var nodes = this.selection.getNodes();
+					if (!nodes) return;
+
+					this.buffer.set();
+
+					var len = nodes.length;
+					for (var i = 0; i < len; i++)
+					{
+						if (nodes[i].tagName == 'A')
 						{
-							var item = this.attributes[i];
-							if (item && item.specified && item.name.search(regex)>=0)
-							{
-								self.removeAttr(item.name);
-							}
+							var $node = $(nodes[i]);
+							$node.replaceWith($node.contents());
 						}
-					});
-				},
-				removeEmpty: function()
-				{
-					if (!this.tidy.settings.removeEmpty) return;
+					}
 
-					this.tidy.$div.find(this.tidy.settings.removeEmpty.join(',')).each(function()
-					{
-						var $el = $(this);
-						var text = $el.text();
-						text = text.replace(/[\u200B-\u200D\uFEFF]/g, '');
-						text = text.replace(/&nbsp;/gi, '');
-						text = text.replace(/\s/g, '');
+					// remove tooltip
+					$('.redactor-link-tooltip').remove();
 
-		    	    	if (text === '' && $el.children().length === 0)
-		    	    	{
-			    	    	$el.remove();
-		    	    	}
-					});
-				},
-				removeParagraphsInLists: function()
-				{
-					this.tidy.$div.find('li p').contents().unwrap();
-				},
-				removeDataAttr: function()
-				{
-					if (!this.tidy.settings.removeDataAttr) return;
+					this.code.sync();
 
-					var tags = this.tidy.settings.removeDataAttr;
-					if ($.isArray(this.tidy.settings.removeDataAttr)) tags = this.tidy.settings.removeDataAttr.join(',');
-
-					this.tidy.removeAttrs(this.tidy.$div.find(tags), '^(data-)');
-
-				},
-				removeWithoutAttr: function()
-				{
-					if (!this.tidy.settings.removeWithoutAttr) return;
-
-					this.tidy.$div.find(this.tidy.settings.removeWithoutAttr.join(',')).each(function()
-					{
-						if (this.attributes.length === 0)
-						{
-							$(this).contents().unwrap();
-						}
-					});
 				}
 			};
 		},
-		toolbar: function()
+		image: function()
 		{
 			return {
-				init: function()
+				show: function()
 				{
-					return {
-						html:
+					this.modal.load('image', this.lang.get('image'), 700);
+					this.upload.init('#redactor-modal-image-droparea', this.opts.imageUpload, this.image.insert);
+
+					this.selection.save();
+					this.modal.show();
+
+				},
+				showEdit: function($image)
+				{
+					var $link = $image.closest('a');
+
+					this.modal.load('imageEdit', this.lang.get('edit'), 705);
+
+					this.modal.createCancelButton();
+					this.image.buttonDelete = this.modal.createDeleteButton(this.lang.get('_delete'));
+					this.image.buttonSave = this.modal.createActionButton(this.lang.get('save'));
+
+					this.image.buttonDelete.on('click', $.proxy(function()
+					{
+						this.image.remove($image);
+
+					}, this));
+
+					this.image.buttonSave.on('click', $.proxy(function()
+					{
+						this.image.update($image);
+
+					}, this));
+
+
+					$('#redactor-image-title').val($image.attr('alt'));
+
+					if (!this.opts.imageLink) $('.redactor-image-link-option').hide();
+					else
+					{
+						var $redactorImageLink = $('#redactor-image-link');
+
+						$redactorImageLink.attr('href', $image.attr('src'));
+						if ($link.size() !== 0)
 						{
-							title: this.lang.get('html'),
-							func: 'code.toggle'
-						},
-						formatting:
-						{
-							title: this.lang.get('formatting'),
-							dropdown:
-							{
-								p:
-								{
-									title: this.lang.get('paragraph'),
-									func: 'block.format'
-								},
-								blockquote:
-								{
-									title: this.lang.get('quote'),
-									func: 'block.format'
-								},
-								pre:
-								{
-									title: this.lang.get('code'),
-									func: 'block.format'
-								},
-								h1:
-								{
-									title: this.lang.get('header1'),
-									func: 'block.format'
-								},
-								h2:
-								{
-									title: this.lang.get('header2'),
-									func: 'block.format'
-								},
-								h3:
-								{
-									title: this.lang.get('header3'),
-									func: 'block.format'
-								},
-								h4:
-								{
-									title: this.lang.get('header4'),
-									func: 'block.format'
-								},
-								h5:
-								{
-									title: this.lang.get('header5'),
-									func: 'block.format'
-								}
-							}
-						},
-						bold:
-						{
-							title: this.lang.get('bold'),
-							func: 'inline.format'
-						},
-						italic:
-						{
-							title: this.lang.get('italic'),
-							func: 'inline.format'
-						},
-						deleted:
-						{
-							title: this.lang.get('deleted'),
-							func: 'inline.format'
-						},
-						underline:
-						{
-							title: this.lang.get('underline'),
-							func: 'inline.format'
-						},
-						unorderedlist:
-						{
-							title: '&bull; ' + this.lang.get('unorderedlist'),
-							func: 'list.toggle'
-						},
-						orderedlist:
-						{
-							title: '1. ' + this.lang.get('orderedlist'),
-							func: 'list.toggle'
-						},
-						outdent:
-						{
-							title: '< ' + this.lang.get('outdent'),
-							func: 'indent.decrease'
-						},
-						indent:
-						{
-							title: '> ' + this.lang.get('indent'),
-							func: 'indent.increase'
-						},
-						image:
-						{
-							title: this.lang.get('image'),
-							func: 'image.show'
-						},
-						file:
-						{
-							title: this.lang.get('file'),
-							func: 'file.show'
-						},
-						link:
-						{
-							title: this.lang.get('link'),
-							dropdown:
-							{
-								link:
-								{
-									title: this.lang.get('link_insert'),
-									func: 'link.show'
-								},
-								unlink:
-								{
-									title: this.lang.get('unlink'),
-									func: 'link.unlink'
-								}
-							}
-						},
-						alignment:
-						{
-							title: this.lang.get('alignment'),
-							dropdown:
-							{
-								left:
-								{
-									title: this.lang.get('align_left'),
-									func: 'alignment.left'
-								},
-								center:
-								{
-									title: this.lang.get('align_center'),
-									func: 'alignment.center'
-								},
-								right:
-								{
-									title: this.lang.get('align_right'),
-									func: 'alignment.right'
-								},
-								justify:
-								{
-									title: this.lang.get('align_justify'),
-									func: 'alignment.justify'
-								}
-							}
-						},
-						horizontalrule:
-						{
-							title: this.lang.get('horizontalrule'),
-							func: 'line.insert'
+							$redactorImageLink.val($link.attr('href'));
+							if ($link.attr('target') == '_blank') $('#redactor-image-link-blank').prop('checked', true);
 						}
+					}
+
+					if (!this.opts.imagePosition) $('.redactor-image-position-option').hide();
+					else
+					{
+						var floatValue = ($image.css('display') == 'block' && $image.css('float') == 'none') ? 'center' : $image.css('float');
+						$('#redactor-image-align').val(floatValue);
+					}
+
+					this.modal.show();
+
+				},
+				setFloating: function($image)
+				{
+					var floating = $('#redactor-image-align').val();
+
+					var imageFloat = '';
+					var imageDisplay = '';
+					var imageMargin = '';
+
+					switch (floating)
+					{
+						case 'left':
+							imageFloat = 'left';
+							imageMargin = '0 ' + this.opts.imageFloatMargin + ' ' + this.opts.imageFloatMargin + ' 0';
+						break;
+						case 'right':
+							imageFloat = 'right';
+							imageMargin = '0 0 ' + this.opts.imageFloatMargin + ' ' + this.opts.imageFloatMargin;
+						break;
+						case 'center':
+							imageDisplay = 'block';
+							imageMargin = 'auto';
+						break;
+					}
+
+					$image.css({ 'float': imageFloat, display: imageDisplay, margin: imageMargin });
+					$image.attr('rel', $image.attr('style'));
+				},
+				update: function($image)
+				{
+					this.image.hideResize();
+					this.buffer.set();
+
+					var $link = $image.closest('a');
+
+					$image.attr('alt', $('#redactor-image-title').val());
+
+					this.image.setFloating($image);
+
+					// as link
+					var link = $.trim($('#redactor-image-link').val());
+					if (link !== '')
+					{
+						var target = ($('#redactor-image-link-blank').prop('checked')) ? true : false;
+
+						if ($link.size() === 0)
+						{
+							var a = $('<a href="' + link + '">' + this.utils.getOuterHtml($image) + '</a>');
+							if (target) a.attr('target', '_blank');
+
+							$image.replaceWith(a);
+						}
+						else
+						{
+							$link.attr('href', link);
+							if (target)
+							{
+								$link.attr('target', '_blank');
+							}
+							else
+							{
+								$link.removeAttr('target');
+							}
+						}
+					}
+					else if ($link.size() !== 0)
+					{
+						$link.replaceWith(this.utils.getOuterHtml($image));
+
+					}
+
+					this.modal.close();
+					this.observe.images();
+					this.code.sync();
+
+
+				},
+				setEditable: function($image)
+				{
+					if (!this.opts.imageEditable) return;
+
+					$image.on('dragstart', $.proxy(this.image.onDrag, this));
+
+					$image.on('mousedown', $.proxy(this.image.hideResize, this));
+					$image.on('click touchstart', $.proxy(function(e)
+					{
+						this.observe.image = $image;
+
+						if (this.$editor.find('#redactor-image-box').size() !== 0) return false;
+
+
+						this.image.resizer = this.image.loadEditableControls($image);
+
+						$(document).on('click.redactor-image-resize-hide', $.proxy(this.image.hideResize, this));
+						this.$editor.on('click.redactor-image-resize-hide', $.proxy(this.image.hideResize, this));
+
+						// resize
+						if (!this.opts.imageResizable) return;
+
+						this.image.resizer.on('mousedown.redactor touchstart.redactor', $.proxy(function(e)
+						{
+							e.preventDefault();
+
+						    this.image.resizeHandle = {
+						        x : e.pageX,
+						        y : e.pageY,
+						        el : $image,
+						        ratio: $image.width() / $image.height(),
+						        h: $image.height()
+						    };
+
+						    e = e.originalEvent || e;
+
+						    if (e.targetTouches)
+						    {
+						         this.image.resizeHandle.x = e.targetTouches[0].pageX;
+						         this.image.resizeHandle.y = e.targetTouches[0].pageY;
+						    }
+
+							this.image.startResize();
+
+						}, this));
+
+
+					}, this));
+				},
+				startResize: function()
+				{
+					$(document).on('mousemove.redactor-image-resize touchmove.redactor-image-resize', $.proxy(this.image.moveResize, this));
+					$(document).on('mouseup.redactor-image-resize touchend.redactor-image-resize', $.proxy(this.image.stopResize, this));
+				},
+				moveResize: function(e)
+				{
+					e.preventDefault();
+
+					e = e.originalEvent || e;
+
+					var height =  this.image.resizeHandle.h;
+
+		            if (e.targetTouches) height += (e.targetTouches[0].pageY -  this.image.resizeHandle.y);
+		            else height += (e.pageY -  this.image.resizeHandle.y);
+
+
+					var width = Math.round(height *  this.image.resizeHandle.ratio);
+
+					if (height < 50 || width < 100) return;
+
+		            this.image.resizeHandle.el.height(height);
+		            this.image.resizeHandle.el.width(width);
+
+		            this.code.sync();
+				},
+				stopResize: function()
+				{
+					this.handle = false;
+					$(document).off('.redactor-image-resize');
+					this.image.hideResize();
+				},
+				onDrag: function(e)
+				{
+					if (this.$editor.find('#redactor-image-box').size() !== 0)
+					{
+						e.preventDefault();
+						return false;
+					}
+
+					this.$editor.on('drop.redactor-image-inside-drop', $.proxy(function()
+					{
+						setTimeout($.proxy(this.image.onDrop, this), 1);
+
+					}, this));
+				},
+				onDrop: function()
+				{
+					this.image.fixImageSourceAfterDrop();
+					this.observe.images();
+					this.$editor.off('drop.redactor-image-inside-drop');
+					this.clean.clearUnverified();
+					this.code.sync();
+				},
+				fixImageSourceAfterDrop: function()
+				{
+					this.$editor.find('img[data-save-url]').each(function()
+					{
+						var $el = $(this);
+						$el.attr('src', $el.attr('data-save-url'));
+						$el.removeAttr('data-save-url');
+					});
+				},
+				hideResize: function(e)
+				{
+					if (e && $(e.target).closest('#redactor-image-box').length !== 0) return;
+					if (e && e.target.tagName == 'IMG')
+					{
+						var $image = $(e.target);
+						$image.attr('data-save-url', $image.attr('src'));
+					}
+
+					var imageBox = this.$editor.find('#redactor-image-box');
+					if (imageBox.size() === 0) return;
+
+					this.image.editter.remove();
+					$(this.image.resizer).remove();
+
+					imageBox.find('img').css({
+						marginTop: imageBox[0].style.marginTop,
+						marginBottom: imageBox[0].style.marginBottom,
+						marginLeft: imageBox[0].style.marginLeft,
+						marginRight: imageBox[0].style.marginRight
+					});
+
+					imageBox.css('margin', '');
+					imageBox.find('img').css('opacity', '');
+					imageBox.replaceWith(function()
+					{
+						return $(this).contents();
+					});
+
+					$(document).off('click.redactor-image-resize-hide');
+					this.$editor.off('click.redactor-image-resize-hide');
+
+					this.code.sync();
+
+				},
+				loadEditableControls: function($image)
+				{
+					var imageBox = $('<span id="redactor-image-box" data-redactor="verified">');
+					imageBox.css('float', $image.css('float')).attr('contenteditable', false);
+
+					if ($image[0].style.margin != 'auto')
+					{
+						imageBox.css({
+							marginTop: $image[0].style.marginTop,
+							marginBottom: $image[0].style.marginBottom,
+							marginLeft: $image[0].style.marginLeft,
+							marginRight: $image[0].style.marginRight
+						});
+
+						$image.css('margin', '');
+					}
+					else
+					{
+						imageBox.css({ 'display': 'block', 'margin': 'auto' });
+					}
+
+					$image.css('opacity', '.5').after(imageBox);
+
+					// editter
+					this.image.editter = $('<span id="redactor-image-editter" data-redactor="verified">' + this.lang.get('edit') + '</span>');
+					this.image.editter.attr('contenteditable', false);
+					this.image.editter.on('click', $.proxy(function()
+					{
+						this.image.showEdit($image);
+					}, this));
+
+					imageBox.append(this.image.editter);
+
+					// position correction
+					var editerWidth = this.image.editter.innerWidth();
+					this.image.editter.css('margin-left', '-' + editerWidth/2 + 'px');
+
+
+					// resizer
+					if (this.opts.imageResizable && !this.utils.isMobile())
+					{
+						var imageResizer = $('<span id="redactor-image-resizer" data-redactor="verified"></span>');
+
+						if (!this.utils.isDesktop())
+						{
+							imageResizer.css({ width: '15px', height: '15px' });
+						}
+
+						imageResizer.attr('contenteditable', false);
+						imageBox.append(imageResizer);
+						imageBox.append($image);
+
+						return imageResizer;
+					}
+					else
+					{
+						imageBox.append($image);
+						return false;
+					}
+				},
+				remove: function(image)
+				{
+					var $image = $(image);
+					var $link = $image.closest('a');
+					var $figure = $image.closest('figure');
+					var $parent = $image.parent();
+					if ($('#redactor-image-box').size() !== 0)
+					{
+						$parent = $('#redactor-image-box').parent();
+					}
+
+					var $next;
+					if ($figure.size() !== 0)
+					{
+						$next = $figure.next();
+						$figure.remove();
+					}
+					else if ($link.size() !== 0)
+					{
+						$parent = $link.parent();
+						$link.remove();
+					}
+					else
+					{
+						$image.remove();
+					}
+
+					$('#redactor-image-box').remove();
+
+					if ($figure.size() !== 0)
+					{
+						this.caret.setStart($next);
+					}
+					else
+					{
+						this.caret.setStart($parent);
+					}
+
+					// delete callback
+					this.core.setCallback('imageDelete', $image[0].src, $image);
+
+					this.modal.close();
+					this.code.sync();
+				},
+				insert: function(json, direct, e)
+				{
+					// error callback
+					if (typeof json.error != 'undefined')
+					{
+						this.modal.close();
+						this.selection.restore();
+						this.core.setCallback('imageUploadError', json);
+						return;
+					}
+
+					var $img;
+					if (typeof json == 'string')
+					{
+						$img = $(json).attr('data-redactor-inserted-image', 'true');
+					}
+					else
+					{
+						$img = $('<img>');
+						$img.attr('src', json.filelink).attr('data-redactor-inserted-image', 'true');
+					}
+
+
+					var node = $img;
+					var isP = this.utils.isCurrentOrParent('P');
+					if (isP)
+					{
+						// will replace
+						node = $('<blockquote />').append($img);
+					}
+
+					if (direct)
+					{
+						this.selection.removeMarkers();
+						var marker = this.selection.getMarker();
+						this.insert.nodeToCaretPositionFromPoint(e, marker);
+					}
+					else
+					{
+						this.modal.close();
+					}
+
+					this.selection.restore();
+					this.buffer.set();
+
+
+					this.insert.html(this.utils.getOuterHtml(node), false);
+
+					var $image = this.$editor.find('img[data-redactor-inserted-image=true]').removeAttr('data-redactor-inserted-image');
+
+					if (isP)
+					{
+						$image.parent().contents().unwrap().wrap('<p />');
+					}
+					else if (this.opts.linebreaks)
+					{
+						$image.before('<br>').after('<br>');
+					}
+
+					if (typeof json == 'string') return;
+
+					this.core.setCallback('imageUpload', $image, json);
+
+				}
+			};
+		},
+		file: function()
+		{
+			return {
+				show: function()
+				{
+					this.modal.load('file', this.lang.get('file'), 700);
+					this.upload.init('#redactor-modal-file-upload', this.opts.fileUpload, this.file.insert);
+
+					this.selection.save();
+
+					this.selection.get();
+					var text = this.sel.toString();
+
+					$('#redactor-filename').val(text);
+
+					this.modal.show();
+				},
+				insert: function(json, direct, e)
+				{
+					// error callback
+					if (typeof json.error != 'undefined')
+					{
+						this.modal.close();
+						this.selection.restore();
+						this.core.setCallback('fileUploadError', json);
+						return;
+					}
+
+					var link;
+					if (typeof json == 'string')
+					{
+						link = json;
+					}
+					else
+					{
+						var text = $('#redactor-filename').val();
+						if (typeof text == 'undefined' || text === '') text = json.filename;
+
+						link = '<a href="' + json.filelink + '" id="filelink-marker">' + text + '</a>';
+					}
+
+					if (direct)
+					{
+						this.selection.removeMarkers();
+						var marker = this.selection.getMarker();
+						this.insert.nodeToCaretPositionFromPoint(e, marker);
+					}
+					else
+					{
+						this.modal.close();
+					}
+
+					this.selection.restore();
+					this.buffer.set();
+
+
+					this.insert.html(link);
+
+					if (typeof json == 'string') return;
+
+					var linkmarker = $(this.$editor.find('a#filelink-marker'));
+					if (linkmarker.size() !== 0) linkmarker.removeAttr('id');
+					else linkmarker = false;
+
+
+					this.core.setCallback('fileUpload', linkmarker, json);
+
+				}
+			};
+		},
+		modal: function()
+		{
+			return {
+				callbacks: {},
+				loadTemplates: function()
+				{
+					this.opts.modal = {
+						imageEdit: String()
+						+ '<section id="redactor-modal-image-edit">'
+							+ '<label>' + this.lang.get('title') + '</label>'
+							+ '<input type="text" id="redactor-image-title" />'
+							+ '<label class="redactor-image-link-option">' + this.lang.get('link') + '</label>'
+							+ '<input type="text" id="redactor-image-link" class="redactor-image-link-option" />'
+							+ '<label class="redactor-image-link-option"><input type="checkbox" id="redactor-image-link-blank"> ' + this.lang.get('link_new_tab') + '</label>'
+							+ '<label class="redactor-image-position-option">' + this.lang.get('image_position') + '</label>'
+							+ '<select class="redactor-image-position-option" id="redactor-image-align">'
+								+ '<option value="none">' + this.lang.get('none') + '</option>'
+								+ '<option value="left">' + this.lang.get('left') + '</option>'
+								+ '<option value="center">' + this.lang.get('center') + '</option>'
+								+ '<option value="right">' + this.lang.get('right') + '</option>'
+							+ '</select>'
+						+ '</section>',
+
+						image: String()
+						+ '<section id="redactor-modal-image-insert">'
+							+ '<div id="redactor-modal-image-droparea"></div>'
+ 						+ '</section>',
+
+						file: String()
+						+ '<section id="redactor-modal-file-insert">'
+							+ '<div id="redactor-modal-file-upload-box">'
+								+ '<label>' + this.lang.get('filename') + '</label>'
+								+ '<input type="text" id="redactor-filename" /><br><br>'
+								+ '<div id="redactor-modal-file-upload"></div>'
+							+ '</div>'
+						+ '</section>',
+
+						link: String()
+						+ '<section id="redactor-modal-link-insert">'
+							+ '<label>URL</label>'
+							+ '<input type="url" id="redactor-link-url" />'
+							+ '<label>' + this.lang.get('text') + '</label>'
+							+ '<input type="text" id="redactor-link-url-text" />'
+							+ '<label><input type="checkbox" id="redactor-link-blank"> ' + this.lang.get('link_new_tab') + '</label>'
+						+ '</section>'
 					};
+
+
+					$.extend(this.opts, this.opts.modal);
+
+				},
+				addCallback: function(name, callback)
+				{
+					this.modal.callbacks[name] = callback;
+				},
+				createTabber: function($modal)
+				{
+					this.modal.$tabber = $('<div>').attr('id', 'redactor-modal-tabber');
+
+					$modal.prepend(this.modal.$tabber);
+				},
+				addTab: function(id, name, active)
+				{
+					var $tab = $('<a href="#" rel="tab' + id + '">').text(name);
+					if (active)
+					{
+						$tab.addClass('active');
+					}
+
+					var self = this;
+					$tab.on('click', function(e)
+					{
+						e.preventDefault();
+						$('.redactor-tab').hide();
+						$('.redactor-' + $(this).attr('rel')).show();
+
+						self.modal.$tabber.find('a').removeClass('active');
+						$(this).addClass('active');
+
+					});
+
+					this.modal.$tabber.append($tab);
+				},
+				addTemplate: function(name, template)
+				{
+					this.opts.modal[name] = template;
+				},
+				getTemplate: function(name)
+				{
+					return this.opts.modal[name];
+				},
+				getModal: function()
+				{
+					return this.$modalBody.find('section');
+				},
+				load: function(templateName, title, width)
+				{
+					this.modal.templateName = templateName;
+					this.modal.width = width;
+
+					this.modal.build();
+					this.modal.enableEvents();
+					this.modal.setTitle(title);
+					this.modal.setDraggable();
+					this.modal.setContent();
+
+					// callbacks
+					if (typeof this.modal.callbacks[templateName] != 'undefined')
+					{
+						this.modal.callbacks[templateName].call(this);
+					}
+
+				},
+				show: function()
+				{
+					this.modal.bodyOveflow = $(document.body).css('overflow');
+					$(document.body).css('overflow', 'hidden');
+
+					if (this.utils.isMobile())
+					{
+						this.modal.showOnMobile();
+					}
+					else
+					{
+						this.modal.showOnDesktop();
+					}
+
+					this.$modalOverlay.show();
+					this.$modalBox.show();
+
+					this.modal.setButtonsWidth();
+
+					this.utils.saveScroll();
+
+					// resize
+					if (!this.utils.isMobile())
+					{
+						setTimeout($.proxy(this.modal.showOnDesktop, this), 0);
+						$(window).on('resize.redactor-modal', $.proxy(this.modal.resize, this));
+					}
+
+					// modal shown callback
+					this.core.setCallback('modalOpened', this.modal.templateName, this.$modal);
+
+					// fix bootstrap modal focus
+					$(document).off('focusin.modal');
+
+					// enter
+					this.$modal.find('input[type=text]').on('keypress.redactor-modal', $.proxy(this.modal.setEnter, this));
+
+				},
+				showOnDesktop: function()
+				{
+					var height = this.$modal.outerHeight();
+					var windowHeight = $(window).height();
+					var windowWidth = $(window).width();
+
+					if (this.modal.width > windowWidth)
+					{
+						this.$modal.css({
+							width: '96%',
+							marginTop: (windowHeight/2 - height/2) + 'px'
+						});
+						return;
+					}
+
+					if (height > windowHeight)
+					{
+						this.$modal.css({
+							width: this.modal.width + 'px',
+							marginTop: '20px'
+						});
+					}
+					else
+					{
+						this.$modal.css({
+							width: this.modal.width + 'px',
+							marginTop: (windowHeight/2 - height/2) + 'px'
+						});
+					}
+				},
+				showOnMobile: function()
+				{
+					this.$modal.css({
+						width: '96%',
+						marginTop: '2%'
+					});
+
+				},
+				resize: function()
+				{
+					if (this.utils.isMobile())
+					{
+						this.modal.showOnMobile();
+					}
+					else
+					{
+						this.modal.showOnDesktop();
+					}
+				},
+				setTitle: function(title)
+				{
+					this.$modalHeader.html(title);
+				},
+				setContent: function()
+				{
+					this.$modalBody.html(this.modal.getTemplate(this.modal.templateName));
+				},
+				setDraggable: function()
+				{
+					if (typeof $.fn.draggable === 'undefined') return;
+
+					this.$modal.draggable({ handle: this.$modalHeader });
+					this.$modalHeader.css('cursor', 'move');
+				},
+				setEnter: function(e)
+				{
+					if (e.which != 13) return;
+
+					e.preventDefault();
+					this.$modal.find('button.redactor-modal-action-btn').click();
+				},
+				createCancelButton: function()
+				{
+					var button = $('<button>').addClass('redactor-modal-btn redactor-modal-close-btn').html(this.lang.get('cancel'));
+					button.on('click', $.proxy(this.modal.close, this));
+
+					this.$modalFooter.append(button);
+				},
+				createDeleteButton: function(label)
+				{
+					return this.modal.createButton(label, 'delete');
+				},
+				createActionButton: function(label)
+				{
+					return this.modal.createButton(label, 'action');
+				},
+				createButton: function(label, className)
+				{
+					var button = $('<button>').addClass('redactor-modal-btn').addClass('redactor-modal-' + className + '-btn').html(label);
+					this.$modalFooter.append(button);
+
+					return button;
+				},
+				setButtonsWidth: function()
+				{
+					var buttons = this.$modalFooter.find('button');
+					var buttonsSize = buttons.size();
+					if (buttonsSize === 0) return;
+
+					buttons.css('width', (100/buttonsSize) + '%');
 				},
 				build: function()
 				{
-					this.toolbar.hideButtons();
-					this.toolbar.hideButtonsOnMobile();
-					this.toolbar.isButtonSourceNeeded();
+					this.modal.buildOverlay();
 
-					if (this.opts.buttons.length === 0) return;
+					this.$modalBox = $('<div id="redactor-modal-box" />').hide();
+					this.$modal = $('<div id="redactor-modal" />');
+					this.$modalHeader = $('<header />');
+					this.$modalClose = $('<span id="redactor-modal-close" />').html('&times;');
+					this.$modalBody = $('<div id="redactor-modal-body" />');
+					this.$modalFooter = $('<footer />');
 
-					this.$toolbar = this.toolbar.createContainer();
+					this.$modal.append(this.$modalHeader);
+					this.$modal.append(this.$modalClose);
+					this.$modal.append(this.$modalBody);
+					this.$modal.append(this.$modalFooter);
+					this.$modalBox.append(this.$modal);
+					this.$modalBox.appendTo(document.body);
+				},
+				buildOverlay: function()
+				{
+					this.$modalOverlay = $('<div id="redactor-modal-overlay">').hide();
+					$('body').prepend(this.$modalOverlay);
+				},
+				enableEvents: function()
+				{
+					this.$modalClose.on('click.redactor-modal', $.proxy(this.modal.close, this));
+					$(document).on('keyup.redactor-modal', $.proxy(this.modal.closeHandler, this));
+					this.$editor.on('keyup.redactor-modal', $.proxy(this.modal.closeHandler, this));
+					this.$modalBox.on('click.redactor-modal', $.proxy(this.modal.close, this));
+				},
+				disableEvents: function()
+				{
+					this.$modalClose.off('click.redactor-modal');
+					$(document).off('keyup.redactor-modal');
+					this.$editor.off('keyup.redactor-modal');
+					this.$modalBox.off('click.redactor-modal');
+					$(window).off('resize.redactor-modal');
+				},
+				closeHandler: function(e)
+				{
+					if (e.which != this.keyCode.ESC) return;
 
-					this.toolbar.setOverflow();
-					this.toolbar.append();
-					this.toolbar.setFormattingTags();
-					this.toolbar.loadButtons();
-					this.toolbar.setFixed();
-
-					// buttons response
-					if (this.opts.activeButtons)
+					this.modal.close(false);
+				},
+				close: function(e)
+				{
+					if (e)
 					{
-						this.$editor.on('mouseup.redactor keyup.redactor focus.redactor', $.proxy(this.observe.buttons, this));
+						if (!$(e.target).hasClass('redactor-modal-close-btn') && e.target != this.$modalClose[0] && e.target != this.$modalBox[0])
+						{
+							return;
+						}
+
+						e.preventDefault();
 					}
 
-				},
-				createContainer: function()
-				{
-					return $('<ul>').addClass('redactor-toolbar').attr('id', 'redactor-toolbar-' + this.uuid);
-				},
-				setFormattingTags: function()
-				{
-					$.each(this.opts.toolbar.formatting.dropdown, $.proxy(function (i, s)
+					if (!this.$modalBox) return;
+
+					this.modal.disableEvents();
+
+					this.$modalOverlay.remove();
+
+					this.$modalBox.fadeOut('fast', $.proxy(function()
 					{
-						if ($.inArray(i, this.opts.formatting) == -1) delete this.opts.toolbar.formatting.dropdown[i];
+						this.$modalBox.remove();
+
+						setTimeout($.proxy(this.utils.restoreScroll, this), 0);
+
+						if (e !== undefined) this.selection.restore();
+
+						$(document.body).css('overflow', this.modal.bodyOveflow);
+						this.core.setCallback('modalClosed', this.modal.templateName);
+
 					}, this));
 
-				},
-				loadButtons: function()
+				}
+			};
+		},
+		progress: function()
+		{
+			return {
+				show: function()
 				{
-					$.each(this.opts.buttons, $.proxy(function(i, btnName)
-					{
-						if (!this.opts.toolbar[btnName]) return;
-
-						if (this.opts.fileUpload === false && btnName === 'file') return true;
-						if ((this.opts.imageUpload === false && this.opts.s3 === false) && btnName === 'image') return true;
-
-						var btnObject = this.opts.toolbar[btnName];
-						this.$toolbar.append($('<li>').append(this.button.build(btnName, btnObject)));
-
-					}, this));
+					$(document.body).append($('<div id="redactor-progress"><span></span></div>'));
+					$('#redactor-progress').fadeIn();
 				},
-				append: function()
+				hide: function()
 				{
-					if (this.opts.toolbarExternal)
+					$('#redactor-progress').fadeOut(1500, function()
 					{
-						this.$toolbar.addClass('redactor-toolbar-external');
-						$(this.opts.toolbarExternal).html(this.$toolbar);
-					}
-					else
-					{
-						this.$box.prepend(this.$toolbar);
-					}
-				},
-				setFixed: function()
-				{
-					if (this.utils.isMobile()) return;
-					if (this.opts.toolbarExternal) return;
-					if (!this.opts.toolbarFixed) return;
-
-					this.toolbar.observeScroll();
-					$(this.opts.toolbarFixedTarget).on('scroll.redactor', $.proxy(this.toolbar.observeScroll, this));
-
-				},
-				setOverflow: function()
-				{
-					if (this.utils.isMobile() && this.opts.toolbarOverflow)
-					{
-						this.$toolbar.addClass('redactor-toolbar-overflow');
-					}
-				},
-				isButtonSourceNeeded: function()
-				{
-					if (this.opts.buttonSource) return;
-
-					var index = this.opts.buttons.indexOf('html');
-					if (index !== -1)
-					{
-						this.opts.buttons.splice(index, 1);
-					}
-				},
-				hideButtons: function()
-				{
-					if (this.opts.buttonsHide.length === 0) return;
-
-					$.each(this.opts.buttonsHide, $.proxy(function(i, s)
-					{
-						var index = this.opts.buttons.indexOf(s);
-						this.opts.buttons.splice(index, 1);
-
-					}, this));
-				},
-				hideButtonsOnMobile: function()
-				{
-					if (!this.utils.isMobile() || this.opts.buttonsHideOnMobile.length === 0) return;
-
-					$.each(this.opts.buttonsHideOnMobile, $.proxy(function(i, s)
-					{
-						var index = this.opts.buttons.indexOf(s);
-						this.opts.buttons.splice(index, 1);
-
-					}, this));
-				},
-				observeScroll: function()
-				{
-					var scrollTop = $(this.opts.toolbarFixedTarget).scrollTop();
-					var boxTop = 1;
-
-					if (this.opts.toolbarFixedTarget === document)
-					{
-						boxTop = this.$box.offset().top;
-					}
-
-					if (scrollTop > boxTop)
-					{
-						this.toolbar.observeScrollEnable(scrollTop, boxTop);
-					}
-					else
-					{
-						this.toolbar.observeScrollDisable();
-					}
-				},
-				observeScrollEnable: function(scrollTop, boxTop)
-				{
-					var top = this.opts.toolbarFixedTopOffset + scrollTop - boxTop;
-					var left = 0;
-					var end = boxTop + this.$box.height() + 30;
-					var width = this.$box.innerWidth();
-
-					this.$toolbar.addClass('toolbar-fixed-box');
-					this.$toolbar.css({
-						position: 'absolute',
-						width: width,
-						top: top + 'px',
-						left: left
-					});
-
-					this.toolbar.setDropdownsFixed();
-					this.$toolbar.css('visibility', (scrollTop < end) ? 'visible' : 'hidden');
-				},
-				observeScrollDisable: function()
-				{
-					this.$toolbar.css({
-						position: 'relative',
-						width: 'auto',
-						top: 0,
-						left: 0,
-						visibility: 'visible'
-					});
-
-					this.toolbar.unsetDropdownsFixed();
-					this.$toolbar.removeClass('toolbar-fixed-box');
-
-				},
-				setDropdownsFixed: function()
-				{
-					var top = this.$toolbar.innerHeight() + this.opts.toolbarFixedTopOffset;
-					var position = 'fixed';
-					if (this.opts.toolbarFixedTarget !== document)
-					{
-						top = (this.$toolbar.innerHeight() + this.$toolbar.offset().top) + this.opts.toolbarFixedTopOffset;
-						position = 'absolute';
-					}
-
-					$('.redactor-dropdown').each(function()
-					{
-						$(this).css({ position: position, top: top + 'px' });
-					});
-				},
-				unsetDropdownsFixed: function()
-				{
-					var top = (this.$toolbar.innerHeight() + this.$toolbar.offset().top);
-					$('.redactor-dropdown').each(function()
-					{
-						$(this).css({ position: 'absolute', top: top + 'px' });
+						$(this).remove();
 					});
 				}
+
 			};
 		},
 		upload: function()
@@ -7773,11 +7556,8 @@
 				removeEmpty: function(i, s)
 				{
 					var $s = $(s);
-
-					$s.find('.redactor-invisible-space').removeAttr('style').removeAttr('class');
-
-					if ($s.find('hr, br, img, iframe').length !== 0) return;
 					var text = $.trim($s.text());
+					if ($s.children('hr, br, img').length !== 0) return;
 					if (this.utils.isEmpty(text, false))
 					{
 						$s.remove();
@@ -7796,7 +7576,7 @@
 				},
 				restoreScroll: function()
 				{
-					if (typeof this.saveScroll === 'undefined' && typeof this.saveBodyScroll === 'undefined') return;
+					if (!this.saveScroll && !this.saveBodyScroll) return;
 
 					$(window).scrollTop(this.saveBodyScroll);
 					this.$editor.scrollTop(this.saveEditorScroll);
@@ -7872,8 +7652,9 @@
 
 					var offset = this.caret.getOffsetOfElement(block);
 					var text = $.trim($(block).text()).replace(/\n\r\n/g, '');
+					var len = text.length;
 
-					return (offset == text.length) ? true : false;
+					return (offset == len) ? true : false;
 				},
 
 				// test blocks
@@ -8003,7 +7784,7 @@
 	// LINKIFY
 	$.Redactor.fn.formatLinkify = function(protocol, convertLinks, convertUrlLinks, convertImageLinks, convertVideoLinks, linkSize)
 	{
-		var urlCheck = '((?:http[s]?:\\/\\/(?:www\\.)?|www\\.){1}(?:[0-9A-Za-z\\-%_]+\\.)+[a-zA-Z]{2,}(?::[0-9]+)?(?:(?:/[0-9A-Za-z\\-\\.%\+_]*)+)?(?:\\?(?:[0-9A-Za-z\\-\\.%_]+(?:=[0-9A-Za-z\\-\\.%_\\+]*)?)?(?:&(?:[0-9A-Za-z\\-\\.%_]+(?:=[0-9A-Za-z\\-\\.%_\\+]*)?)?)*)?(?:#[0-9A-Za-z\\-\\.%_\\+=\\?&;]*)?)';
+		var urlCheck = '((?:http[s]?:\\/\\/(?:www\\.)?|www\\.){1}(?:[0-9A-Za-z\\-%_]+\\.)+[a-zA-Z]{2,}(?::[0-9]+)?(?:(?:/[0-9A-Za-z\\-\\.%_]*)+)?(?:\\?(?:[0-9A-Za-z\\-\\.%_]+(?:=[0-9A-Za-z\\-\\.%_\\+]*)?)?(?:&(?:[0-9A-Za-z\\-\\.%_]+(?:=[0-9A-Za-z\\-\\.%_\\+]*)?)?)*)?(?:#[0-9A-Za-z\\-\\.%_\\+=\\?&;]*)?)';
 		var regex = new RegExp(urlCheck, 'gi');
 		var rProtocol = /(https?|ftp):\/\//i;
 		var urlImage = /(https?:\/\/.*\.(?:png|jpg|jpeg|gif))/gi;
diff --git a/app/assets/javascripts/redactor_plugins/fontcolor.js b/app/assets/javascripts/redactor_plugins/fontcolor.js
new file mode 100755
index 0000000..562c4cc
--- /dev/null
+++ b/app/assets/javascripts/redactor_plugins/fontcolor.js
@@ -0,0 +1,73 @@
+if (!RedactorPlugins) var RedactorPlugins = {};
+
+RedactorPlugins.fontcolor = function()
+{
+	return {
+		init: function()
+		{
+			var colors = [
+				'#ffffff', '#000000', '#eeece1', '#1f497d', '#4f81bd', '#c0504d', '#9bbb59', '#8064a2', '#4bacc6', '#f79646', '#ffff00',
+				'#f2f2f2', '#7f7f7f', '#ddd9c3', '#c6d9f0', '#dbe5f1', '#f2dcdb', '#ebf1dd', '#e5e0ec', '#dbeef3', '#fdeada', '#fff2ca',
+				'#d8d8d8', '#595959', '#c4bd97', '#8db3e2', '#b8cce4', '#e5b9b7', '#d7e3bc', '#ccc1d9', '#b7dde8', '#fbd5b5', '#ffe694',
+				'#bfbfbf', '#3f3f3f', '#938953', '#548dd4', '#95b3d7', '#d99694', '#c3d69b', '#b2a2c7', '#b7dde8', '#fac08f', '#f2c314',
+				'#a5a5a5', '#262626', '#494429', '#17365d', '#366092', '#953734', '#76923c', '#5f497a', '#92cddc', '#e36c09', '#c09100',
+				'#7f7f7f', '#0c0c0c', '#1d1b10', '#0f243e', '#244061', '#632423', '#4f6128', '#3f3151', '#31859b',  '#974806', '#7f6000'
+			];
+
+			var buttons = ['fontcolor', 'backcolor'];
+
+			for (var i = 0; i < 2; i++)
+			{
+				var name = buttons[i];
+
+				var button = this.button.add(name, this.lang.get(name));
+				var $dropdown = this.button.addDropdown(button);
+
+				$dropdown.width(242);
+				this.fontcolor.buildPicker($dropdown, name, colors);
+
+			}
+		},
+		buildPicker: function($dropdown, name, colors)
+		{
+			var rule = (name == 'backcolor') ? 'background-color' : 'color';
+
+			var len = colors.length;
+			var self = this;
+			var func = function(e)
+			{
+				e.preventDefault();
+				self.fontcolor.set($(this).data('rule'), $(this).attr('rel'));
+			};
+
+			for (var z = 0; z < len; z++)
+			{
+				var color = colors[z];
+
+				var $swatch = $('<a rel="' + color + '" data-rule="' + rule +'" href="#" style="float: left; font-size: 0; border: 2px solid #fff; padding: 0; margin: 0; width: 22px; height: 22px;"></a>');
+				$swatch.css('background-color', color);
+				$swatch.on('click', func);
+
+				$dropdown.append($swatch);
+			}
+
+			var $elNone = $('<a href="#" style="display: block; clear: both; padding: 5px; font-size: 12px; line-height: 1;"></a>').html(this.lang.get('none'));
+			$elNone.on('click', $.proxy(function(e)
+			{
+				e.preventDefault();
+				this.fontcolor.remove(rule);
+
+			}, this));
+
+			$dropdown.append($elNone);
+		},
+		set: function(rule, type)
+		{
+			this.inline.format('span', 'style', rule + ': ' + type + ';');
+		},
+		remove: function(rule)
+		{
+			this.inline.removeStyleRule(rule);
+		}
+	};
+};
\ No newline at end of file
diff --git a/app/assets/javascripts/redactor_plugins/fontfamily.js b/app/assets/javascripts/redactor_plugins/fontfamily.js
new file mode 100755
index 0000000..5e42671
--- /dev/null
+++ b/app/assets/javascripts/redactor_plugins/fontfamily.js
@@ -0,0 +1,32 @@
+if (!RedactorPlugins) var RedactorPlugins = {};
+
+RedactorPlugins.fontfamily = function()
+{
+	return {
+		init: function ()
+		{
+			var fonts = [ 'Lato', 'Stylograph','Arial', 'Helvetica', 'Georgia', 'Times New Roman', 'Monospace' ];
+			var that = this;
+			var dropdown = {};
+
+			$.each(fonts, function(i, s)
+			{
+				dropdown['s' + i] = { title: s, func: function() { that.fontfamily.set(s); }};
+			});
+
+			dropdown.remove = { title: 'Remove Font Family', func: that.fontfamily.reset };
+
+			var button = this.button.add('fontfamily', 'Change Font Family');
+			this.button.addDropdown(button, dropdown);
+
+		},
+		set: function (value)
+		{
+			this.inline.format('span', 'style', 'font-family:' + value + ';');
+		},
+		reset: function()
+		{
+			this.inline.removeStyleRule('font-family');
+		}
+	};
+};
\ No newline at end of file
diff --git a/app/assets/javascripts/redactor_plugins/fontsize.js b/app/assets/javascripts/redactor_plugins/fontsize.js
new file mode 100755
index 0000000..6a3df8f
--- /dev/null
+++ b/app/assets/javascripts/redactor_plugins/fontsize.js
@@ -0,0 +1,75 @@
+if (!RedactorPlugins) var RedactorPlugins = {};
+
+RedactorPlugins.fontsize = function()
+{
+	return {
+		init: function()
+		{
+			var fonts = [10, 11, 12, 14, 16, 18, 20, 24, 28, 30];
+			var that = this;
+			var dropdown = {};
+
+			$.each(fonts, function(i, s)
+			{
+				dropdown['s' + i] = { title: s + 'px', func: function() { that.fontsize.set(s); } };
+			});
+
+			dropdown.remove = { title: 'Remove Font Size', func: that.fontsize.reset };
+
+			var button = this.button.add('fontsize', 'Change Font Size');
+			this.button.addDropdown(button, dropdown);
+		},
+		set: function(size)
+		{
+			this.inline.format('span', 'style', 'font-size: ' + size + 'px;');
+		},
+		reset: function()
+		{
+			this.inline.removeStyleRule('font-size');
+		}
+	};
+};
+
+if (!RedactorPlugins) var RedactorPlugins = {};
+ 
+RedactorPlugins.scriptbuttons = function()
+{
+    return {
+        init: function()
+        {
+            var sup = this.button.add('superscript', 'Superscript');
+            var sub = this.button.add('subscript', 'Subscript');
+ 
+            // make your added buttons as Font Awesome's icon
+            this.button.setAwesome('superscript', 'fa-superscript');
+            this.button.setAwesome('subscript', 'fa-subscript');
+ 
+            this.button.addCallback(sup, this.scriptbuttons.formatSup);
+            this.button.addCallback(sub, this.scriptbuttons.formatSub);
+        },
+        formatSup: function()
+        {
+            this.inline.format('sup');
+        },
+        formatSub: function()
+        {
+            this.inline.format('sub');
+        }
+    };
+};
+
+if (!RedactorPlugins) var RedactorPlugins = {};
+ 
+RedactorPlugins.bufferbuttons = function()
+{
+    return {
+        init: function()
+        {
+            var undo = this.button.addFirst('undo', 'Undo');
+            var redo = this.button.addAfter('undo', 'redo', 'Redo');
+ 
+            this.button.addCallback(undo, this.buffer.undo);
+            this.button.addCallback(redo, this.buffer.redo);
+        }
+    };
+};
\ No newline at end of file
diff --git a/app/assets/javascripts/vendor/bootstrap-slider.js b/app/assets/javascripts/vendor/bootstrap-slider.js
new file mode 100755
index 0000000..284702c
--- /dev/null
+++ b/app/assets/javascripts/vendor/bootstrap-slider.js
@@ -0,0 +1,388 @@
+/* =========================================================
+ * bootstrap-slider.js v2.0.0
+ * http://www.eyecon.ro/bootstrap-slider
+ * =========================================================
+ * Copyright 2012 Stefan Petre
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+ 
+!function( $ ) {
+
+  var Slider = function(element, options) {
+    this.element = $(element);
+    this.picker = $('<div class="slider">'+
+              '<div class="slider-track">'+
+                '<div class="slider-selection"></div>'+
+                '<div class="slider-handle"></div>'+
+                '<div class="slider-handle"></div>'+
+              '</div>'+
+              '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'+
+            '</div>')
+              .insertBefore(this.element)
+              .append(this.element);
+    this.id = this.element.data('slider-id')||options.id;
+    if (this.id) {
+      this.picker[0].id = this.id;
+    }
+
+    if (typeof Modernizr !== 'undefined' && Modernizr.touch) {
+      this.touchCapable = true;
+    }
+
+    var tooltip = this.element.data('slider-tooltip')||options.tooltip;
+
+    this.tooltip = this.picker.find('.tooltip');
+    this.tooltipInner = this.tooltip.find('div.tooltip-inner');
+
+    this.orientation = this.element.data('slider-orientation')||options.orientation;
+    switch(this.orientation) {
+      case 'vertical':
+        this.picker.addClass('slider-vertical');
+        this.stylePos = 'top';
+        this.mousePos = 'pageY';
+        this.sizePos = 'offsetHeight';
+        this.tooltip.addClass('right')[0].style.left = '100%';
+        break;
+      default:
+        this.picker
+          .addClass('slider-horizontal')
+          .css('width', this.element.outerWidth());
+        this.orientation = 'horizontal';
+        this.stylePos = 'left';
+        this.mousePos = 'pageX';
+        this.sizePos = 'offsetWidth';
+        this.tooltip.addClass('top')[0].style.top = -this.tooltip.outerHeight() - 14 + 'px';
+        break;
+    }
+
+    this.min = this.element.data('slider-min')||options.min;
+    this.max = this.element.data('slider-max')||options.max;
+    this.step = this.element.data('slider-step')||options.step;
+    this.value = this.element.data('slider-value')||options.value;
+    if (this.value[1]) {
+      this.range = true;
+    }
+
+    this.selection = this.element.data('slider-selection')||options.selection;
+    this.selectionEl = this.picker.find('.slider-selection');
+    if (this.selection === 'none') {
+      this.selectionEl.addClass('hide');
+    }
+    this.selectionElStyle = this.selectionEl[0].style;
+
+
+    this.handle1 = this.picker.find('.slider-handle:first');
+    this.handle1Stype = this.handle1[0].style;
+    this.handle2 = this.picker.find('.slider-handle:last');
+    this.handle2Stype = this.handle2[0].style;
+
+    var handle = this.element.data('slider-handle')||options.handle;
+    switch(handle) {
+      case 'round':
+        this.handle1.addClass('round');
+        this.handle2.addClass('round');
+        break
+      case 'triangle':
+        this.handle1.addClass('triangle');
+        this.handle2.addClass('triangle');
+        break
+    }
+
+    if (this.range) {
+      this.value[0] = Math.max(this.min, Math.min(this.max, this.value[0]));
+      this.value[1] = Math.max(this.min, Math.min(this.max, this.value[1]));
+    } else {
+      this.value = [ Math.max(this.min, Math.min(this.max, this.value))];
+      this.handle2.addClass('hide');
+      if (this.selection == 'after') {
+        this.value[1] = this.max;
+      } else {
+        this.value[1] = this.min;
+      }
+    }
+    this.diff = this.max - this.min;
+    this.percentage = [
+      (this.value[0]-this.min)*100/this.diff,
+      (this.value[1]-this.min)*100/this.diff,
+      this.step*100/this.diff
+    ];
+
+    this.offset = this.picker.offset();
+    this.size = this.picker[0][this.sizePos];
+
+    this.formater = options.formater;
+
+    this.layout();
+
+    if (this.touchCapable) {
+      // Touch: Bind touch events:
+      this.picker.on({
+        touchstart: $.proxy(this.mousedown, this)
+      });
+    } else {
+      this.picker.on({
+        mousedown: $.proxy(this.mousedown, this)
+      });
+    }
+
+    if (tooltip === 'show') {
+      this.picker.on({
+        mouseenter: $.proxy(this.showTooltip, this),
+        mouseleave: $.proxy(this.hideTooltip, this)
+      });
+    } else {
+      this.tooltip.addClass('hide');
+    }
+  };
+
+  Slider.prototype = {
+    constructor: Slider,
+
+    over: false,
+    inDrag: false,
+    
+    showTooltip: function(){
+      this.tooltip.addClass('in');
+      //var left = Math.round(this.percent*this.width);
+      //this.tooltip.css('left', left - this.tooltip.outerWidth()/2);
+      this.over = true;
+    },
+    
+    hideTooltip: function(){
+      if (this.inDrag === false) {
+        this.tooltip.removeClass('in');
+      }
+      this.over = false;
+    },
+
+    layout: function(){
+      this.handle1Stype[this.stylePos] = this.percentage[0]+'%';
+      this.handle2Stype[this.stylePos] = this.percentage[1]+'%';
+      if (this.orientation == 'vertical') {
+        this.selectionElStyle.top = Math.min(this.percentage[0], this.percentage[1]) +'%';
+        this.selectionElStyle.height = Math.abs(this.percentage[0] - this.percentage[1]) +'%';
+      } else {
+        this.selectionElStyle.left = Math.min(this.percentage[0], this.percentage[1]) +'%';
+        this.selectionElStyle.width = Math.abs(this.percentage[0] - this.percentage[1]) +'%';
+      }
+      if (this.range) {
+        this.tooltipInner.text(
+          this.formater(this.value[0]) + 
+          ' : ' + 
+          this.formater(this.value[1])
+        );
+        this.tooltip[0].style[this.stylePos] = this.size * (this.percentage[0] + (this.percentage[1] - this.percentage[0])/2)/100 - (this.orientation === 'vertical' ? this.tooltip.outerHeight()/2 : this.tooltip.outerWidth()/2) +'px';
+      } else {
+        this.tooltipInner.text(
+          this.formater(this.value[0])
+        );
+        this.tooltip[0].style[this.stylePos] = this.size * this.percentage[0]/100 - (this.orientation === 'vertical' ? this.tooltip.outerHeight()/2 : this.tooltip.outerWidth()/2) +'px';
+      }
+    },
+
+    mousedown: function(ev) {
+
+      // Touch: Get the original event:
+      if (this.touchCapable && ev.type === 'touchstart') {
+        ev = ev.originalEvent;
+      }
+
+      this.offset = this.picker.offset();
+      this.size = this.picker[0][this.sizePos];
+
+      var percentage = this.getPercentage(ev);
+
+      if (this.range) {
+        var diff1 = Math.abs(this.percentage[0] - percentage);
+        var diff2 = Math.abs(this.percentage[1] - percentage);
+        this.dragged = (diff1 < diff2) ? 0 : 1;
+      } else {
+        this.dragged = 0;
+      }
+
+      this.percentage[this.dragged] = percentage;
+      this.layout();
+
+      if (this.touchCapable) {
+        // Touch: Bind touch events:
+        $(document).on({
+          touchmove: $.proxy(this.mousemove, this),
+          touchend: $.proxy(this.mouseup, this)
+        });
+      } else {
+        $(document).on({
+          mousemove: $.proxy(this.mousemove, this),
+          mouseup: $.proxy(this.mouseup, this)
+        });
+      }
+
+      this.inDrag = true;
+      var val = this.calculateValue();
+      this.element.trigger({
+          type: 'slideStart',
+          value: val
+        }).trigger({
+          type: 'slide',
+          value: val
+        });
+      return false;
+    },
+
+    mousemove: function(ev) {
+      
+      // Touch: Get the original event:
+      if (this.touchCapable && ev.type === 'touchmove') {
+        ev = ev.originalEvent;
+      }
+
+      var percentage = this.getPercentage(ev);
+      if (this.range) {
+        if (this.dragged === 0 && this.percentage[1] < percentage) {
+          this.percentage[0] = this.percentage[1];
+          this.dragged = 1;
+        } else if (this.dragged === 1 && this.percentage[0] > percentage) {
+          this.percentage[1] = this.percentage[0];
+          this.dragged = 0;
+        }
+      }
+      this.percentage[this.dragged] = percentage;
+      this.layout();
+      var val = this.calculateValue();
+      this.element
+        .trigger({
+          type: 'slide',
+          value: val
+        })
+        .data('value', val)
+        .prop('value', val);
+      return false;
+    },
+
+    mouseup: function(ev) {
+      if (this.touchCapable) {
+        // Touch: Bind touch events:
+        $(document).off({
+          touchmove: this.mousemove,
+          touchend: this.mouseup
+        });
+      } else {
+        $(document).off({
+          mousemove: this.mousemove,
+          mouseup: this.mouseup
+        });
+      }
+
+      this.inDrag = false;
+      if (this.over == false) {
+        this.hideTooltip();
+      }
+      this.element;
+      var val = this.calculateValue();
+      this.element
+        .trigger({
+          type: 'slideStop',
+          value: val
+        })
+        .data('value', val)
+        .prop('value', val);
+      return false;
+    },
+
+    calculateValue: function() {
+      var val;
+      if (this.range) {
+        val = [
+          (this.min + Math.round((this.diff * this.percentage[0]/100)/this.step)*this.step),
+          (this.min + Math.round((this.diff * this.percentage[1]/100)/this.step)*this.step)
+        ];
+        this.value = val;
+      } else {
+        val = (this.min + Math.round((this.diff * this.percentage[0]/100)/this.step)*this.step);
+        this.value = [val, this.value[1]];
+      }
+      return val;
+    },
+
+    getPercentage: function(ev) {
+      if (this.touchCapable) {
+        ev = ev.touches[0];
+      }
+      var percentage = (ev[this.mousePos] - this.offset[this.stylePos])*100/this.size;
+      percentage = Math.round(percentage/this.percentage[2])*this.percentage[2];
+      return Math.max(0, Math.min(100, percentage));
+    },
+
+    getValue: function() {
+      if (this.range) {
+        return this.value;
+      }
+      return this.value[0];
+    },
+
+    setValue: function(val) {
+      this.value = val;
+
+      if (this.range) {
+        this.value[0] = Math.max(this.min, Math.min(this.max, this.value[0]));
+        this.value[1] = Math.max(this.min, Math.min(this.max, this.value[1]));
+      } else {
+        this.value = [ Math.max(this.min, Math.min(this.max, this.value))];
+        this.handle2.addClass('hide');
+        if (this.selection == 'after') {
+          this.value[1] = this.max;
+        } else {
+          this.value[1] = this.min;
+        }
+      }
+      this.diff = this.max - this.min;
+      this.percentage = [
+        (this.value[0]-this.min)*100/this.diff,
+        (this.value[1]-this.min)*100/this.diff,
+        this.step*100/this.diff
+      ];
+      this.layout();
+    }
+  };
+
+  $.fn.slider = function ( option, val ) {
+    return this.each(function () {
+      var $this = $(this),
+        data = $this.data('slider'),
+        options = typeof option === 'object' && option;
+      if (!data)  {
+        $this.data('slider', (data = new Slider(this, $.extend({}, $.fn.slider.defaults,options))));
+      }
+      if (typeof option == 'string') {
+        data[option](val);
+      }
+    })
+  };
+
+  $.fn.slider.defaults = {
+    min: 0,
+    max: 10,
+    step: 1,
+    orientation: 'horizontal',
+    value: 5,
+    selection: 'before',
+    tooltip: 'hide',
+    handle: 'round',
+    formater: function(value) {
+      return value;
+    }
+  };
+
+  $.fn.slider.Constructor = Slider;
+
+}( window.jQuery );
\ No newline at end of file
diff --git a/app/assets/javascripts/vendor/jquery-sortable.js b/app/assets/javascripts/vendor/jquery-sortable.js
new file mode 100644
index 0000000..0725758
--- /dev/null
+++ b/app/assets/javascripts/vendor/jquery-sortable.js
@@ -0,0 +1,598 @@
+/* ===================================================
+ *  jquery-sortable.js v0.9.9
+ *  http://johnny.github.com/jquery-sortable/
+ * ===================================================
+ *  Copyright (c) 2012 Jonas von Andrian
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *  * The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ *  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ========================================================== */
+
+
+!function ( $, window, undefined){
+  var eventNames,
+  pluginName = 'sortable',
+  containerDefaults = {
+    // If true, items can be dragged from this container
+    drag: true,
+    // If true, items can be droped onto this container
+    drop: true,
+    // Exclude items from being draggable, if the
+    // selector matches the item
+    exclude: "",
+    // If true, search for nested containers within an item
+    nested: true,
+    // If true, the items are assumed to be arranged vertically
+    vertical: true
+  }, // end container defaults
+  groupDefaults = {
+    // This is executed after the placeholder has been moved.
+    afterMove: function ($placeholder, container) {
+    },
+    // The css selector of the containers
+    containerSelector: "ol, ul",
+    // Distance the mouse has to travel to start dragging
+    distance: 0,
+    // The css selector of the drag handle
+    handle: "",
+    // The css selector of the items
+    itemSelector: "li",
+    // Check if the dragged item may be inside the container.
+    // Use with care, since the search for a valid container entails a depth first search
+    // and may be quite expensive.
+    isValidTarget: function ($item, container) {
+      return true
+    },
+    // Executed before onDrop if placeholder is detached.
+    // This happens if pullPlaceholder is set to false and the drop occurs outside a container.
+    onCancel: function ($item, container, _super) {
+    },
+    // Executed at the beginning of a mouse move event.
+    // The Placeholder has not been moved yet
+    onDrag: function ($item, position, _super) {
+      $item.css(position)
+    },
+    // Called after the drag has been started,
+    // that is the mouse button is beeing held down and
+    // the mouse is moving.
+    // The container is the closest initialized container.
+    // Therefore it might not be the container, that actually contains the item.
+    onDragStart: function ($item, container, _super) {
+      $item.css({
+        height: $item.height(),
+        width: $item.width()
+      })
+      $item.addClass("dragged")
+      $("body").addClass("dragging")
+    },
+    // Called when the mouse button is beeing released
+    onDrop: function ($item, container, _super) {
+      $item.removeClass("dragged").removeAttr("style")
+      $("body").removeClass("dragging")
+    },
+    // Template for the placeholder. Can be any valid jQuery input
+    // e.g. a string, a DOM element
+    placeholder: '<li class="placeholder"/>',
+    // If true, the position of the placeholder is calculated on every mousemove.
+    // If false, it is only calculated when the mouse is above a container.
+    pullPlaceholder: true,
+    // Specifies serialization of the container group.
+    // The pair $parent/$children is either container/items or item/subcontainers
+    serialize: function ($parent, $children, parentIsContainer) {
+      var result = $.extend({}, $parent.data())
+
+      if($children[0])
+        result.children = $children
+      delete result.sortable
+
+      return result
+    },
+    // Set tolerance while dragging. Positive values will decrease sensitivity.
+    tolerance: 0
+  }, // end group defaults
+  containerGroups = {},
+  groupCounter = 0
+
+  if('ontouchstart' in window){
+    eventNames = {
+      start: "touchstart.sortable",
+      end: "touchend.sortable touchcancel.sortable",
+      move: "touchmove.sortable"
+    }
+  } else {
+    eventNames = {
+      start: "mousedown.sortable",
+      end: "mouseup.sortable",
+      move: "mousemove.sortable"
+    }
+  }
+
+  /*
+   * a is Array [left, right, top, bottom]
+   * b is array [left, top]
+   */
+  function d(a,b) {
+    var x = Math.max(0, a[0] - b[0], b[0] - a[1]),
+    y = Math.max(0, a[2] - b[1], b[1] - a[3])
+    return x+y;
+  }
+
+  function remove(array, from, to) {
+    var rest = array.slice((to || from) + 1 || array.length);
+    array.length = from < 0 ? array.length + from : from;
+    return array.push.apply(array, rest);
+  }
+
+  function setDimensions(array, dimensions, useOffset) {
+    var i = array.length,
+    offsetMethod = useOffset ? "offset" : "position"
+    while(i--){
+      var el = array[i].el ? array[i].el : $(array[i]),
+      // use fitting method
+      pos = el[offsetMethod]()
+      dimensions[i] = [
+        pos.left,
+        pos.left + el.outerWidth(true),
+        pos.top,
+        pos.top + el.outerHeight(true)
+      ]
+    }
+  }
+
+  function getRelativePosition(pointer, element) {
+    var offset = element.offset()
+    return {
+      left: pointer.left - offset.left,
+      top: pointer.top - offset.top
+    }
+  }
+
+  function sortByDistanceDesc(dimensions, pointer, lastPointer) {
+    pointer = [pointer.left, pointer.top]
+    lastPointer = lastPointer && [lastPointer.left, lastPointer.top]
+
+    var dim,
+    i = dimensions.length,
+    distances = []
+
+    while(i--){
+      dim = dimensions[i]
+      distances[i] = [i,d(dim,pointer), lastPointer && d(dim, lastPointer)]
+    }
+    distances = distances.sort(function  (a,b) {
+      return b[1] - a[1] || b[2] - a[2] || b[0] - a[0]
+    })
+
+    // last entry is the closest
+    return distances
+  }
+
+  function processChildContainers(item, containerSelector, method, ignoreChildren) {
+    var childContainers = item.find(containerSelector),
+    i = childContainers.length
+
+    while(i--){
+      var container = childContainers.eq(i).data(pluginName)
+      if(container)
+        container[method](ignoreChildren)
+    }
+
+  }
+
+
+  function ContainerGroup(options) {
+    this.options = $.extend({}, groupDefaults, options)
+    this.containers = []
+    this.childGroups = []
+    this.scrolledProxy = $.proxy(this.scrolled, this)
+    this.dragProxy = $.proxy(this.drag, this)
+    this.dropProxy = $.proxy(this.drop, this)
+
+    if(this.options.parentGroup)
+      this.options.parentGroup.childGroups.push(this)
+    else {
+      this.placeholder = $(this.options.placeholder)
+      if(!options.isValidTarget)
+        this.options.isValidTarget = undefined
+    }
+  }
+
+  ContainerGroup.get = function  (options) {
+    if( !containerGroups[options.group]) {
+      if(!options.group)
+        options.group = groupCounter ++
+      containerGroups[options.group] = new ContainerGroup(options)
+    }
+    return containerGroups[options.group]
+  }
+
+  ContainerGroup.prototype = {
+    dragInit: function  (e, itemContainer) {
+      this.$document = $(itemContainer.el[0].ownerDocument)
+
+      this.toggleListeners('on')
+
+      // get item to drag
+      this.item = $(e.target).closest(this.options.itemSelector)
+      this.itemContainer = itemContainer
+
+      this.setPointer(e)
+    },
+    drag: function  (e) {
+      e.preventDefault()
+
+      if(!this.dragging){
+        if(!this.distanceMet(e))
+          return
+
+        processChildContainers(this.item, this.options.containerSelector, "disable", true)
+
+        this.options.onDragStart(this.item, this.itemContainer, groupDefaults.onDragStart)
+        this.item.before(this.placeholder)
+        this.dragging = true
+      }
+
+      this.setPointer(e)
+      // place item under the cursor
+      this.options.onDrag(this.item,
+                          getRelativePosition(this.pointer, this.item.offsetParent()),
+                          groupDefaults.onDrag)
+
+      var x = e.pageX,
+      y = e.pageY,
+      box = this.sameResultBox,
+      t = this.options.tolerance
+
+      if(!box || box.top - t > y || box.bottom + t < y || box.left - t > x || box.right + t < x)
+        if(!this.searchValidTarget())
+          this.placeholder.detach()
+    },
+    drop: function  (e) {
+      e.preventDefault()
+      this.toggleListeners('off')
+
+      if(!this.dragging)
+        return;
+
+      // processing Drop, check if placeholder is detached
+      if(this.placeholder.closest("html")[0])
+        this.placeholder.before(this.item).detach()
+      else
+        this.options.onCancel(this.item, this.itemContainer, groupDefaults.onCancel)
+
+      this.options.onDrop(this.item, this.getContainer(this.item), groupDefaults.onDrop)
+      processChildContainers(this.item, this.options.containerSelector, "enable", true)
+
+      // cleanup
+      this.clearDimensions()
+      this.clearOffsetParent()
+      this.lastAppendedItem = this.sameResultBox = undefined
+      this.dragging = false
+    },
+    searchValidTarget: function  (pointer, lastPointer) {
+      if(!pointer){
+        pointer = this.relativePointer || this.pointer
+        lastPointer = this.lastRelativePointer || this.lastPointer
+      }
+
+      var distances = sortByDistanceDesc(this.getContainerDimensions(),
+                                         pointer,
+                                         lastPointer),
+      i = distances.length
+
+      while(i--){
+        var index = distances[i][0],
+        distance = distances[i][1]
+
+        if(!distance || this.options.pullPlaceholder){
+          var container = this.containers[index]
+          if(!this.$getOffsetParent()){
+            var offsetParent = container.getItemOffsetParent()
+            pointer = getRelativePosition(pointer, offsetParent)
+            lastPointer = getRelativePosition(lastPointer, offsetParent)
+          }
+          if(container.searchValidTarget(pointer, lastPointer))
+            return true
+        }
+      }
+
+    },
+    movePlaceholder: function  (container, item, method, sameResultBox) {
+      var lastAppendedItem = this.lastAppendedItem
+      if(!sameResultBox && lastAppendedItem && lastAppendedItem[0] === item[0])
+        return;
+
+      item[method](this.placeholder)
+      this.lastAppendedItem = item
+      this.sameResultBox = sameResultBox
+      this.options.afterMove(this.placeholder, container)
+    },
+    getContainerDimensions: function  () {
+      if(!this.containerDimensions)
+        setDimensions(this.containers, this.containerDimensions = [], !this.$getOffsetParent())
+      return this.containerDimensions
+    },
+    getContainer: function  (element) {
+      return element.closest(this.options.containerSelector).data(pluginName)
+    },
+    $getOffsetParent: function  () {
+      if(this.offsetParent === undefined){
+        var i = this.containers.length - 1,
+        offsetParent = this.containers[i].getItemOffsetParent()
+
+        if(!this.options.parentGroup){
+          while(i--){
+            if(offsetParent[0] != this.containers[i].getItemOffsetParent()[0]){
+              // If every container has the same offset parent,
+              // use position() which is relative to this parent,
+              // otherwise use offset()
+              // compare #setDimensions
+              offsetParent = false
+              break;
+            }
+          }
+        }
+        
+        this.offsetParent = offsetParent
+      }
+      return this.offsetParent
+    },
+    clearOffsetParent: function () {
+      this.offsetParent = undefined
+    },
+    setPointer: function (e) {
+      var pointer = {
+        left: e.pageX,
+        top: e.pageY
+      }
+
+      if(this.$getOffsetParent()){
+        var relativePointer = getRelativePosition(pointer, this.$getOffsetParent())
+        this.lastRelativePointer = this.relativePointer
+        this.relativePointer = relativePointer
+      }
+
+      this.lastPointer = this.pointer
+      this.pointer = pointer
+    },
+    distanceMet: function (e) {
+      return (Math.max(
+         Math.abs(this.pointer.left - e.pageX),
+        Math.abs(this.pointer.top - e.pageY)
+      ) >= this.options.distance)
+    },
+    addContainer: function  (container) {
+      this.containers.push(container);
+    },
+    removeContainer: function (container) {
+      var i = this.containers.indexOf(container)
+      remove(this.containers, i);
+    },
+    scrolled: function  (e) {
+      this.clearDimensions()
+      this.clearOffsetParent()
+    },
+    toggleListeners: function (method) {
+      this.$document[method](eventNames.move, this.dragProxy)
+      [method](eventNames.end, this.dropProxy)
+      [method]("scroll.sortable", this.scrolledProxy)
+    },
+    // Recursively clear container and item dimensions
+    clearDimensions: function  () {
+      this.containerDimensions = undefined
+      var i = this.containers.length
+      while(i--){
+        this.containers[i].itemDimensions = undefined
+      }
+      i = this.childGroups.length
+      while(i--){
+        this.childGroups[i].clearDimensions()
+      }
+    }
+  }
+
+  function Container(element, options) {
+    this.el = element
+    this.childGroups = []
+    this.floatRight = false
+    this.dragInitProxy = $.proxy(this.dragInit, this)
+    this.options = $.extend( {}, containerDefaults, options)
+
+    this.group = ContainerGroup.get(this.options)
+    this.rootGroup = this.options.rootGroup = this.options.rootGroup || this.group
+    this.parentGroup = this.options.parentGroup = this.options.parentGroup || this.group
+    this.handle = this.rootGroup.options.handle || this.rootGroup.options.itemSelector
+
+    this.enable(true)
+  }
+
+  Container.prototype = {
+    dragInit: function  (e) {
+      if(e.which !== 1 ||
+         !this.options.drag ||
+         $(e.target).is(this.options.exclude))
+        return;
+      
+      e.preventDefault()
+      e.stopPropagation()
+
+      this.rootGroup.dragInit(e, this)
+    },
+    searchValidTarget: function  (pointer, lastPointer) {
+      var distances = sortByDistanceDesc(this.getItemDimensions(),
+                                         pointer,
+                                         lastPointer),
+      i = distances.length,
+      rootGroup = this.rootGroup,
+      validTarget = !rootGroup.options.isValidTarget ||
+        rootGroup.options.isValidTarget(rootGroup.item, this)
+
+      if(!i && validTarget){
+        rootGroup.movePlaceholder(this, this.el, "append")
+        return true
+      } else
+        while(i--){
+          var index = distances[i][0],
+          distance = distances[i][1]
+          if(!distance && this.options.nested && this.getContainerGroup(index)){
+            var found = this.getContainerGroup(index).searchValidTarget(pointer, lastPointer)
+            if(found)
+              return true
+          }
+          else if(validTarget && $(".dragged").has($(this.items[index])).length == 0){
+            this.movePlaceholder(index, pointer)
+            return true
+          }
+        }
+    },
+    movePlaceholder: function  (index, pointer) {
+      var item = $(this.items[index]),
+      dim = this.itemDimensions[index],
+      method = "after",
+      width = item.outerWidth(),
+      height = item.outerHeight(),
+      offset = item.offset(),
+      sameResultBox = {
+        left: offset.left,
+        right: offset.left + width,
+        top: offset.top,
+        bottom: offset.top + height
+      }
+      if(this.options.vertical){
+        var yCenter = (dim[2] + dim[3]) / 2,
+        inUpperHalf = pointer.top <= yCenter
+        if(inUpperHalf){
+          method = "before"
+          sameResultBox.bottom -= height / 2
+        } else
+          sameResultBox.top += height / 2
+      } else {
+        var xCenter = (dim[0] + dim[1]) / 2,
+        inLeftHalf = pointer.left <= xCenter
+        if(inLeftHalf != this.floatRight){
+          method = "before"
+          sameResultBox.right -= width / 2
+        } else
+          sameResultBox.left += width / 2
+      }
+      this.rootGroup.movePlaceholder(this, item, method, sameResultBox)
+    },
+    getItemDimensions: function  () {
+      if(!this.itemDimensions){
+        this.items = this.$getChildren(this.el, "item").filter(":not(.dragged)").get()
+        setDimensions(this.items, this.itemDimensions = [])
+      }
+      return this.itemDimensions
+    },
+    getItemOffsetParent: function  () {
+      var offsetParent,
+      el = this.el
+      // Since el might be empty we have to check el itself and
+      // can not do something like el.children().first().offsetParent()
+      if(el.css("position") === "relative" || el.css("position") === "absolute"  || el.css("position") === "fixed")
+        offsetParent = el
+      else
+        offsetParent = el.offsetParent()
+      return offsetParent
+    },
+    getContainerGroup: function  (index) {
+      var childGroup = $.data(this.items[index], "subContainer")
+      if( childGroup === undefined){
+        var childContainers = this.$getChildren(this.items[index], "container")
+        childGroup = false
+
+        if(childContainers[0]){
+          var options = $.extend({}, this.options, {
+            parentGroup: this.group,
+            group: groupCounter ++
+          })
+          childGroup = childContainers[pluginName](options).data(pluginName).group
+        }
+        $.data(this.items[index], "subContainer", childGroup)
+      }
+      return childGroup
+    },
+    $getChildren: function (parent, type) {
+      return $(parent).find(this.rootGroup.options[type + "Selector"])
+    },
+    _serialize: function (parent, isContainer) {
+      var that = this,
+      childType = isContainer ? "item" : "container",
+      
+      children = this.$getChildren(parent, childType).not(this.options.exclude).map(function () {
+        return that._serialize($(this), !isContainer)
+      }).get()
+      
+      return this.rootGroup.options.serialize(parent, children, isContainer)
+    }
+  }
+
+  var API = {
+    enable: function  (ignoreChildren) {
+      if(this.options.drop)
+        this.group.addContainer(this)
+      if(!ignoreChildren)
+        processChildContainers(this.el, this.options.containerSelector, "enable", true)
+
+      this.el.on(eventNames.start, this.handle, this.dragInitProxy)
+    },
+    disable: function  (ignoreChildren) {
+      if(this.options.drop)
+        this.group.removeContainer(this)
+      if(!ignoreChildren)
+        processChildContainers(this.el, this.options.containerSelector, "disable", true)
+
+      this.el.off(eventNames.start, this.handle, this.dragInitProxy)
+    },
+    serialize: function () {
+      return this._serialize(this.el, true)
+    }
+  }
+
+  $.extend(Container.prototype, API)
+  
+  /**
+   * jQuery API
+   *
+   * Parameters are
+   *   either options on init
+   *   or a method name followed by arguments to pass to the method
+   */
+  $.fn[pluginName] = function(methodOrOptions) {
+    var args = Array.prototype.slice.call(arguments, 1)
+
+    return this.map(function(){
+      var $t = $(this),
+      object = $t.data(pluginName)
+
+      if(object && API[methodOrOptions])
+        return API[methodOrOptions].apply(object, args) || this
+      else if(!object && (methodOrOptions === undefined ||
+                          typeof methodOrOptions === "object"))
+        $t.data(pluginName, new Container($t, methodOrOptions))
+
+      return this
+    });
+  };
+
+}(jQuery, window)
+;
diff --git a/app/assets/javascripts/vendor/jquery.event.drag.js b/app/assets/javascripts/vendor/jquery.event.drag.js
new file mode 100644
index 0000000..c0dbcab
--- /dev/null
+++ b/app/assets/javascripts/vendor/jquery.event.drag.js
@@ -0,0 +1,402 @@
+/*! 
+ * jquery.event.drag - v 2.2
+ * Copyright (c) 2010 Three Dub Media - http://threedubmedia.com
+ * Open Source MIT License - http://threedubmedia.com/code/license
+ */
+// Created: 2008-06-04 
+// Updated: 2012-05-21
+// REQUIRES: jquery 1.7.x
+
+;(function( $ ){
+
+// add the jquery instance method
+$.fn.drag = function( str, arg, opts ){
+  // figure out the event type
+  var type = typeof str == "string" ? str : "",
+  // figure out the event handler...
+  fn = $.isFunction( str ) ? str : $.isFunction( arg ) ? arg : null;
+  // fix the event type
+  if ( type.indexOf("drag") !== 0 ) 
+    type = "drag"+ type;
+  // were options passed
+  opts = ( str == fn ? arg : opts ) || {};
+  // trigger or bind event handler
+  return fn ? this.bind( type, opts, fn ) : this.trigger( type );
+};
+
+// local refs (increase compression)
+var $event = $.event, 
+$special = $event.special,
+// configure the drag special event 
+drag = $special.drag = {
+  
+  // these are the default settings
+  defaults: {
+    which: 1, // mouse button pressed to start drag sequence
+    distance: 0, // distance dragged before dragstart
+    not: ':input', // selector to suppress dragging on target elements
+    handle: null, // selector to match handle target elements
+    relative: false, // true to use "position", false to use "offset"
+    drop: true, // false to suppress drop events, true or selector to allow
+    click: false // false to suppress click events after dragend (no proxy)
+  },
+  
+  // the key name for stored drag data
+  datakey: "dragdata",
+  
+  // prevent bubbling for better performance
+  noBubble: true,
+  
+  // count bound related events
+  add: function( obj ){ 
+    // read the interaction data
+    var data = $.data( this, drag.datakey ),
+    // read any passed options 
+    opts = obj.data || {};
+    // count another realted event
+    data.related += 1;
+    // extend data options bound with this event
+    // don't iterate "opts" in case it is a node 
+    $.each( drag.defaults, function( key, def ){
+      if ( opts[ key ] !== undefined )
+        data[ key ] = opts[ key ];
+    });
+  },
+  
+  // forget unbound related events
+  remove: function(){
+    $.data( this, drag.datakey ).related -= 1;
+  },
+  
+  // configure interaction, capture settings
+  setup: function(){
+    // check for related events
+    if ( $.data( this, drag.datakey ) ) 
+      return;
+    // initialize the drag data with copied defaults
+    var data = $.extend({ related:0 }, drag.defaults );
+    // store the interaction data
+    $.data( this, drag.datakey, data );
+    // bind the mousedown event, which starts drag interactions
+    $event.add( this, "touchstart mousedown", drag.init, data );
+    // prevent image dragging in IE...
+    if ( this.attachEvent ) 
+      this.attachEvent("ondragstart", drag.dontstart ); 
+  },
+  
+  // destroy configured interaction
+  teardown: function(){
+    var data = $.data( this, drag.datakey ) || {};
+    // check for related events
+    if ( data.related ) 
+      return;
+    // remove the stored data
+    $.removeData( this, drag.datakey );
+    // remove the mousedown event
+    $event.remove( this, "touchstart mousedown", drag.init );
+    // enable text selection
+    drag.textselect( true ); 
+    // un-prevent image dragging in IE...
+    if ( this.detachEvent ) 
+      this.detachEvent("ondragstart", drag.dontstart ); 
+  },
+    
+  // initialize the interaction
+  init: function( event ){ 
+    // sorry, only one touch at a time
+    if ( drag.touched ) 
+      return;
+    // the drag/drop interaction data
+    var dd = event.data, results;
+    // check the which directive
+    if ( event.which != 0 && dd.which > 0 && event.which != dd.which ) 
+      return; 
+    // check for suppressed selector
+    if ( $( event.target ).is( dd.not ) ) 
+      return;
+    // check for handle selector
+    if ( dd.handle && !$( event.target ).closest( dd.handle, event.currentTarget ).length ) 
+      return;
+
+    drag.touched = event.type == 'touchstart' ? this : null;
+    dd.propagates = 1;
+    dd.mousedown = this;
+    dd.interactions = [ drag.interaction( this, dd ) ];
+    dd.target = event.target;
+    dd.pageX = event.pageX;
+    dd.pageY = event.pageY;
+    dd.dragging = null;
+    // handle draginit event... 
+    results = drag.hijack( event, "draginit", dd );
+    // early cancel
+    if ( !dd.propagates )
+      return;
+    // flatten the result set
+    results = drag.flatten( results );
+    // insert new interaction elements
+    if ( results && results.length ){
+      dd.interactions = [];
+      $.each( results, function(){
+        dd.interactions.push( drag.interaction( this, dd ) );
+      });
+    }
+    // remember how many interactions are propagating
+    dd.propagates = dd.interactions.length;
+    // locate and init the drop targets
+    if ( dd.drop !== false && $special.drop ) 
+      $special.drop.handler( event, dd );
+    // disable text selection
+    drag.textselect( false ); 
+    // bind additional events...
+    if ( drag.touched )
+      $event.add( drag.touched, "touchmove touchend", drag.handler, dd );
+    else 
+      $event.add( document, "mousemove mouseup", drag.handler, dd );
+    // helps prevent text selection or scrolling
+    if ( !drag.touched || dd.live )
+      return false;
+  },  
+  
+  // returns an interaction object
+  interaction: function( elem, dd ){
+    var offset = $( elem )[ dd.relative ? "position" : "offset" ]() || { top:0, left:0 };
+    return {
+      drag: elem, 
+      callback: new drag.callback(), 
+      droppable: [],
+      offset: offset
+    };
+  },
+  
+  // handle drag-releatd DOM events
+  handler: function( event ){ 
+    // read the data before hijacking anything
+    var dd = event.data;  
+    // handle various events
+    switch ( event.type ){
+      // mousemove, check distance, start dragging
+      case !dd.dragging && 'touchmove': 
+        event.preventDefault();
+      case !dd.dragging && 'mousemove':
+        //  drag tolerance, x² + y² = distance²
+        if ( Math.pow(  event.pageX-dd.pageX, 2 ) + Math.pow(  event.pageY-dd.pageY, 2 ) < Math.pow( dd.distance, 2 ) ) 
+          break; // distance tolerance not reached
+        event.target = dd.target; // force target from "mousedown" event (fix distance issue)
+        drag.hijack( event, "dragstart", dd ); // trigger "dragstart"
+        if ( dd.propagates ) // "dragstart" not rejected
+          dd.dragging = true; // activate interaction
+      // mousemove, dragging
+      case 'touchmove':
+        event.preventDefault();
+      case 'mousemove':
+        if ( dd.dragging ){
+          // trigger "drag"    
+          drag.hijack( event, "drag", dd );
+          if ( dd.propagates ){
+            // manage drop events
+            if ( dd.drop !== false && $special.drop )
+              $special.drop.handler( event, dd ); // "dropstart", "dropend"              
+            break; // "drag" not rejected, stop    
+          }
+          event.type = "mouseup"; // helps "drop" handler behave
+        }
+      // mouseup, stop dragging
+      case 'touchend': 
+      case 'mouseup': 
+      default:
+        if ( drag.touched )
+          $event.remove( drag.touched, "touchmove touchend", drag.handler ); // remove touch events
+        else 
+          $event.remove( document, "mousemove mouseup", drag.handler ); // remove page events  
+        if ( dd.dragging ){
+          if ( dd.drop !== false && $special.drop )
+            $special.drop.handler( event, dd ); // "drop"
+          drag.hijack( event, "dragend", dd ); // trigger "dragend"  
+        }
+        drag.textselect( true ); // enable text selection
+        // if suppressing click events...
+        if ( dd.click === false && dd.dragging )
+          $.data( dd.mousedown, "suppress.click", new Date().getTime() + 5 );
+        dd.dragging = drag.touched = false; // deactivate element  
+        break;
+    }
+  },
+    
+  // re-use event object for custom events
+  hijack: function( event, type, dd, x, elem ){
+    // not configured
+    if ( !dd ) 
+      return;
+    // remember the original event and type
+    var orig = { event:event.originalEvent, type:event.type },
+    // is the event drag related or drog related?
+    mode = type.indexOf("drop") ? "drag" : "drop",
+    // iteration vars
+    result, i = x || 0, ia, $elems, callback,
+    len = !isNaN( x ) ? x : dd.interactions.length;
+    // modify the event type
+    event.type = type;
+    // remove the original event
+    event.originalEvent = null;
+    // initialize the results
+    dd.results = [];
+    // handle each interacted element
+    do if ( ia = dd.interactions[ i ] ){
+      // validate the interaction
+      if ( type !== "dragend" && ia.cancelled )
+        continue;
+      // set the dragdrop properties on the event object
+      callback = drag.properties( event, dd, ia );
+      // prepare for more results
+      ia.results = [];
+      // handle each element
+      $( elem || ia[ mode ] || dd.droppable ).each(function( p, subject ){
+        // identify drag or drop targets individually
+        callback.target = subject;
+        // force propagtion of the custom event
+        event.isPropagationStopped = function(){ return false; };
+        // handle the event  
+        result = subject ? $event.dispatch.call( subject, event, callback ) : null;
+        // stop the drag interaction for this element
+        if ( result === false ){
+          if ( mode == "drag" ){
+            ia.cancelled = true;
+            dd.propagates -= 1;
+          }
+          if ( type == "drop" ){
+            ia[ mode ][p] = null;
+          }
+        }
+        // assign any dropinit elements
+        else if ( type == "dropinit" )
+          ia.droppable.push( drag.element( result ) || subject );
+        // accept a returned proxy element 
+        if ( type == "dragstart" )
+          ia.proxy = $( drag.element( result ) || ia.drag )[0];
+        // remember this result  
+        ia.results.push( result );
+        // forget the event result, for recycling
+        delete event.result;
+        // break on cancelled handler
+        if ( type !== "dropinit" )
+          return result;
+      });  
+      // flatten the results  
+      dd.results[ i ] = drag.flatten( ia.results );  
+      // accept a set of valid drop targets
+      if ( type == "dropinit" )
+        ia.droppable = drag.flatten( ia.droppable );
+      // locate drop targets
+      if ( type == "dragstart" && !ia.cancelled )
+        callback.update(); 
+    }
+    while ( ++i < len )
+    // restore the original event & type
+    event.type = orig.type;
+    event.originalEvent = orig.event;
+    // return all handler results
+    return drag.flatten( dd.results );
+  },
+    
+  // extend the callback object with drag/drop properties...
+  properties: function( event, dd, ia ){    
+    var obj = ia.callback;
+    // elements
+    obj.drag = ia.drag;
+    obj.proxy = ia.proxy || ia.drag;
+    // starting mouse position
+    obj.startX = dd.pageX;
+    obj.startY = dd.pageY;
+    // current distance dragged
+    obj.deltaX = event.pageX - dd.pageX;
+    obj.deltaY = event.pageY - dd.pageY;
+    // original element position
+    obj.originalX = ia.offset.left;
+    obj.originalY = ia.offset.top;
+    // adjusted element position
+    obj.offsetX = obj.originalX + obj.deltaX; 
+    obj.offsetY = obj.originalY + obj.deltaY;
+    // assign the drop targets information
+    obj.drop = drag.flatten( ( ia.drop || [] ).slice() );
+    obj.available = drag.flatten( ( ia.droppable || [] ).slice() );
+    return obj;  
+  },
+  
+  // determine is the argument is an element or jquery instance
+  element: function( arg ){
+    if ( arg && ( arg.jquery || arg.nodeType == 1 ) )
+      return arg;
+  },
+  
+  // flatten nested jquery objects and arrays into a single dimension array
+  flatten: function( arr ){
+    return $.map( arr, function( member ){
+      return member && member.jquery ? $.makeArray( member ) : 
+        member && member.length ? drag.flatten( member ) : member;
+    });
+  },
+  
+  // toggles text selection attributes ON (true) or OFF (false)
+  textselect: function( bool ){ 
+    $( document )[ bool ? "unbind" : "bind" ]("selectstart", drag.dontstart )
+      .css("MozUserSelect", bool ? "" : "none" );
+    // .attr("unselectable", bool ? "off" : "on" )
+    document.unselectable = bool ? "off" : "on"; 
+  },
+  
+  // suppress "selectstart" and "ondragstart" events
+  dontstart: function(){ 
+    return false; 
+  },
+  
+  // a callback instance contructor
+  callback: function(){}
+  
+};
+
+// callback methods
+drag.callback.prototype = {
+  update: function(){
+    if ( $special.drop && this.available.length )
+      $.each( this.available, function( i ){
+        $special.drop.locate( this, i );
+      });
+  }
+};
+
+// patch $.event.$dispatch to allow suppressing clicks
+var $dispatch = $event.dispatch;
+$event.dispatch = function( event ){
+  if ( $.data( this, "suppress."+ event.type ) - new Date().getTime() > 0 ){
+    $.removeData( this, "suppress."+ event.type );
+    return;
+  }
+  return $dispatch.apply( this, arguments );
+};
+
+// event fix hooks for touch events...
+var touchHooks = 
+$event.fixHooks.touchstart = 
+$event.fixHooks.touchmove = 
+$event.fixHooks.touchend =
+$event.fixHooks.touchcancel = {
+  props: "clientX clientY pageX pageY screenX screenY".split( " " ),
+  filter: function( event, orig ) {
+    if ( orig ){
+      var touched = ( orig.touches && orig.touches[0] )
+        || ( orig.changedTouches && orig.changedTouches[0] )
+        || null; 
+      // iOS webkit: touchstart, touchmove, touchend
+      if ( touched ) 
+        $.each( touchHooks.props, function( i, prop ){
+          event[ prop ] = touched[ prop ];
+        });
+    }
+    return event;
+  }
+};
+
+// share the same special event configuration with related events...
+$special.draginit = $special.dragstart = $special.dragend = drag;
+
+})( jQuery );
\ No newline at end of file
diff --git a/app/assets/javascripts/vendor/jquery.fileupload-process.js b/app/assets/javascripts/vendor/jquery.fileupload-process.js
new file mode 100755
index 0000000..87042c3
--- /dev/null
+++ b/app/assets/javascripts/vendor/jquery.fileupload-process.js
@@ -0,0 +1,164 @@
+/*
+ * jQuery File Upload Processing Plugin 1.2.2
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2012, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+/*jslint nomen: true, unparam: true */
+/*global define, window */
+
+(function (factory) {
+    'use strict';
+    if (typeof define === 'function' && define.amd) {
+        // Register as an anonymous AMD module:
+        define([
+            'jquery',
+            './jquery.fileupload'
+        ], factory);
+    } else {
+        // Browser globals:
+        factory(
+            window.jQuery
+        );
+    }
+}(function ($) {
+    'use strict';
+
+    var originalAdd = $.blueimp.fileupload.prototype.options.add;
+
+    // The File Upload Processing plugin extends the fileupload widget
+    // with file processing functionality:
+    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
+
+        options: {
+            // The list of processing actions:
+            processQueue: [
+                /*
+                {
+                    action: 'log',
+                    type: 'debug'
+                }
+                */
+            ],
+            add: function (e, data) {
+                var $this = $(this);
+                data.process(function () {
+                    return $this.fileupload('process', data);
+                });
+                originalAdd.call(this, e, data);
+            }
+        },
+
+        processActions: {
+            /*
+            log: function (data, options) {
+                console[options.type](
+                    'Processing "' + data.files[data.index].name + '"'
+                );
+            }
+            */
+        },
+
+        _processFile: function (data) {
+            var that = this,
+                dfd = $.Deferred().resolveWith(that, [data]),
+                chain = dfd.promise();
+            this._trigger('process', null, data);
+            $.each(data.processQueue, function (i, settings) {
+                var func = function (data) {
+                    return that.processActions[settings.action].call(
+                        that,
+                        data,
+                        settings
+                    );
+                };
+                chain = chain.pipe(func, settings.always && func);
+            });
+            chain
+                .done(function () {
+                    that._trigger('processdone', null, data);
+                    that._trigger('processalways', null, data);
+                })
+                .fail(function () {
+                    that._trigger('processfail', null, data);
+                    that._trigger('processalways', null, data);
+                });
+            return chain;
+        },
+
+        // Replaces the settings of each processQueue item that
+        // are strings starting with an "@", using the remaining
+        // substring as key for the option map,
+        // e.g. "@autoUpload" is replaced with options.autoUpload:
+        _transformProcessQueue: function (options) {
+            var processQueue = [];
+            $.each(options.processQueue, function () {
+                var settings = {},
+                    action = this.action,
+                    prefix = this.prefix === true ? action : this.prefix;
+                $.each(this, function (key, value) {
+                    if ($.type(value) === 'string' &&
+                            value.charAt(0) === '@') {
+                        settings[key] = options[
+                            value.slice(1) || (prefix ? prefix +
+                                key.charAt(0).toUpperCase() + key.slice(1) : key)
+                        ];
+                    } else {
+                        settings[key] = value;
+                    }
+
+                });
+                processQueue.push(settings);
+            });
+            options.processQueue = processQueue;
+        },
+
+        // Returns the number of files currently in the processsing queue:
+        processing: function () {
+            return this._processing;
+        },
+
+        // Processes the files given as files property of the data parameter,
+        // returns a Promise object that allows to bind callbacks:
+        process: function (data) {
+            var that = this,
+                options = $.extend({}, this.options, data);
+            if (options.processQueue && options.processQueue.length) {
+                this._transformProcessQueue(options);
+                if (this._processing === 0) {
+                    this._trigger('processstart');
+                }
+                $.each(data.files, function (index) {
+                    var opts = index ? $.extend({}, options) : options,
+                        func = function () {
+                            return that._processFile(opts);
+                        };
+                    opts.index = index;
+                    that._processing += 1;
+                    that._processingQueue = that._processingQueue.pipe(func, func)
+                        .always(function () {
+                            that._processing -= 1;
+                            if (that._processing === 0) {
+                                that._trigger('processstop');
+                            }
+                        });
+                });
+            }
+            return this._processingQueue;
+        },
+
+        _create: function () {
+            this._super();
+            this._processing = 0;
+            this._processingQueue = $.Deferred().resolveWith(this)
+                .promise();
+        }
+
+    });
+
+}));
diff --git a/app/assets/javascripts/vendor/jquery.fileupload-ui.js b/app/assets/javascripts/vendor/jquery.fileupload-ui.js
new file mode 100755
index 0000000..fb3f13a
--- /dev/null
+++ b/app/assets/javascripts/vendor/jquery.fileupload-ui.js
@@ -0,0 +1,638 @@
+/*
+ * jQuery File Upload User Interface Plugin 8.3
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2010, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+/*jslint nomen: true, unparam: true, regexp: true */
+/*global define, window, URL, webkitURL, FileReader */
+
+(function (factory) {
+    'use strict';
+    if (typeof define === 'function' && define.amd) {
+        // Register as an anonymous AMD module:
+        define([
+            'jquery',
+            'tmpl',
+            './jquery.fileupload-image',
+            './jquery.fileupload-audio',
+            './jquery.fileupload-video',
+            './jquery.fileupload-validate'
+        ], factory);
+    } else {
+        // Browser globals:
+        factory(
+            window.jQuery,
+            window.tmpl
+        );
+    }
+}(function ($, tmpl, loadImage) {
+    'use strict';
+
+    $.blueimp.fileupload.prototype._specialOptions.push(
+        'filesContainer',
+        'uploadTemplateId',
+        'downloadTemplateId'
+    );
+
+    // The UI version extends the file upload widget
+    // and adds complete user interface interaction:
+    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
+
+        options: {
+            // By default, files added to the widget are uploaded as soon
+            // as the user clicks on the start buttons. To enable automatic
+            // uploads, set the following option to true:
+            autoUpload: false,
+            // The ID of the upload template:
+            uploadTemplateId: 'template-upload',
+            // The ID of the download template:
+            downloadTemplateId: 'template-download',
+            // The container for the list of files. If undefined, it is set to
+            // an element with class "files" inside of the widget element:
+            filesContainer: undefined,
+            // By default, files are appended to the files container.
+            // Set the following option to true, to prepend files instead:
+            prependFiles: false,
+            // The expected data type of the upload response, sets the dataType
+            // option of the $.ajax upload requests:
+            dataType: 'json',
+
+            // Function returning the current number of files,
+            // used by the maxNumberOfFiles validation:
+            getNumberOfFiles: function () {
+                return this.filesContainer.children().length;
+            },
+
+            // Callback to retrieve the list of files from the server response:
+            getFilesFromResponse: function (data) {
+                if (data.result && $.isArray(data.result.files)) {
+                    return data.result.files;
+                }
+                return [];
+            },
+
+            // The add callback is invoked as soon as files are added to the fileupload
+            // widget (via file input selection, drag & drop or add API call).
+            // See the basic file upload widget for more information:
+            add: function (e, data) {
+                var $this = $(this),
+                    that = $this.data('blueimp-fileupload') ||
+                        $this.data('fileupload'),
+                    options = that.options,
+                    files = data.files;
+                data.process(function () {
+                    return $this.fileupload('process', data);
+                }).always(function () {
+                    data.context = that._renderUpload(files).data('data', data);
+                    that._renderPreviews(data);
+                    options.filesContainer[
+                        options.prependFiles ? 'prepend' : 'append'
+                    ](data.context);
+                    that._forceReflow(data.context);
+                    that._transition(data.context).done(
+                        function () {
+                            if ((that._trigger('added', e, data) !== false) &&
+                                    (options.autoUpload || data.autoUpload) &&
+                                    data.autoUpload !== false && !data.files.error) {
+                                data.submit();
+                            }
+                        }
+                    );
+                });
+            },
+            // Callback for the start of each file upload request:
+            send: function (e, data) {
+                var that = $(this).data('blueimp-fileupload') ||
+                        $(this).data('fileupload');
+                if (data.context && data.dataType &&
+                        data.dataType.substr(0, 6) === 'iframe') {
+                    // Iframe Transport does not support progress events.
+                    // In lack of an indeterminate progress bar, we set
+                    // the progress to 100%, showing the full animated bar:
+                    data.context
+                        .find('.progress').addClass(
+                            !$.support.transition && 'progress-animated'
+                        )
+                        .attr('aria-valuenow', 100)
+                        .find('.bar').css(
+                            'width',
+                            '100%'
+                        );
+                }
+                return that._trigger('sent', e, data);
+            },
+            // Callback for successful uploads:
+            done: function (e, data) {
+                var that = $(this).data('blueimp-fileupload') ||
+                        $(this).data('fileupload'),
+                    getFilesFromResponse = data.getFilesFromResponse ||
+                        that.options.getFilesFromResponse,
+                    files = getFilesFromResponse(data),
+                    template,
+                    deferred;
+                if (data.context) {
+                    data.context.each(function (index) {
+                        var file = files[index] ||
+                                {error: 'Empty file upload result'},
+                            deferred = that._addFinishedDeferreds();
+                        that._transition($(this)).done(
+                            function () {
+                                var node = $(this);
+                                template = that._renderDownload([file])
+                                    .replaceAll(node);
+                                that._forceReflow(template);
+                                that._transition(template).done(
+                                    function () {
+                                        data.context = $(this);
+                                        that._trigger('completed', e, data);
+                                        that._trigger('finished', e, data);
+                                        deferred.resolve();
+                                    }
+                                );
+                            }
+                        );
+                    });
+                } else {
+                    template = that._renderDownload(files)
+                        .appendTo(that.options.filesContainer);
+                    that._forceReflow(template);
+                    deferred = that._addFinishedDeferreds();
+                    that._transition(template).done(
+                        function () {
+                            data.context = $(this);
+                            that._trigger('completed', e, data);
+                            that._trigger('finished', e, data);
+                            deferred.resolve();
+                        }
+                    );
+                }
+            },
+            // Callback for failed (abort or error) uploads:
+            fail: function (e, data) {
+                var that = $(this).data('blueimp-fileupload') ||
+                        $(this).data('fileupload'),
+                    template,
+                    deferred;
+                if (data.context) {
+                    data.context.each(function (index) {
+                        if (data.errorThrown !== 'abort') {
+                            var file = data.files[index];
+                            file.error = file.error || data.errorThrown ||
+                                true;
+                            deferred = that._addFinishedDeferreds();
+                            that._transition($(this)).done(
+                                function () {
+                                    var node = $(this);
+                                    template = that._renderDownload([file])
+                                        .replaceAll(node);
+                                    that._forceReflow(template);
+                                    that._transition(template).done(
+                                        function () {
+                                            data.context = $(this);
+                                            that._trigger('failed', e, data);
+                                            that._trigger('finished', e, data);
+                                            deferred.resolve();
+                                        }
+                                    );
+                                }
+                            );
+                        } else {
+                            deferred = that._addFinishedDeferreds();
+                            that._transition($(this)).done(
+                                function () {
+                                    $(this).remove();
+                                    that._trigger('failed', e, data);
+                                    that._trigger('finished', e, data);
+                                    deferred.resolve();
+                                }
+                            );
+                        }
+                    });
+                } else if (data.errorThrown !== 'abort') {
+                    data.context = that._renderUpload(data.files)
+                        .appendTo(that.options.filesContainer)
+                        .data('data', data);
+                    that._forceReflow(data.context);
+                    deferred = that._addFinishedDeferreds();
+                    that._transition(data.context).done(
+                        function () {
+                            data.context = $(this);
+                            that._trigger('failed', e, data);
+                            that._trigger('finished', e, data);
+                            deferred.resolve();
+                        }
+                    );
+                } else {
+                    that._trigger('failed', e, data);
+                    that._trigger('finished', e, data);
+                    that._addFinishedDeferreds().resolve();
+                }
+            },
+            // Callback for upload progress events:
+            progress: function (e, data) {
+                if (data.context) {
+                    var progress = Math.floor(data.loaded / data.total * 100);
+                    data.context.find('.progress')
+                        .attr('aria-valuenow', progress)
+                        .find('.bar').css(
+                            'width',
+                            progress + '%'
+                        );
+                }
+            },
+            // Callback for global upload progress events:
+            progressall: function (e, data) {
+                var $this = $(this),
+                    progress = Math.floor(data.loaded / data.total * 100),
+                    globalProgressNode = $this.find('.fileupload-progress'),
+                    extendedProgressNode = globalProgressNode
+                        .find('.progress-extended');
+                if (extendedProgressNode.length) {
+                    extendedProgressNode.html(
+                        ($this.data('blueimp-fileupload') || $this.data('fileupload'))
+                            ._renderExtendedProgress(data)
+                    );
+                }
+                globalProgressNode
+                    .find('.progress')
+                    .attr('aria-valuenow', progress)
+                    .find('.bar').css(
+                        'width',
+                        progress + '%'
+                    );
+            },
+            // Callback for uploads start, equivalent to the global ajaxStart event:
+            start: function (e) {
+                var that = $(this).data('blueimp-fileupload') ||
+                        $(this).data('fileupload');
+                that._resetFinishedDeferreds();
+                that._transition($(this).find('.fileupload-progress')).done(
+                    function () {
+                        that._trigger('started', e);
+                    }
+                );
+            },
+            // Callback for uploads stop, equivalent to the global ajaxStop event:
+            stop: function (e) {
+                var that = $(this).data('blueimp-fileupload') ||
+                        $(this).data('fileupload'),
+                    deferred = that._addFinishedDeferreds();
+                $.when.apply($, that._getFinishedDeferreds())
+                    .done(function () {
+                        that._trigger('stopped', e);
+                    });
+                that._transition($(this).find('.fileupload-progress')).done(
+                    function () {
+                        $(this).find('.progress')
+                            .attr('aria-valuenow', '0')
+                            .find('.bar').css('width', '0%');
+                        $(this).find('.progress-extended').html('&nbsp;');
+                        deferred.resolve();
+                    }
+                );
+            },
+            processstart: function () {
+                $(this).addClass('fileupload-processing');
+            },
+            processstop: function () {
+                $(this).removeClass('fileupload-processing');
+            },
+            // Callback for file deletion:
+            destroy: function (e, data) {
+                var that = $(this).data('blueimp-fileupload') ||
+                        $(this).data('fileupload'),
+                    removeNode = function () {
+                        that._transition(data.context).done(
+                            function () {
+                                $(this).remove();
+                                that._trigger('destroyed', e, data);
+                            }
+                        );
+                    };
+                if (data.url) {
+                    $.ajax(data).done(removeNode);
+                } else {
+                    removeNode();
+                }
+            }
+        },
+
+        _resetFinishedDeferreds: function () {
+            this._finishedUploads = [];
+        },
+
+        _addFinishedDeferreds: function (deferred) {
+            if (!deferred) {
+                deferred = $.Deferred();
+            }
+            this._finishedUploads.push(deferred);
+            return deferred;
+        },
+
+        _getFinishedDeferreds: function () {
+            return this._finishedUploads;
+        },
+
+        // Link handler, that allows to download files
+        // by drag & drop of the links to the desktop:
+        _enableDragToDesktop: function () {
+            var link = $(this),
+                url = link.prop('href'),
+                name = link.prop('download'),
+                type = 'application/octet-stream';
+            link.bind('dragstart', function (e) {
+                try {
+                    e.originalEvent.dataTransfer.setData(
+                        'DownloadURL',
+                        [type, name, url].join(':')
+                    );
+                } catch (ignore) {}
+            });
+        },
+
+        _formatFileSize: function (bytes) {
+            if (typeof bytes !== 'number') {
+                return '';
+            }
+            if (bytes >= 1000000000) {
+                return (bytes / 1000000000).toFixed(2) + ' GB';
+            }
+            if (bytes >= 1000000) {
+                return (bytes / 1000000).toFixed(2) + ' MB';
+            }
+            return (bytes / 1000).toFixed(2) + ' KB';
+        },
+
+        _formatBitrate: function (bits) {
+            if (typeof bits !== 'number') {
+                return '';
+            }
+            if (bits >= 1000000000) {
+                return (bits / 1000000000).toFixed(2) + ' Gbit/s';
+            }
+            if (bits >= 1000000) {
+                return (bits / 1000000).toFixed(2) + ' Mbit/s';
+            }
+            if (bits >= 1000) {
+                return (bits / 1000).toFixed(2) + ' kbit/s';
+            }
+            return bits.toFixed(2) + ' bit/s';
+        },
+
+        _formatTime: function (seconds) {
+            var date = new Date(seconds * 1000),
+                days = Math.floor(seconds / 86400);
+            days = days ? days + 'd ' : '';
+            return days +
+                ('0' + date.getUTCHours()).slice(-2) + ':' +
+                ('0' + date.getUTCMinutes()).slice(-2) + ':' +
+                ('0' + date.getUTCSeconds()).slice(-2);
+        },
+
+        _formatPercentage: function (floatValue) {
+            return (floatValue * 100).toFixed(2) + ' %';
+        },
+
+        _renderExtendedProgress: function (data) {
+            return this._formatBitrate(data.bitrate) + ' | ' +
+                this._formatTime(
+                    (data.total - data.loaded) * 8 / data.bitrate
+                ) + ' | ' +
+                this._formatPercentage(
+                    data.loaded / data.total
+                ) + ' | ' +
+                this._formatFileSize(data.loaded) + ' / ' +
+                this._formatFileSize(data.total);
+        },
+
+        _renderTemplate: function (func, files) {
+            if (!func) {
+                return $();
+            }
+            var result = func({
+                files: files,
+                formatFileSize: this._formatFileSize,
+                options: this.options
+            });
+            if (result instanceof $) {
+                return result;
+            }
+            return $(this.options.templatesContainer).html(result).children();
+        },
+
+        _renderPreviews: function (data) {
+            data.context.find('.preview').each(function (index, elm) {
+                $(elm).append(data.files[index].preview);
+            });
+        },
+
+        _renderUpload: function (files) {
+            return this._renderTemplate(
+                this.options.uploadTemplate,
+                files
+            );
+        },
+
+        _renderDownload: function (files) {
+            return this._renderTemplate(
+                this.options.downloadTemplate,
+                files
+            ).find('a[download]').each(this._enableDragToDesktop).end();
+        },
+
+        _startHandler: function (e) {
+            e.preventDefault();
+            var button = $(e.currentTarget),
+                template = button.closest('.template-upload'),
+                data = template.data('data');
+            if (data && data.submit && !data.jqXHR && data.submit()) {
+                button.prop('disabled', true);
+            }
+        },
+
+        _cancelHandler: function (e) {
+            e.preventDefault();
+            var template = $(e.currentTarget).closest('.template-upload'),
+                data = template.data('data') || {};
+            if (!data.jqXHR) {
+                data.errorThrown = 'abort';
+                this._trigger('fail', e, data);
+            } else {
+                data.jqXHR.abort();
+            }
+        },
+
+        _deleteHandler: function (e) {
+            e.preventDefault();
+            var button = $(e.currentTarget);
+            this._trigger('destroy', e, $.extend({
+                context: button.closest('.template-download'),
+                type: 'DELETE'
+            }, button.data()));
+        },
+
+        _forceReflow: function (node) {
+            return $.support.transition && node.length &&
+                node[0].offsetWidth;
+        },
+
+        _transition: function (node) {
+            var dfd = $.Deferred();
+            if ($.support.transition && node.hasClass('fade') && node.is(':visible')) {
+                node.bind(
+                    $.support.transition.end,
+                    function (e) {
+                        // Make sure we don't respond to other transitions events
+                        // in the container element, e.g. from button elements:
+                        if (e.target === node[0]) {
+                            node.unbind($.support.transition.end);
+                            dfd.resolveWith(node);
+                        }
+                    }
+                ).toggleClass('in');
+            } else {
+                node.toggleClass('in');
+                dfd.resolveWith(node);
+            }
+            return dfd;
+        },
+
+        _initButtonBarEventHandlers: function () {
+            var fileUploadButtonBar = this.element.find('.fileupload-buttonbar'),
+                filesList = this.options.filesContainer;
+            this._on(fileUploadButtonBar.find('.start'), {
+                click: function (e) {
+                    e.preventDefault();
+                    filesList.find('.start').click();
+                }
+            });
+            this._on(fileUploadButtonBar.find('.cancel'), {
+                click: function (e) {
+                    e.preventDefault();
+                    filesList.find('.cancel').click();
+                }
+            });
+            this._on(fileUploadButtonBar.find('.delete'), {
+                click: function (e) {
+                    e.preventDefault();
+                    filesList.find('.toggle:checked')
+                        .closest('.template-download')
+                        .find('.delete').click();
+                    fileUploadButtonBar.find('.toggle')
+                        .prop('checked', false);
+                }
+            });
+            this._on(fileUploadButtonBar.find('.toggle'), {
+                change: function (e) {
+                    filesList.find('.toggle').prop(
+                        'checked',
+                        $(e.currentTarget).is(':checked')
+                    );
+                }
+            });
+        },
+
+        _destroyButtonBarEventHandlers: function () {
+            this._off(
+                this.element.find('.fileupload-buttonbar')
+                    .find('.start, .cancel, .delete'),
+                'click'
+            );
+            this._off(
+                this.element.find('.fileupload-buttonbar .toggle'),
+                'change.'
+            );
+        },
+
+        _initEventHandlers: function () {
+            this._super();
+            this._on(this.options.filesContainer, {
+                'click .start': this._startHandler,
+                'click .cancel': this._cancelHandler,
+                'click .delete': this._deleteHandler
+            });
+            this._initButtonBarEventHandlers();
+        },
+
+        _destroyEventHandlers: function () {
+            this._destroyButtonBarEventHandlers();
+            this._off(this.options.filesContainer, 'click');
+            this._super();
+        },
+
+        _enableFileInputButton: function () {
+            this.element.find('.fileinput-button input')
+                .prop('disabled', false)
+                .parent().removeClass('disabled');
+        },
+
+        _disableFileInputButton: function () {
+            this.element.find('.fileinput-button input')
+                .prop('disabled', true)
+                .parent().addClass('disabled');
+        },
+
+        _initTemplates: function () {
+            var options = this.options;
+            options.templatesContainer = this.document[0].createElement(
+                options.filesContainer.prop('nodeName')
+            );
+            if (tmpl) {
+                if (options.uploadTemplateId) {
+                    options.uploadTemplate = tmpl(options.uploadTemplateId);
+                }
+                if (options.downloadTemplateId) {
+                    options.downloadTemplate = tmpl(options.downloadTemplateId);
+                }
+            }
+        },
+
+        _initFilesContainer: function () {
+            var options = this.options;
+            if (options.filesContainer === undefined) {
+                options.filesContainer = this.element.find('.files');
+            } else if (!(options.filesContainer instanceof $)) {
+                options.filesContainer = $(options.filesContainer);
+            }
+        },
+
+        _initSpecialOptions: function () {
+            this._super();
+            this._initFilesContainer();
+            this._initTemplates();
+        },
+
+        _create: function () {
+            this._super();
+            this._resetFinishedDeferreds();
+        },
+
+        enable: function () {
+            var wasDisabled = false;
+            if (this.options.disabled) {
+                wasDisabled = true;
+            }
+            this._super();
+            if (wasDisabled) {
+                this.element.find('input, button').prop('disabled', false);
+                this._enableFileInputButton();
+            }
+        },
+
+        disable: function () {
+            if (!this.options.disabled) {
+                this.element.find('input, button').prop('disabled', true);
+                this._disableFileInputButton();
+            }
+            this._super();
+        }
+
+    });
+
+}));
diff --git a/app/assets/javascripts/vendor/jquery.fileupload.js b/app/assets/javascripts/vendor/jquery.fileupload.js
new file mode 100755
index 0000000..921f5ae
--- /dev/null
+++ b/app/assets/javascripts/vendor/jquery.fileupload.js
@@ -0,0 +1,1315 @@
+/*
+ * jQuery File Upload Plugin 5.31.6
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2010, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+/*jslint nomen: true, unparam: true, regexp: true */
+/*global define, window, document, location, File, Blob, FormData */
+
+(function (factory) {
+    'use strict';
+    if (typeof define === 'function' && define.amd) {
+        // Register as an anonymous AMD module:
+        define([
+            'jquery',
+            'jquery.ui.widget'
+        ], factory);
+    } else {
+        // Browser globals:
+        factory(window.jQuery);
+    }
+}(function ($) {
+    'use strict';
+
+    // The FileReader API is not actually used, but works as feature detection,
+    // as e.g. Safari supports XHR file uploads via the FormData API,
+    // but not non-multipart XHR file uploads:
+    $.support.xhrFileUpload = !!(window.XMLHttpRequestUpload && window.FileReader);
+    $.support.xhrFormDataFileUpload = !!window.FormData;
+
+    // Detect support for Blob slicing (required for chunked uploads):
+    $.support.blobSlice = window.Blob && (Blob.prototype.slice ||
+        Blob.prototype.webkitSlice || Blob.prototype.mozSlice);
+
+    // The fileupload widget listens for change events on file input fields defined
+    // via fileInput setting and paste or drop events of the given dropZone.
+    // In addition to the default jQuery Widget methods, the fileupload widget
+    // exposes the "add" and "send" methods, to add or directly send files using
+    // the fileupload API.
+    // By default, files added via file input selection, paste, drag & drop or
+    // "add" method are uploaded immediately, but it is possible to override
+    // the "add" callback option to queue file uploads.
+    $.widget('blueimp.fileupload', {
+
+        options: {
+            // The drop target element(s), by the default the complete document.
+            // Set to null to disable drag & drop support:
+            dropZone: $(document),
+            // The paste target element(s), by the default the complete document.
+            // Set to null to disable paste support:
+            pasteZone: $(document),
+            // The file input field(s), that are listened to for change events.
+            // If undefined, it is set to the file input fields inside
+            // of the widget element on plugin initialization.
+            // Set to null to disable the change listener.
+            fileInput: undefined,
+            // By default, the file input field is replaced with a clone after
+            // each input field change event. This is required for iframe transport
+            // queues and allows change events to be fired for the same file
+            // selection, but can be disabled by setting the following option to false:
+            replaceFileInput: true,
+            // The parameter name for the file form data (the request argument name).
+            // If undefined or empty, the name property of the file input field is
+            // used, or "files[]" if the file input name property is also empty,
+            // can be a string or an array of strings:
+            paramName: undefined,
+            // By default, each file of a selection is uploaded using an individual
+            // request for XHR type uploads. Set to false to upload file
+            // selections in one request each:
+            singleFileUploads: true,
+            // To limit the number of files uploaded with one XHR request,
+            // set the following option to an integer greater than 0:
+            limitMultiFileUploads: undefined,
+            // Set the following option to true to issue all file upload requests
+            // in a sequential order:
+            sequentialUploads: false,
+            // To limit the number of concurrent uploads,
+            // set the following option to an integer greater than 0:
+            limitConcurrentUploads: undefined,
+            // Set the following option to true to force iframe transport uploads:
+            forceIframeTransport: false,
+            // Set the following option to the location of a redirect url on the
+            // origin server, for cross-domain iframe transport uploads:
+            redirect: undefined,
+            // The parameter name for the redirect url, sent as part of the form
+            // data and set to 'redirect' if this option is empty:
+            redirectParamName: undefined,
+            // Set the following option to the location of a postMessage window,
+            // to enable postMessage transport uploads:
+            postMessage: undefined,
+            // By default, XHR file uploads are sent as multipart/form-data.
+            // The iframe transport is always using multipart/form-data.
+            // Set to false to enable non-multipart XHR uploads:
+            multipart: true,
+            // To upload large files in smaller chunks, set the following option
+            // to a preferred maximum chunk size. If set to 0, null or undefined,
+            // or the browser does not support the required Blob API, files will
+            // be uploaded as a whole.
+            maxChunkSize: undefined,
+            // When a non-multipart upload or a chunked multipart upload has been
+            // aborted, this option can be used to resume the upload by setting
+            // it to the size of the already uploaded bytes. This option is most
+            // useful when modifying the options object inside of the "add" or
+            // "send" callbacks, as the options are cloned for each file upload.
+            uploadedBytes: undefined,
+            // By default, failed (abort or error) file uploads are removed from the
+            // global progress calculation. Set the following option to false to
+            // prevent recalculating the global progress data:
+            recalculateProgress: true,
+            // Interval in milliseconds to calculate and trigger progress events:
+            progressInterval: 100,
+            // Interval in milliseconds to calculate progress bitrate:
+            bitrateInterval: 500,
+            // By default, uploads are started automatically when adding files:
+            autoUpload: true,
+
+            // Error and info messages:
+            messages: {
+                uploadedBytes: 'Uploaded bytes exceed file size'
+            },
+
+            // Translation function, gets the message key to be translated
+            // and an object with context specific data as arguments:
+            i18n: function (message, context) {
+                message = this.messages[message] || message.toString();
+                if (context) {
+                    $.each(context, function (key, value) {
+                        message = message.replace('{' + key + '}', value);
+                    });
+                }
+                return message;
+            },
+
+            // Additional form data to be sent along with the file uploads can be set
+            // using this option, which accepts an array of objects with name and
+            // value properties, a function returning such an array, a FormData
+            // object (for XHR file uploads), or a simple object.
+            // The form of the first fileInput is given as parameter to the function:
+            formData: function (form) {
+                return form.serializeArray();
+            },
+
+            // The add callback is invoked as soon as files are added to the fileupload
+            // widget (via file input selection, drag & drop, paste or add API call).
+            // If the singleFileUploads option is enabled, this callback will be
+            // called once for each file in the selection for XHR file uploads, else
+            // once for each file selection.
+            //
+            // The upload starts when the submit method is invoked on the data parameter.
+            // The data object contains a files property holding the added files
+            // and allows you to override plugin options as well as define ajax settings.
+            //
+            // Listeners for this callback can also be bound the following way:
+            // .bind('fileuploadadd', func);
+            //
+            // data.submit() returns a Promise object and allows to attach additional
+            // handlers using jQuery's Deferred callbacks:
+            // data.submit().done(func).fail(func).always(func);
+            add: function (e, data) {
+                if (data.autoUpload || (data.autoUpload !== false &&
+                        $(this).fileupload('option', 'autoUpload'))) {
+                    data.process().done(function () {
+                        data.submit();
+                    });
+                }
+            },
+
+            // Other callbacks:
+
+            // Callback for the submit event of each file upload:
+            // submit: function (e, data) {}, // .bind('fileuploadsubmit', func);
+
+            // Callback for the start of each file upload request:
+            // send: function (e, data) {}, // .bind('fileuploadsend', func);
+
+            // Callback for successful uploads:
+            // done: function (e, data) {}, // .bind('fileuploaddone', func);
+
+            // Callback for failed (abort or error) uploads:
+            // fail: function (e, data) {}, // .bind('fileuploadfail', func);
+
+            // Callback for completed (success, abort or error) requests:
+            // always: function (e, data) {}, // .bind('fileuploadalways', func);
+
+            // Callback for upload progress events:
+            // progress: function (e, data) {}, // .bind('fileuploadprogress', func);
+
+            // Callback for global upload progress events:
+            // progressall: function (e, data) {}, // .bind('fileuploadprogressall', func);
+
+            // Callback for uploads start, equivalent to the global ajaxStart event:
+            // start: function (e) {}, // .bind('fileuploadstart', func);
+
+            // Callback for uploads stop, equivalent to the global ajaxStop event:
+            // stop: function (e) {}, // .bind('fileuploadstop', func);
+
+            // Callback for change events of the fileInput(s):
+            // change: function (e, data) {}, // .bind('fileuploadchange', func);
+
+            // Callback for paste events to the pasteZone(s):
+            // paste: function (e, data) {}, // .bind('fileuploadpaste', func);
+
+            // Callback for drop events of the dropZone(s):
+            // drop: function (e, data) {}, // .bind('fileuploaddrop', func);
+
+            // Callback for dragover events of the dropZone(s):
+            // dragover: function (e) {}, // .bind('fileuploaddragover', func);
+
+            // Callback for the start of each chunk upload request:
+            // chunksend: function (e, data) {}, // .bind('fileuploadchunksend', func);
+
+            // Callback for successful chunk uploads:
+            // chunkdone: function (e, data) {}, // .bind('fileuploadchunkdone', func);
+
+            // Callback for failed (abort or error) chunk uploads:
+            // chunkfail: function (e, data) {}, // .bind('fileuploadchunkfail', func);
+
+            // Callback for completed (success, abort or error) chunk upload requests:
+            // chunkalways: function (e, data) {}, // .bind('fileuploadchunkalways', func);
+
+            // The plugin options are used as settings object for the ajax calls.
+            // The following are jQuery ajax settings required for the file uploads:
+            processData: false,
+            contentType: false,
+            cache: false
+        },
+
+        // A list of options that require reinitializing event listeners and/or
+        // special initialization code:
+        _specialOptions: [
+            'fileInput',
+            'dropZone',
+            'pasteZone',
+            'multipart',
+            'forceIframeTransport'
+        ],
+
+        _blobSlice: $.support.blobSlice && function () {
+            var slice = this.slice || this.webkitSlice || this.mozSlice;
+            return slice.apply(this, arguments);
+        },
+
+        _BitrateTimer: function () {
+            this.timestamp = ((Date.now) ? Date.now() : (new Date()).getTime());
+            this.loaded = 0;
+            this.bitrate = 0;
+            this.getBitrate = function (now, loaded, interval) {
+                var timeDiff = now - this.timestamp;
+                if (!this.bitrate || !interval || timeDiff > interval) {
+                    this.bitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8;
+                    this.loaded = loaded;
+                    this.timestamp = now;
+                }
+                return this.bitrate;
+            };
+        },
+
+        _isXHRUpload: function (options) {
+            return !options.forceIframeTransport &&
+                ((!options.multipart && $.support.xhrFileUpload) ||
+                $.support.xhrFormDataFileUpload);
+        },
+
+        _getFormData: function (options) {
+            var formData;
+            if (typeof options.formData === 'function') {
+                return options.formData(options.form);
+            }
+            if ($.isArray(options.formData)) {
+                return options.formData;
+            }
+            if ($.type(options.formData) === 'object') {
+                formData = [];
+                $.each(options.formData, function (name, value) {
+                    formData.push({name: name, value: value});
+                });
+                return formData;
+            }
+            return [];
+        },
+
+        _getTotal: function (files) {
+            var total = 0;
+            $.each(files, function (index, file) {
+                total += file.size || 1;
+            });
+            return total;
+        },
+
+        _initProgressObject: function (obj) {
+            var progress = {
+                loaded: 0,
+                total: 0,
+                bitrate: 0
+            };
+            if (obj._progress) {
+                $.extend(obj._progress, progress);
+            } else {
+                obj._progress = progress;
+            }
+        },
+
+        _initResponseObject: function (obj) {
+            var prop;
+            if (obj._response) {
+                for (prop in obj._response) {
+                    if (obj._response.hasOwnProperty(prop)) {
+                        delete obj._response[prop];
+                    }
+                }
+            } else {
+                obj._response = {};
+            }
+        },
+
+        _onProgress: function (e, data) {
+            if (e.lengthComputable) {
+                var now = ((Date.now) ? Date.now() : (new Date()).getTime()),
+                    loaded;
+                if (data._time && data.progressInterval &&
+                        (now - data._time < data.progressInterval) &&
+                        e.loaded !== e.total) {
+                    return;
+                }
+                data._time = now;
+                loaded = Math.floor(
+                    e.loaded / e.total * (data.chunkSize || data._progress.total)
+                ) + (data.uploadedBytes || 0);
+                // Add the difference from the previously loaded state
+                // to the global loaded counter:
+                this._progress.loaded += (loaded - data._progress.loaded);
+                this._progress.bitrate = this._bitrateTimer.getBitrate(
+                    now,
+                    this._progress.loaded,
+                    data.bitrateInterval
+                );
+                data._progress.loaded = data.loaded = loaded;
+                data._progress.bitrate = data.bitrate = data._bitrateTimer.getBitrate(
+                    now,
+                    loaded,
+                    data.bitrateInterval
+                );
+                // Trigger a custom progress event with a total data property set
+                // to the file size(s) of the current upload and a loaded data
+                // property calculated accordingly:
+                this._trigger('progress', e, data);
+                // Trigger a global progress event for all current file uploads,
+                // including ajax calls queued for sequential file uploads:
+                this._trigger('progressall', e, this._progress);
+            }
+        },
+
+        _initProgressListener: function (options) {
+            var that = this,
+                xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
+            // Accesss to the native XHR object is required to add event listeners
+            // for the upload progress event:
+            if (xhr.upload) {
+                $(xhr.upload).bind('progress', function (e) {
+                    var oe = e.originalEvent;
+                    // Make sure the progress event properties get copied over:
+                    e.lengthComputable = oe.lengthComputable;
+                    e.loaded = oe.loaded;
+                    e.total = oe.total;
+                    that._onProgress(e, options);
+                });
+                options.xhr = function () {
+                    return xhr;
+                };
+            }
+        },
+
+        _isInstanceOf: function (type, obj) {
+            // Cross-frame instanceof check
+            return Object.prototype.toString.call(obj) === '[object ' + type + ']';
+        },
+
+        _initXHRData: function (options) {
+            var that = this,
+                formData,
+                file = options.files[0],
+                // Ignore non-multipart setting if not supported:
+                multipart = options.multipart || !$.support.xhrFileUpload,
+                paramName = options.paramName[0];
+            options.headers = options.headers || {};
+            if (options.contentRange) {
+                options.headers['Content-Range'] = options.contentRange;
+            }
+            if (!multipart || options.blob || !this._isInstanceOf('File', file)) {
+                options.headers['Content-Disposition'] = 'attachment; filename="' +
+                    encodeURI(file.name) + '"';
+            }
+            if (!multipart) {
+                options.contentType = file.type;
+                options.data = options.blob || file;
+            } else if ($.support.xhrFormDataFileUpload) {
+                if (options.postMessage) {
+                    // window.postMessage does not allow sending FormData
+                    // objects, so we just add the File/Blob objects to
+                    // the formData array and let the postMessage window
+                    // create the FormData object out of this array:
+                    formData = this._getFormData(options);
+                    if (options.blob) {
+                        formData.push({
+                            name: paramName,
+                            value: options.blob
+                        });
+                    } else {
+                        $.each(options.files, function (index, file) {
+                            formData.push({
+                                name: options.paramName[index] || paramName,
+                                value: file
+                            });
+                        });
+                    }
+                } else {
+                    if (that._isInstanceOf('FormData', options.formData)) {
+                        formData = options.formData;
+                    } else {
+                        formData = new FormData();
+                        $.each(this._getFormData(options), function (index, field) {
+                            formData.append(field.name, field.value);
+                        });
+                    }
+                    if (options.blob) {
+                        formData.append(paramName, options.blob, file.name);
+                    } else {
+                        $.each(options.files, function (index, file) {
+                            // This check allows the tests to run with
+                            // dummy objects:
+                            if (that._isInstanceOf('File', file) ||
+                                    that._isInstanceOf('Blob', file)) {
+                                formData.append(
+                                    options.paramName[index] || paramName,
+                                    file,
+                                    file.name
+                                );
+                            }
+                        });
+                    }
+                }
+                options.data = formData;
+            }
+            // Blob reference is not needed anymore, free memory:
+            options.blob = null;
+        },
+
+        _initIframeSettings: function (options) {
+            var targetHost = $('<a></a>').prop('href', options.url).prop('host');
+            // Setting the dataType to iframe enables the iframe transport:
+            options.dataType = 'iframe ' + (options.dataType || '');
+            // The iframe transport accepts a serialized array as form data:
+            options.formData = this._getFormData(options);
+            // Add redirect url to form data on cross-domain uploads:
+            if (options.redirect && targetHost && targetHost !== location.host) {
+                options.formData.push({
+                    name: options.redirectParamName || 'redirect',
+                    value: options.redirect
+                });
+            }
+        },
+
+        _initDataSettings: function (options) {
+            if (this._isXHRUpload(options)) {
+                if (!this._chunkedUpload(options, true)) {
+                    if (!options.data) {
+                        this._initXHRData(options);
+                    }
+                    this._initProgressListener(options);
+                }
+                if (options.postMessage) {
+                    // Setting the dataType to postmessage enables the
+                    // postMessage transport:
+                    options.dataType = 'postmessage ' + (options.dataType || '');
+                }
+            } else {
+                this._initIframeSettings(options);
+            }
+        },
+
+        _getParamName: function (options) {
+            var fileInput = $(options.fileInput),
+                paramName = options.paramName;
+            if (!paramName) {
+                paramName = [];
+                fileInput.each(function () {
+                    var input = $(this),
+                        name = input.prop('name') || 'files[]',
+                        i = (input.prop('files') || [1]).length;
+                    while (i) {
+                        paramName.push(name);
+                        i -= 1;
+                    }
+                });
+                if (!paramName.length) {
+                    paramName = [fileInput.prop('name') || 'files[]'];
+                }
+            } else if (!$.isArray(paramName)) {
+                paramName = [paramName];
+            }
+            return paramName;
+        },
+
+        _initFormSettings: function (options) {
+            // Retrieve missing options from the input field and the
+            // associated form, if available:
+            if (!options.form || !options.form.length) {
+                options.form = $(options.fileInput.prop('form'));
+                // If the given file input doesn't have an associated form,
+                // use the default widget file input's form:
+                if (!options.form.length) {
+                    options.form = $(this.options.fileInput.prop('form'));
+                }
+            }
+            options.paramName = this._getParamName(options);
+            if (!options.url) {
+                options.url = options.form.prop('action') || location.href;
+            }
+            // The HTTP request method must be "POST" or "PUT":
+            options.type = (options.type || options.form.prop('method') || '')
+                .toUpperCase();
+            if (options.type !== 'POST' && options.type !== 'PUT' &&
+                    options.type !== 'PATCH') {
+                options.type = 'POST';
+            }
+            if (!options.formAcceptCharset) {
+                options.formAcceptCharset = options.form.attr('accept-charset');
+            }
+        },
+
+        _getAJAXSettings: function (data) {
+            var options = $.extend({}, this.options, data);
+            this._initFormSettings(options);
+            this._initDataSettings(options);
+            return options;
+        },
+
+        // jQuery 1.6 doesn't provide .state(),
+        // while jQuery 1.8+ removed .isRejected() and .isResolved():
+        _getDeferredState: function (deferred) {
+            if (deferred.state) {
+                return deferred.state();
+            }
+            if (deferred.isResolved()) {
+                return 'resolved';
+            }
+            if (deferred.isRejected()) {
+                return 'rejected';
+            }
+            return 'pending';
+        },
+
+        // Maps jqXHR callbacks to the equivalent
+        // methods of the given Promise object:
+        _enhancePromise: function (promise) {
+            promise.success = promise.done;
+            promise.error = promise.fail;
+            promise.complete = promise.always;
+            return promise;
+        },
+
+        // Creates and returns a Promise object enhanced with
+        // the jqXHR methods abort, success, error and complete:
+        _getXHRPromise: function (resolveOrReject, context, args) {
+            var dfd = $.Deferred(),
+                promise = dfd.promise();
+            context = context || this.options.context || promise;
+            if (resolveOrReject === true) {
+                dfd.resolveWith(context, args);
+            } else if (resolveOrReject === false) {
+                dfd.rejectWith(context, args);
+            }
+            promise.abort = dfd.promise;
+            return this._enhancePromise(promise);
+        },
+
+        // Adds convenience methods to the data callback argument:
+        _addConvenienceMethods: function (e, data) {
+            var that = this,
+                getPromise = function (data) {
+                    return $.Deferred().resolveWith(that, [data]).promise();
+                };
+            data.process = function (resolveFunc, rejectFunc) {
+                if (resolveFunc || rejectFunc) {
+                    data._processQueue = this._processQueue =
+                        (this._processQueue || getPromise(this))
+                            .pipe(resolveFunc, rejectFunc);
+                }
+                return this._processQueue || getPromise(this);
+            };
+            data.submit = function () {
+                if (this.state() !== 'pending') {
+                    data.jqXHR = this.jqXHR =
+                        (that._trigger('submit', e, this) !== false) &&
+                        that._onSend(e, this);
+                }
+                return this.jqXHR || that._getXHRPromise();
+            };
+            data.abort = function () {
+                if (this.jqXHR) {
+                    return this.jqXHR.abort();
+                }
+                return that._getXHRPromise();
+            };
+            data.state = function () {
+                if (this.jqXHR) {
+                    return that._getDeferredState(this.jqXHR);
+                }
+                if (this._processQueue) {
+                    return that._getDeferredState(this._processQueue);
+                }
+            };
+            data.progress = function () {
+                return this._progress;
+            };
+            data.response = function () {
+                return this._response;
+            };
+        },
+
+        // Parses the Range header from the server response
+        // and returns the uploaded bytes:
+        _getUploadedBytes: function (jqXHR) {
+            var range = jqXHR.getResponseHeader('Range'),
+                parts = range && range.split('-'),
+                upperBytesPos = parts && parts.length > 1 &&
+                    parseInt(parts[1], 10);
+            return upperBytesPos && upperBytesPos + 1;
+        },
+
+        // Uploads a file in multiple, sequential requests
+        // by splitting the file up in multiple blob chunks.
+        // If the second parameter is true, only tests if the file
+        // should be uploaded in chunks, but does not invoke any
+        // upload requests:
+        _chunkedUpload: function (options, testOnly) {
+            options.uploadedBytes = options.uploadedBytes || 0;
+            var that = this,
+                file = options.files[0],
+                fs = file.size,
+                ub = options.uploadedBytes,
+                mcs = options.maxChunkSize || fs,
+                slice = this._blobSlice,
+                dfd = $.Deferred(),
+                promise = dfd.promise(),
+                jqXHR,
+                upload;
+            if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) ||
+                    options.data) {
+                return false;
+            }
+            if (testOnly) {
+                return true;
+            }
+            if (ub >= fs) {
+                file.error = options.i18n('uploadedBytes');
+                return this._getXHRPromise(
+                    false,
+                    options.context,
+                    [null, 'error', file.error]
+                );
+            }
+            // The chunk upload method:
+            upload = function () {
+                // Clone the options object for each chunk upload:
+                var o = $.extend({}, options),
+                    currentLoaded = o._progress.loaded;
+                o.blob = slice.call(
+                    file,
+                    ub,
+                    ub + mcs,
+                    file.type
+                );
+                // Store the current chunk size, as the blob itself
+                // will be dereferenced after data processing:
+                o.chunkSize = o.blob.size;
+                // Expose the chunk bytes position range:
+                o.contentRange = 'bytes ' + ub + '-' +
+                    (ub + o.chunkSize - 1) + '/' + fs;
+                // Process the upload data (the blob and potential form data):
+                that._initXHRData(o);
+                // Add progress listeners for this chunk upload:
+                that._initProgressListener(o);
+                jqXHR = ((that._trigger('chunksend', null, o) !== false && $.ajax(o)) ||
+                        that._getXHRPromise(false, o.context))
+                    .done(function (result, textStatus, jqXHR) {
+                        ub = that._getUploadedBytes(jqXHR) ||
+                            (ub + o.chunkSize);
+                        // Create a progress event if no final progress event
+                        // with loaded equaling total has been triggered
+                        // for this chunk:
+                        if (currentLoaded + o.chunkSize - o._progress.loaded) {
+                            that._onProgress($.Event('progress', {
+                                lengthComputable: true,
+                                loaded: ub - o.uploadedBytes,
+                                total: ub - o.uploadedBytes
+                            }), o);
+                        }
+                        options.uploadedBytes = o.uploadedBytes = ub;
+                        o.result = result;
+                        o.textStatus = textStatus;
+                        o.jqXHR = jqXHR;
+                        that._trigger('chunkdone', null, o);
+                        that._trigger('chunkalways', null, o);
+                        if (ub < fs) {
+                            // File upload not yet complete,
+                            // continue with the next chunk:
+                            upload();
+                        } else {
+                            dfd.resolveWith(
+                                o.context,
+                                [result, textStatus, jqXHR]
+                            );
+                        }
+                    })
+                    .fail(function (jqXHR, textStatus, errorThrown) {
+                        o.jqXHR = jqXHR;
+                        o.textStatus = textStatus;
+                        o.errorThrown = errorThrown;
+                        that._trigger('chunkfail', null, o);
+                        that._trigger('chunkalways', null, o);
+                        dfd.rejectWith(
+                            o.context,
+                            [jqXHR, textStatus, errorThrown]
+                        );
+                    });
+            };
+            this._enhancePromise(promise);
+            promise.abort = function () {
+                return jqXHR.abort();
+            };
+            upload();
+            return promise;
+        },
+
+        _beforeSend: function (e, data) {
+            if (this._active === 0) {
+                // the start callback is triggered when an upload starts
+                // and no other uploads are currently running,
+                // equivalent to the global ajaxStart event:
+                this._trigger('start');
+                // Set timer for global bitrate progress calculation:
+                this._bitrateTimer = new this._BitrateTimer();
+                // Reset the global progress values:
+                this._progress.loaded = this._progress.total = 0;
+                this._progress.bitrate = 0;
+            }
+            // Make sure the container objects for the .response() and
+            // .progress() methods on the data object are available
+            // and reset to their initial state:
+            this._initResponseObject(data);
+            this._initProgressObject(data);
+            data._progress.loaded = data.loaded = data.uploadedBytes || 0;
+            data._progress.total = data.total = this._getTotal(data.files) || 1;
+            data._progress.bitrate = data.bitrate = 0;
+            this._active += 1;
+            // Initialize the global progress values:
+            this._progress.loaded += data.loaded;
+            this._progress.total += data.total;
+        },
+
+        _onDone: function (result, textStatus, jqXHR, options) {
+            var total = options._progress.total,
+                response = options._response;
+            if (options._progress.loaded < total) {
+                // Create a progress event if no final progress event
+                // with loaded equaling total has been triggered:
+                this._onProgress($.Event('progress', {
+                    lengthComputable: true,
+                    loaded: total,
+                    total: total
+                }), options);
+            }
+            response.result = options.result = result;
+            response.textStatus = options.textStatus = textStatus;
+            response.jqXHR = options.jqXHR = jqXHR;
+            this._trigger('done', null, options);
+        },
+
+        _onFail: function (jqXHR, textStatus, errorThrown, options) {
+            var response = options._response;
+            if (options.recalculateProgress) {
+                // Remove the failed (error or abort) file upload from
+                // the global progress calculation:
+                this._progress.loaded -= options._progress.loaded;
+                this._progress.total -= options._progress.total;
+            }
+            response.jqXHR = options.jqXHR = jqXHR;
+            response.textStatus = options.textStatus = textStatus;
+            response.errorThrown = options.errorThrown = errorThrown;
+            this._trigger('fail', null, options);
+        },
+
+        _onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) {
+            // jqXHRorResult, textStatus and jqXHRorError are added to the
+            // options object via done and fail callbacks
+            this._trigger('always', null, options);
+        },
+
+        _onSend: function (e, data) {
+            if (!data.submit) {
+                this._addConvenienceMethods(e, data);
+            }
+            var that = this,
+                jqXHR,
+                aborted,
+                slot,
+                pipe,
+                options = that._getAJAXSettings(data),
+                send = function () {
+                    that._sending += 1;
+                    // Set timer for bitrate progress calculation:
+                    options._bitrateTimer = new that._BitrateTimer();
+                    jqXHR = jqXHR || (
+                        ((aborted || that._trigger('send', e, options) === false) &&
+                        that._getXHRPromise(false, options.context, aborted)) ||
+                        that._chunkedUpload(options) || $.ajax(options)
+                    ).done(function (result, textStatus, jqXHR) {
+                        that._onDone(result, textStatus, jqXHR, options);
+                    }).fail(function (jqXHR, textStatus, errorThrown) {
+                        that._onFail(jqXHR, textStatus, errorThrown, options);
+                    }).always(function (jqXHRorResult, textStatus, jqXHRorError) {
+                        that._onAlways(
+                            jqXHRorResult,
+                            textStatus,
+                            jqXHRorError,
+                            options
+                        );
+                        that._sending -= 1;
+                        that._active -= 1;
+                        if (options.limitConcurrentUploads &&
+                                options.limitConcurrentUploads > that._sending) {
+                            // Start the next queued upload,
+                            // that has not been aborted:
+                            var nextSlot = that._slots.shift();
+                            while (nextSlot) {
+                                if (that._getDeferredState(nextSlot) === 'pending') {
+                                    nextSlot.resolve();
+                                    break;
+                                }
+                                nextSlot = that._slots.shift();
+                            }
+                        }
+                        if (that._active === 0) {
+                            // The stop callback is triggered when all uploads have
+                            // been completed, equivalent to the global ajaxStop event:
+                            that._trigger('stop');
+                        }
+                    });
+                    return jqXHR;
+                };
+            this._beforeSend(e, options);
+            if (this.options.sequentialUploads ||
+                    (this.options.limitConcurrentUploads &&
+                    this.options.limitConcurrentUploads <= this._sending)) {
+                if (this.options.limitConcurrentUploads > 1) {
+                    slot = $.Deferred();
+                    this._slots.push(slot);
+                    pipe = slot.pipe(send);
+                } else {
+                    this._sequence = this._sequence.pipe(send, send);
+                    pipe = this._sequence;
+                }
+                // Return the piped Promise object, enhanced with an abort method,
+                // which is delegated to the jqXHR object of the current upload,
+                // and jqXHR callbacks mapped to the equivalent Promise methods:
+                pipe.abort = function () {
+                    aborted = [undefined, 'abort', 'abort'];
+                    if (!jqXHR) {
+                        if (slot) {
+                            slot.rejectWith(options.context, aborted);
+                        }
+                        return send();
+                    }
+                    return jqXHR.abort();
+                };
+                return this._enhancePromise(pipe);
+            }
+            return send();
+        },
+
+        _onAdd: function (e, data) {
+            var that = this,
+                result = true,
+                options = $.extend({}, this.options, data),
+                limit = options.limitMultiFileUploads,
+                paramName = this._getParamName(options),
+                paramNameSet,
+                paramNameSlice,
+                fileSet,
+                i;
+            if (!(options.singleFileUploads || limit) ||
+                    !this._isXHRUpload(options)) {
+                fileSet = [data.files];
+                paramNameSet = [paramName];
+            } else if (!options.singleFileUploads && limit) {
+                fileSet = [];
+                paramNameSet = [];
+                for (i = 0; i < data.files.length; i += limit) {
+                    fileSet.push(data.files.slice(i, i + limit));
+                    paramNameSlice = paramName.slice(i, i + limit);
+                    if (!paramNameSlice.length) {
+                        paramNameSlice = paramName;
+                    }
+                    paramNameSet.push(paramNameSlice);
+                }
+            } else {
+                paramNameSet = paramName;
+            }
+            data.originalFiles = data.files;
+            $.each(fileSet || data.files, function (index, element) {
+                var newData = $.extend({}, data);
+                newData.files = fileSet ? element : [element];
+                newData.paramName = paramNameSet[index];
+                that._initResponseObject(newData);
+                that._initProgressObject(newData);
+                that._addConvenienceMethods(e, newData);
+                result = that._trigger('add', e, newData);
+                return result;
+            });
+            return result;
+        },
+
+        _replaceFileInput: function (input) {
+            var inputClone = input.clone(true);
+            $('<form></form>').append(inputClone)[0].reset();
+            // Detaching allows to insert the fileInput on another form
+            // without loosing the file input value:
+            input.after(inputClone).detach();
+            // Avoid memory leaks with the detached file input:
+            $.cleanData(input.unbind('remove'));
+            // Replace the original file input element in the fileInput
+            // elements set with the clone, which has been copied including
+            // event handlers:
+            this.options.fileInput = this.options.fileInput.map(function (i, el) {
+                if (el === input[0]) {
+                    return inputClone[0];
+                }
+                return el;
+            });
+            // If the widget has been initialized on the file input itself,
+            // override this.element with the file input clone:
+            if (input[0] === this.element[0]) {
+                this.element = inputClone;
+            }
+        },
+
+        _handleFileTreeEntry: function (entry, path) {
+            var that = this,
+                dfd = $.Deferred(),
+                errorHandler = function (e) {
+                    if (e && !e.entry) {
+                        e.entry = entry;
+                    }
+                    // Since $.when returns immediately if one
+                    // Deferred is rejected, we use resolve instead.
+                    // This allows valid files and invalid items
+                    // to be returned together in one set:
+                    dfd.resolve([e]);
+                },
+                dirReader;
+            path = path || '';
+            if (entry.isFile) {
+                if (entry._file) {
+                    // Workaround for Chrome bug #149735
+                    entry._file.relativePath = path;
+                    dfd.resolve(entry._file);
+                } else {
+                    entry.file(function (file) {
+                        file.relativePath = path;
+                        dfd.resolve(file);
+                    }, errorHandler);
+                }
+            } else if (entry.isDirectory) {
+                dirReader = entry.createReader();
+                dirReader.readEntries(function (entries) {
+                    that._handleFileTreeEntries(
+                        entries,
+                        path + entry.name + '/'
+                    ).done(function (files) {
+                        dfd.resolve(files);
+                    }).fail(errorHandler);
+                }, errorHandler);
+            } else {
+                // Return an empy list for file system items
+                // other than files or directories:
+                dfd.resolve([]);
+            }
+            return dfd.promise();
+        },
+
+        _handleFileTreeEntries: function (entries, path) {
+            var that = this;
+            return $.when.apply(
+                $,
+                $.map(entries, function (entry) {
+                    return that._handleFileTreeEntry(entry, path);
+                })
+            ).pipe(function () {
+                return Array.prototype.concat.apply(
+                    [],
+                    arguments
+                );
+            });
+        },
+
+        _getDroppedFiles: function (dataTransfer) {
+            dataTransfer = dataTransfer || {};
+            var items = dataTransfer.items;
+            if (items && items.length && (items[0].webkitGetAsEntry ||
+                    items[0].getAsEntry)) {
+                return this._handleFileTreeEntries(
+                    $.map(items, function (item) {
+                        var entry;
+                        if (item.webkitGetAsEntry) {
+                            entry = item.webkitGetAsEntry();
+                            if (entry) {
+                                // Workaround for Chrome bug #149735:
+                                entry._file = item.getAsFile();
+                            }
+                            return entry;
+                        }
+                        return item.getAsEntry();
+                    })
+                );
+            }
+            return $.Deferred().resolve(
+                $.makeArray(dataTransfer.files)
+            ).promise();
+        },
+
+        _getSingleFileInputFiles: function (fileInput) {
+            fileInput = $(fileInput);
+            var entries = fileInput.prop('webkitEntries') ||
+                    fileInput.prop('entries'),
+                files,
+                value;
+            if (entries && entries.length) {
+                return this._handleFileTreeEntries(entries);
+            }
+            files = $.makeArray(fileInput.prop('files'));
+            if (!files.length) {
+                value = fileInput.prop('value');
+                if (!value) {
+                    return $.Deferred().resolve([]).promise();
+                }
+                // If the files property is not available, the browser does not
+                // support the File API and we add a pseudo File object with
+                // the input value as name with path information removed:
+                files = [{name: value.replace(/^.*\\/, '')}];
+            } else if (files[0].name === undefined && files[0].fileName) {
+                // File normalization for Safari 4 and Firefox 3:
+                $.each(files, function (index, file) {
+                    file.name = file.fileName;
+                    file.size = file.fileSize;
+                });
+            }
+            return $.Deferred().resolve(files).promise();
+        },
+
+        _getFileInputFiles: function (fileInput) {
+            if (!(fileInput instanceof $) || fileInput.length === 1) {
+                return this._getSingleFileInputFiles(fileInput);
+            }
+            return $.when.apply(
+                $,
+                $.map(fileInput, this._getSingleFileInputFiles)
+            ).pipe(function () {
+                return Array.prototype.concat.apply(
+                    [],
+                    arguments
+                );
+            });
+        },
+
+        _onChange: function (e) {
+            var that = this,
+                data = {
+                    fileInput: $(e.target),
+                    form: $(e.target.form)
+                };
+            this._getFileInputFiles(data.fileInput).always(function (files) {
+                data.files = files;
+                if (that.options.replaceFileInput) {
+                    that._replaceFileInput(data.fileInput);
+                }
+                if (that._trigger('change', e, data) !== false) {
+                    that._onAdd(e, data);
+                }
+            });
+        },
+
+        _onPaste: function (e) {
+            var items = e.originalEvent && e.originalEvent.clipboardData &&
+                    e.originalEvent.clipboardData.items,
+                data = {files: []};
+            if (items && items.length) {
+                $.each(items, function (index, item) {
+                    var file = item.getAsFile && item.getAsFile();
+                    if (file) {
+                        data.files.push(file);
+                    }
+                });
+                if (this._trigger('paste', e, data) === false ||
+                        this._onAdd(e, data) === false) {
+                    return false;
+                }
+            }
+        },
+
+        _onDrop: function (e) {
+            e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
+            var that = this,
+                dataTransfer = e.dataTransfer,
+                data = {};
+            if (dataTransfer && dataTransfer.files && dataTransfer.files.length) {
+                e.preventDefault();
+                this._getDroppedFiles(dataTransfer).always(function (files) {
+                    data.files = files;
+                    if (that._trigger('drop', e, data) !== false) {
+                        that._onAdd(e, data);
+                    }
+                });
+            }
+        },
+
+        _onDragOver: function (e) {
+            e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
+            var dataTransfer = e.dataTransfer;
+            if (dataTransfer) {
+                if (this._trigger('dragover', e) === false) {
+                    return false;
+                }
+                if ($.inArray('Files', dataTransfer.types) !== -1) {
+                    dataTransfer.dropEffect = 'copy';
+                    e.preventDefault();
+                }
+            }
+        },
+
+        _initEventHandlers: function () {
+            if (this._isXHRUpload(this.options)) {
+                this._on(this.options.dropZone, {
+                    dragover: this._onDragOver,
+                    drop: this._onDrop
+                });
+                this._on(this.options.pasteZone, {
+                    paste: this._onPaste
+                });
+            }
+            this._on(this.options.fileInput, {
+                change: this._onChange
+            });
+        },
+
+        _destroyEventHandlers: function () {
+            this._off(this.options.dropZone, 'dragover drop');
+            this._off(this.options.pasteZone, 'paste');
+            this._off(this.options.fileInput, 'change');
+        },
+
+        _setOption: function (key, value) {
+            var reinit = $.inArray(key, this._specialOptions) !== -1;
+            if (reinit) {
+                this._destroyEventHandlers();
+            }
+            this._super(key, value);
+            if (reinit) {
+                this._initSpecialOptions();
+                this._initEventHandlers();
+            }
+        },
+
+        _initSpecialOptions: function () {
+            var options = this.options;
+            if (options.fileInput === undefined) {
+                options.fileInput = this.element.is('input[type="file"]') ?
+                        this.element : this.element.find('input[type="file"]');
+            } else if (!(options.fileInput instanceof $)) {
+                options.fileInput = $(options.fileInput);
+            }
+            if (!(options.dropZone instanceof $)) {
+                options.dropZone = $(options.dropZone);
+            }
+            if (!(options.pasteZone instanceof $)) {
+                options.pasteZone = $(options.pasteZone);
+            }
+        },
+
+        _getRegExp: function (str) {
+            var parts = str.split('/'),
+                modifiers = parts.pop();
+            parts.shift();
+            return new RegExp(parts.join('/'), modifiers);
+        },
+
+        _isRegExpOption: function (key, value) {
+            return key !== 'url' && $.type(value) === 'string' &&
+                /^\/.*\/[igm]{0,3}$/.test(value);
+        },
+
+        _initDataAttributes: function () {
+            var that = this,
+                options = this.options;
+            // Initialize options set via HTML5 data-attributes:
+            $.each(
+                $(this.element[0].cloneNode(false)).data(),
+                function (key, value) {
+                    if (that._isRegExpOption(key, value)) {
+                        value = that._getRegExp(value);
+                    }
+                    options[key] = value;
+                }
+            );
+        },
+
+        _create: function () {
+            this._initDataAttributes();
+            this._initSpecialOptions();
+            this._slots = [];
+            this._sequence = this._getXHRPromise(true);
+            this._sending = this._active = 0;
+            this._initProgressObject(this);
+            this._initEventHandlers();
+        },
+
+        // This method is exposed to the widget API and allows to query
+        // the number of active uploads:
+        active: function () {
+            return this._active;
+        },
+
+        // This method is exposed to the widget API and allows to query
+        // the widget upload progress.
+        // It returns an object with loaded, total and bitrate properties
+        // for the running uploads:
+        progress: function () {
+            return this._progress;
+        },
+
+        // This method is exposed to the widget API and allows adding files
+        // using the fileupload API. The data parameter accepts an object which
+        // must have a files property and can contain additional options:
+        // .fileupload('add', {files: filesList});
+        add: function (data) {
+            var that = this;
+            if (!data || this.options.disabled) {
+                return;
+            }
+            if (data.fileInput && !data.files) {
+                this._getFileInputFiles(data.fileInput).always(function (files) {
+                    data.files = files;
+                    that._onAdd(null, data);
+                });
+            } else {
+                data.files = $.makeArray(data.files);
+                this._onAdd(null, data);
+            }
+        },
+
+        // This method is exposed to the widget API and allows sending files
+        // using the fileupload API. The data parameter accepts an object which
+        // must have a files or fileInput property and can contain additional options:
+        // .fileupload('send', {files: filesList});
+        // The method returns a Promise object for the file upload call.
+        send: function (data) {
+            if (data && !this.options.disabled) {
+                if (data.fileInput && !data.files) {
+                    var that = this,
+                        dfd = $.Deferred(),
+                        promise = dfd.promise(),
+                        jqXHR,
+                        aborted;
+                    promise.abort = function () {
+                        aborted = true;
+                        if (jqXHR) {
+                            return jqXHR.abort();
+                        }
+                        dfd.reject(null, 'abort', 'abort');
+                        return promise;
+                    };
+                    this._getFileInputFiles(data.fileInput).always(
+                        function (files) {
+                            if (aborted) {
+                                return;
+                            }
+                            data.files = files;
+                            jqXHR = that._onSend(null, data).then(
+                                function (result, textStatus, jqXHR) {
+                                    dfd.resolve(result, textStatus, jqXHR);
+                                },
+                                function (jqXHR, textStatus, errorThrown) {
+                                    dfd.reject(jqXHR, textStatus, errorThrown);
+                                }
+                            );
+                        }
+                    );
+                    return this._enhancePromise(promise);
+                }
+                data.files = $.makeArray(data.files);
+                if (data.files.length) {
+                    return this._onSend(null, data);
+                }
+            }
+            return this._getXHRPromise(false, data && data.context);
+        }
+
+    });
+
+}));
diff --git a/app/assets/javascripts/vendor/jquery.iframe-transport.js b/app/assets/javascripts/vendor/jquery.iframe-transport.js
new file mode 100755
index 0000000..073c5fb
--- /dev/null
+++ b/app/assets/javascripts/vendor/jquery.iframe-transport.js
@@ -0,0 +1,205 @@
+/*
+ * jQuery Iframe Transport Plugin 1.7
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+/*jslint unparam: true, nomen: true */
+/*global define, window, document */
+
+(function (factory) {
+    'use strict';
+    if (typeof define === 'function' && define.amd) {
+        // Register as an anonymous AMD module:
+        define(['jquery'], factory);
+    } else {
+        // Browser globals:
+        factory(window.jQuery);
+    }
+}(function ($) {
+    'use strict';
+
+    // Helper variable to create unique names for the transport iframes:
+    var counter = 0;
+
+    // The iframe transport accepts three additional options:
+    // options.fileInput: a jQuery collection of file input fields
+    // options.paramName: the parameter name for the file form data,
+    //  overrides the name property of the file input field(s),
+    //  can be a string or an array of strings.
+    // options.formData: an array of objects with name and value properties,
+    //  equivalent to the return data of .serializeArray(), e.g.:
+    //  [{name: 'a', value: 1}, {name: 'b', value: 2}]
+    $.ajaxTransport('iframe', function (options) {
+        if (options.async) {
+            var form,
+                iframe,
+                addParamChar;
+            return {
+                send: function (_, completeCallback) {
+                    form = $('<form style="display:none;"></form>');
+                    form.attr('accept-charset', options.formAcceptCharset);
+                    addParamChar = /\?/.test(options.url) ? '&' : '?';
+                    // XDomainRequest only supports GET and POST:
+                    if (options.type === 'DELETE') {
+                        options.url = options.url + addParamChar + '_method=DELETE';
+                        options.type = 'POST';
+                    } else if (options.type === 'PUT') {
+                        options.url = options.url + addParamChar + '_method=PUT';
+                        options.type = 'POST';
+                    } else if (options.type === 'PATCH') {
+                        options.url = options.url + addParamChar + '_method=PATCH';
+                        options.type = 'POST';
+                    }
+                    // javascript:false as initial iframe src
+                    // prevents warning popups on HTTPS in IE6.
+                    // IE versions below IE8 cannot set the name property of
+                    // elements that have already been added to the DOM,
+                    // so we set the name along with the iframe HTML markup:
+                    counter += 1;
+                    iframe = $(
+                        '<iframe src="javascript:false;" name="iframe-transport-' +
+                            counter + '"></iframe>'
+                    ).bind('load', function () {
+                        var fileInputClones,
+                            paramNames = $.isArray(options.paramName) ?
+                                    options.paramName : [options.paramName];
+                        iframe
+                            .unbind('load')
+                            .bind('load', function () {
+                                var response;
+                                // Wrap in a try/catch block to catch exceptions thrown
+                                // when trying to access cross-domain iframe contents:
+                                try {
+                                    response = iframe.contents();
+                                    // Google Chrome and Firefox do not throw an
+                                    // exception when calling iframe.contents() on
+                                    // cross-domain requests, so we unify the response:
+                                    if (!response.length || !response[0].firstChild) {
+                                        throw new Error();
+                                    }
+                                } catch (e) {
+                                    response = undefined;
+                                }
+                                // The complete callback returns the
+                                // iframe content document as response object:
+                                completeCallback(
+                                    200,
+                                    'success',
+                                    {'iframe': response}
+                                );
+                                // Fix for IE endless progress bar activity bug
+                                // (happens on form submits to iframe targets):
+                                $('<iframe src="javascript:false;"></iframe>')
+                                    .appendTo(form);
+                                window.setTimeout(function () {
+                                    // Removing the form in a setTimeout call
+                                    // allows Chrome's developer tools to display
+                                    // the response result
+                                    form.remove();
+                                }, 0);
+                            });
+                        form
+                            .prop('target', iframe.prop('name'))
+                            .prop('action', options.url)
+                            .prop('method', options.type);
+                        if (options.formData) {
+                            $.each(options.formData, function (index, field) {
+                                $('<input type="hidden"/>')
+                                    .prop('name', field.name)
+                                    .val(field.value)
+                                    .appendTo(form);
+                            });
+                        }
+                        if (options.fileInput && options.fileInput.length &&
+                                options.type === 'POST') {
+                            fileInputClones = options.fileInput.clone();
+                            // Insert a clone for each file input field:
+                            options.fileInput.after(function (index) {
+                                return fileInputClones[index];
+                            });
+                            if (options.paramName) {
+                                options.fileInput.each(function (index) {
+                                    $(this).prop(
+                                        'name',
+                                        paramNames[index] || options.paramName
+                                    );
+                                });
+                            }
+                            // Appending the file input fields to the hidden form
+                            // removes them from their original location:
+                            form
+                                .append(options.fileInput)
+                                .prop('enctype', 'multipart/form-data')
+                                // enctype must be set as encoding for IE:
+                                .prop('encoding', 'multipart/form-data');
+                        }
+                        form.submit();
+                        // Insert the file input fields at their original location
+                        // by replacing the clones with the originals:
+                        if (fileInputClones && fileInputClones.length) {
+                            options.fileInput.each(function (index, input) {
+                                var clone = $(fileInputClones[index]);
+                                $(input).prop('name', clone.prop('name'));
+                                clone.replaceWith(input);
+                            });
+                        }
+                    });
+                    form.append(iframe).appendTo(document.body);
+                },
+                abort: function () {
+                    if (iframe) {
+                        // javascript:false as iframe src aborts the request
+                        // and prevents warning popups on HTTPS in IE6.
+                        // concat is used to avoid the "Script URL" JSLint error:
+                        iframe
+                            .unbind('load')
+                            .prop('src', 'javascript'.concat(':false;'));
+                    }
+                    if (form) {
+                        form.remove();
+                    }
+                }
+            };
+        }
+    });
+
+    // The iframe transport returns the iframe content document as response.
+    // The following adds converters from iframe to text, json, html, xml
+    // and script.
+    // Please note that the Content-Type for JSON responses has to be text/plain
+    // or text/html, if the browser doesn't include application/json in the
+    // Accept header, else IE will show a download dialog.
+    // The Content-Type for XML responses on the other hand has to be always
+    // application/xml or text/xml, so IE properly parses the XML response.
+    // See also
+    // https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation
+    $.ajaxSetup({
+        converters: {
+            'iframe text': function (iframe) {
+                return iframe && $(iframe[0].body).text();
+            },
+            'iframe json': function (iframe) {
+                return iframe && $.parseJSON($(iframe[0].body).text());
+            },
+            'iframe html': function (iframe) {
+                return iframe && $(iframe[0].body).html();
+            },
+            'iframe xml': function (iframe) {
+                var xmlDoc = iframe && iframe[0];
+                return xmlDoc && $.isXMLDoc(xmlDoc) ? xmlDoc :
+                        $.parseXML((xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) ||
+                            $(xmlDoc.body).html());
+            },
+            'iframe script': function (iframe) {
+                return iframe && $.globalEval($(iframe[0].body).text());
+            }
+        }
+    });
+
+}));
diff --git a/app/assets/javascripts/vendor/jquery.ui.widget.js b/app/assets/javascripts/vendor/jquery.ui.widget.js
new file mode 100755
index 0000000..cf60425
--- /dev/null
+++ b/app/assets/javascripts/vendor/jquery.ui.widget.js
@@ -0,0 +1,530 @@
+/*
+ * jQuery UI Widget 1.10.3+amd
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/jQuery.widget/
+ */
+
+(function (factory) {
+    if (typeof define === "function" && define.amd) {
+        // Register as an anonymous AMD module:
+        define(["jquery"], factory);
+    } else {
+        // Browser globals:
+        factory(jQuery);
+    }
+}(function( $, undefined ) {
+
+var uuid = 0,
+  slice = Array.prototype.slice,
+  _cleanData = $.cleanData;
+$.cleanData = function( elems ) {
+  for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+    try {
+      $( elem ).triggerHandler( "remove" );
+    // http://bugs.jquery.com/ticket/8235
+    } catch( e ) {}
+  }
+  _cleanData( elems );
+};
+
+$.widget = function( name, base, prototype ) {
+  var fullName, existingConstructor, constructor, basePrototype,
+    // proxiedPrototype allows the provided prototype to remain unmodified
+    // so that it can be used as a mixin for multiple widgets (#8876)
+    proxiedPrototype = {},
+    namespace = name.split( "." )[ 0 ];
+
+  name = name.split( "." )[ 1 ];
+  fullName = namespace + "-" + name;
+
+  if ( !prototype ) {
+    prototype = base;
+    base = $.Widget;
+  }
+
+  // create selector for plugin
+  $.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
+    return !!$.data( elem, fullName );
+  };
+
+  $[ namespace ] = $[ namespace ] || {};
+  existingConstructor = $[ namespace ][ name ];
+  constructor = $[ namespace ][ name ] = function( options, element ) {
+    // allow instantiation without "new" keyword
+    if ( !this._createWidget ) {
+      return new constructor( options, element );
+    }
+
+    // allow instantiation without initializing for simple inheritance
+    // must use "new" keyword (the code above always passes args)
+    if ( arguments.length ) {
+      this._createWidget( options, element );
+    }
+  };
+  // extend with the existing constructor to carry over any static properties
+  $.extend( constructor, existingConstructor, {
+    version: prototype.version,
+    // copy the object used to create the prototype in case we need to
+    // redefine the widget later
+    _proto: $.extend( {}, prototype ),
+    // track widgets that inherit from this widget in case this widget is
+    // redefined after a widget inherits from it
+    _childConstructors: []
+  });
+
+  basePrototype = new base();
+  // we need to make the options hash a property directly on the new instance
+  // otherwise we'll modify the options hash on the prototype that we're
+  // inheriting from
+  basePrototype.options = $.widget.extend( {}, basePrototype.options );
+  $.each( prototype, function( prop, value ) {
+    if ( !$.isFunction( value ) ) {
+      proxiedPrototype[ prop ] = value;
+      return;
+    }
+    proxiedPrototype[ prop ] = (function() {
+      var _super = function() {
+          return base.prototype[ prop ].apply( this, arguments );
+        },
+        _superApply = function( args ) {
+          return base.prototype[ prop ].apply( this, args );
+        };
+      return function() {
+        var __super = this._super,
+          __superApply = this._superApply,
+          returnValue;
+
+        this._super = _super;
+        this._superApply = _superApply;
+
+        returnValue = value.apply( this, arguments );
+
+        this._super = __super;
+        this._superApply = __superApply;
+
+        return returnValue;
+      };
+    })();
+  });
+  constructor.prototype = $.widget.extend( basePrototype, {
+    // TODO: remove support for widgetEventPrefix
+    // always use the name + a colon as the prefix, e.g., draggable:start
+    // don't prefix for widgets that aren't DOM-based
+    widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name
+  }, proxiedPrototype, {
+    constructor: constructor,
+    namespace: namespace,
+    widgetName: name,
+    widgetFullName: fullName
+  });
+
+  // If this widget is being redefined then we need to find all widgets that
+  // are inheriting from it and redefine all of them so that they inherit from
+  // the new version of this widget. We're essentially trying to replace one
+  // level in the prototype chain.
+  if ( existingConstructor ) {
+    $.each( existingConstructor._childConstructors, function( i, child ) {
+      var childPrototype = child.prototype;
+
+      // redefine the child widget using the same prototype that was
+      // originally used, but inherit from the new version of the base
+      $.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
+    });
+    // remove the list of existing child constructors from the old constructor
+    // so the old child constructors can be garbage collected
+    delete existingConstructor._childConstructors;
+  } else {
+    base._childConstructors.push( constructor );
+  }
+
+  $.widget.bridge( name, constructor );
+};
+
+$.widget.extend = function( target ) {
+  var input = slice.call( arguments, 1 ),
+    inputIndex = 0,
+    inputLength = input.length,
+    key,
+    value;
+  for ( ; inputIndex < inputLength; inputIndex++ ) {
+    for ( key in input[ inputIndex ] ) {
+      value = input[ inputIndex ][ key ];
+      if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
+        // Clone objects
+        if ( $.isPlainObject( value ) ) {
+          target[ key ] = $.isPlainObject( target[ key ] ) ?
+            $.widget.extend( {}, target[ key ], value ) :
+            // Don't extend strings, arrays, etc. with objects
+            $.widget.extend( {}, value );
+        // Copy everything else by reference
+        } else {
+          target[ key ] = value;
+        }
+      }
+    }
+  }
+  return target;
+};
+
+$.widget.bridge = function( name, object ) {
+  var fullName = object.prototype.widgetFullName || name;
+  $.fn[ name ] = function( options ) {
+    var isMethodCall = typeof options === "string",
+      args = slice.call( arguments, 1 ),
+      returnValue = this;
+
+    // allow multiple hashes to be passed on init
+    options = !isMethodCall && args.length ?
+      $.widget.extend.apply( null, [ options ].concat(args) ) :
+      options;
+
+    if ( isMethodCall ) {
+      this.each(function() {
+        var methodValue,
+          instance = $.data( this, fullName );
+        if ( !instance ) {
+          return $.error( "cannot call methods on " + name + " prior to initialization; " +
+            "attempted to call method '" + options + "'" );
+        }
+        if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
+          return $.error( "no such method '" + options + "' for " + name + " widget instance" );
+        }
+        methodValue = instance[ options ].apply( instance, args );
+        if ( methodValue !== instance && methodValue !== undefined ) {
+          returnValue = methodValue && methodValue.jquery ?
+            returnValue.pushStack( methodValue.get() ) :
+            methodValue;
+          return false;
+        }
+      });
+    } else {
+      this.each(function() {
+        var instance = $.data( this, fullName );
+        if ( instance ) {
+          instance.option( options || {} )._init();
+        } else {
+          $.data( this, fullName, new object( options, this ) );
+        }
+      });
+    }
+
+    return returnValue;
+  };
+};
+
+$.Widget = function( /* options, element */ ) {};
+$.Widget._childConstructors = [];
+
+$.Widget.prototype = {
+  widgetName: "widget",
+  widgetEventPrefix: "",
+  defaultElement: "<div>",
+  options: {
+    disabled: false,
+
+    // callbacks
+    create: null
+  },
+  _createWidget: function( options, element ) {
+    element = $( element || this.defaultElement || this )[ 0 ];
+    this.element = $( element );
+    this.uuid = uuid++;
+    this.eventNamespace = "." + this.widgetName + this.uuid;
+    this.options = $.widget.extend( {},
+      this.options,
+      this._getCreateOptions(),
+      options );
+
+    this.bindings = $();
+    this.hoverable = $();
+    this.focusable = $();
+
+    if ( element !== this ) {
+      $.data( element, this.widgetFullName, this );
+      this._on( true, this.element, {
+        remove: function( event ) {
+          if ( event.target === element ) {
+            this.destroy();
+          }
+        }
+      });
+      this.document = $( element.style ?
+        // element within the document
+        element.ownerDocument :
+        // element is window or document
+        element.document || element );
+      this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
+    }
+
+    this._create();
+    this._trigger( "create", null, this._getCreateEventData() );
+    this._init();
+  },
+  _getCreateOptions: $.noop,
+  _getCreateEventData: $.noop,
+  _create: $.noop,
+  _init: $.noop,
+
+  destroy: function() {
+    this._destroy();
+    // we can probably remove the unbind calls in 2.0
+    // all event bindings should go through this._on()
+    this.element
+      .unbind( this.eventNamespace )
+      // 1.9 BC for #7810
+      // TODO remove dual storage
+      .removeData( this.widgetName )
+      .removeData( this.widgetFullName )
+      // support: jquery <1.6.3
+      // http://bugs.jquery.com/ticket/9413
+      .removeData( $.camelCase( this.widgetFullName ) );
+    this.widget()
+      .unbind( this.eventNamespace )
+      .removeAttr( "aria-disabled" )
+      .removeClass(
+        this.widgetFullName + "-disabled " +
+        "ui-state-disabled" );
+
+    // clean up events and states
+    this.bindings.unbind( this.eventNamespace );
+    this.hoverable.removeClass( "ui-state-hover" );
+    this.focusable.removeClass( "ui-state-focus" );
+  },
+  _destroy: $.noop,
+
+  widget: function() {
+    return this.element;
+  },
+
+  option: function( key, value ) {
+    var options = key,
+      parts,
+      curOption,
+      i;
+
+    if ( arguments.length === 0 ) {
+      // don't return a reference to the internal hash
+      return $.widget.extend( {}, this.options );
+    }
+
+    if ( typeof key === "string" ) {
+      // handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
+      options = {};
+      parts = key.split( "." );
+      key = parts.shift();
+      if ( parts.length ) {
+        curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
+        for ( i = 0; i < parts.length - 1; i++ ) {
+          curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
+          curOption = curOption[ parts[ i ] ];
+        }
+        key = parts.pop();
+        if ( value === undefined ) {
+          return curOption[ key ] === undefined ? null : curOption[ key ];
+        }
+        curOption[ key ] = value;
+      } else {
+        if ( value === undefined ) {
+          return this.options[ key ] === undefined ? null : this.options[ key ];
+        }
+        options[ key ] = value;
+      }
+    }
+
+    this._setOptions( options );
+
+    return this;
+  },
+  _setOptions: function( options ) {
+    var key;
+
+    for ( key in options ) {
+      this._setOption( key, options[ key ] );
+    }
+
+    return this;
+  },
+  _setOption: function( key, value ) {
+    this.options[ key ] = value;
+
+    if ( key === "disabled" ) {
+      this.widget()
+        .toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value )
+        .attr( "aria-disabled", value );
+      this.hoverable.removeClass( "ui-state-hover" );
+      this.focusable.removeClass( "ui-state-focus" );
+    }
+
+    return this;
+  },
+
+  enable: function() {
+    return this._setOption( "disabled", false );
+  },
+  disable: function() {
+    return this._setOption( "disabled", true );
+  },
+
+  _on: function( suppressDisabledCheck, element, handlers ) {
+    var delegateElement,
+      instance = this;
+
+    // no suppressDisabledCheck flag, shuffle arguments
+    if ( typeof suppressDisabledCheck !== "boolean" ) {
+      handlers = element;
+      element = suppressDisabledCheck;
+      suppressDisabledCheck = false;
+    }
+
+    // no element argument, shuffle and use this.element
+    if ( !handlers ) {
+      handlers = element;
+      element = this.element;
+      delegateElement = this.widget();
+    } else {
+      // accept selectors, DOM elements
+      element = delegateElement = $( element );
+      this.bindings = this.bindings.add( element );
+    }
+
+    $.each( handlers, function( event, handler ) {
+      function handlerProxy() {
+        // allow widgets to customize the disabled handling
+        // - disabled as an array instead of boolean
+        // - disabled class as method for disabling individual parts
+        if ( !suppressDisabledCheck &&
+            ( instance.options.disabled === true ||
+              $( this ).hasClass( "ui-state-disabled" ) ) ) {
+          return;
+        }
+        return ( typeof handler === "string" ? instance[ handler ] : handler )
+          .apply( instance, arguments );
+      }
+
+      // copy the guid so direct unbinding works
+      if ( typeof handler !== "string" ) {
+        handlerProxy.guid = handler.guid =
+          handler.guid || handlerProxy.guid || $.guid++;
+      }
+
+      var match = event.match( /^(\w+)\s*(.*)$/ ),
+        eventName = match[1] + instance.eventNamespace,
+        selector = match[2];
+      if ( selector ) {
+        delegateElement.delegate( selector, eventName, handlerProxy );
+      } else {
+        element.bind( eventName, handlerProxy );
+      }
+    });
+  },
+
+  _off: function( element, eventName ) {
+    eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
+    element.unbind( eventName ).undelegate( eventName );
+  },
+
+  _delay: function( handler, delay ) {
+    function handlerProxy() {
+      return ( typeof handler === "string" ? instance[ handler ] : handler )
+        .apply( instance, arguments );
+    }
+    var instance = this;
+    return setTimeout( handlerProxy, delay || 0 );
+  },
+
+  _hoverable: function( element ) {
+    this.hoverable = this.hoverable.add( element );
+    this._on( element, {
+      mouseenter: function( event ) {
+        $( event.currentTarget ).addClass( "ui-state-hover" );
+      },
+      mouseleave: function( event ) {
+        $( event.currentTarget ).removeClass( "ui-state-hover" );
+      }
+    });
+  },
+
+  _focusable: function( element ) {
+    this.focusable = this.focusable.add( element );
+    this._on( element, {
+      focusin: function( event ) {
+        $( event.currentTarget ).addClass( "ui-state-focus" );
+      },
+      focusout: function( event ) {
+        $( event.currentTarget ).removeClass( "ui-state-focus" );
+      }
+    });
+  },
+
+  _trigger: function( type, event, data ) {
+    var prop, orig,
+      callback = this.options[ type ];
+
+    data = data || {};
+    event = $.Event( event );
+    event.type = ( type === this.widgetEventPrefix ?
+      type :
+      this.widgetEventPrefix + type ).toLowerCase();
+    // the original event may come from any element
+    // so we need to reset the target on the new event
+    event.target = this.element[ 0 ];
+
+    // copy original event properties over to the new event
+    orig = event.originalEvent;
+    if ( orig ) {
+      for ( prop in orig ) {
+        if ( !( prop in event ) ) {
+          event[ prop ] = orig[ prop ];
+        }
+      }
+    }
+
+    this.element.trigger( event, data );
+    return !( $.isFunction( callback ) &&
+      callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
+      event.isDefaultPrevented() );
+  }
+};
+
+$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
+  $.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
+    if ( typeof options === "string" ) {
+      options = { effect: options };
+    }
+    var hasOptions,
+      effectName = !options ?
+        method :
+        options === true || typeof options === "number" ?
+          defaultEffect :
+          options.effect || defaultEffect;
+    options = options || {};
+    if ( typeof options === "number" ) {
+      options = { duration: options };
+    }
+    hasOptions = !$.isEmptyObject( options );
+    options.complete = callback;
+    if ( options.delay ) {
+      element.delay( options.delay );
+    }
+    if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
+      element[ method ]( options );
+    } else if ( effectName !== method && element[ effectName ] ) {
+      element[ effectName ]( options.duration, options.easing, callback );
+    } else {
+      element.queue(function( next ) {
+        $( this )[ method ]();
+        if ( callback ) {
+          callback.call( element[ 0 ] );
+        }
+        next();
+      });
+    }
+  };
+});
+
+}));
diff --git a/app/assets/javascripts/vendor/select2.min.js b/app/assets/javascripts/vendor/select2.min.js
new file mode 100755
index 0000000..05d5786
--- /dev/null
+++ b/app/assets/javascripts/vendor/select2.min.js
@@ -0,0 +1,3137 @@
+/*
+Copyright 2012 Igor Vaynberg
+
+Version: 3.4.1 Timestamp: Thu Jun 27 18:02:10 PDT 2013
+
+This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
+General Public License version 2 (the "GPL License"). You may choose either license to govern your
+use of this software only upon the condition that you accept all of the terms of either the Apache
+License or the GPL License.
+
+You may obtain a copy of the Apache License and the GPL License at:
+
+    http://www.apache.org/licenses/LICENSE-2.0
+    http://www.gnu.org/licenses/gpl-2.0.html
+
+Unless required by applicable law or agreed to in writing, software distributed under the
+Apache License or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the Apache License and the GPL License for
+the specific language governing permissions and limitations under the Apache License and the GPL License.
+*/
+(function ($) {
+    if(typeof $.fn.each2 == "undefined") {
+        $.fn.extend({
+            /*
+            * 4-10 times faster .each replacement
+            * use it carefully, as it overrides jQuery context of element on each iteration
+            */
+            each2 : function (c) {
+                var j = $([0]), i = -1, l = this.length;
+                while (
+                    ++i < l
+                    && (j.context = j[0] = this[i])
+                    && c.call(j[0], i, j) !== false //"this"=DOM, i=index, j=jQuery object
+                );
+                return this;
+            }
+        });
+    }
+})(jQuery);
+
+(function ($, undefined) {
+    "use strict";
+    /*global document, window, jQuery, console */
+
+    if (window.Select2 !== undefined) {
+        return;
+    }
+
+    var KEY, AbstractSelect2, SingleSelect2, MultiSelect2, nextUid, sizer,
+        lastMousePosition={x:0,y:0}, $document, scrollBarDimensions,
+
+    KEY = {
+        TAB: 9,
+        ENTER: 13,
+        ESC: 27,
+        SPACE: 32,
+        LEFT: 37,
+        UP: 38,
+        RIGHT: 39,
+        DOWN: 40,
+        SHIFT: 16,
+        CTRL: 17,
+        ALT: 18,
+        PAGE_UP: 33,
+        PAGE_DOWN: 34,
+        HOME: 36,
+        END: 35,
+        BACKSPACE: 8,
+        DELETE: 46,
+        isArrow: function (k) {
+            k = k.which ? k.which : k;
+            switch (k) {
+            case KEY.LEFT:
+            case KEY.RIGHT:
+            case KEY.UP:
+            case KEY.DOWN:
+                return true;
+            }
+            return false;
+        },
+        isControl: function (e) {
+            var k = e.which;
+            switch (k) {
+            case KEY.SHIFT:
+            case KEY.CTRL:
+            case KEY.ALT:
+                return true;
+            }
+
+            if (e.metaKey) return true;
+
+            return false;
+        },
+        isFunctionKey: function (k) {
+            k = k.which ? k.which : k;
+            return k >= 112 && k <= 123;
+        }
+    },
+    MEASURE_SCROLLBAR_TEMPLATE = "<div class='select2-measure-scrollbar'></div>";
+
+    $document = $(document);
+
+    nextUid=(function() { var counter=1; return function() { return counter++; }; }());
+
+    function indexOf(value, array) {
+        var i = 0, l = array.length;
+        for (; i < l; i = i + 1) {
+            if (equal(value, array[i])) return i;
+        }
+        return -1;
+    }
+
+    function measureScrollbar () {
+        var $template = $( MEASURE_SCROLLBAR_TEMPLATE );
+        $template.appendTo('body');
+
+        var dim = {
+            width: $template.width() - $template[0].clientWidth,
+            height: $template.height() - $template[0].clientHeight
+        };
+        $template.remove();
+
+        return dim;
+    }
+
+    /**
+     * Compares equality of a and b
+     * @param a
+     * @param b
+     */
+    function equal(a, b) {
+        if (a === b) return true;
+        if (a === undefined || b === undefined) return false;
+        if (a === null || b === null) return false;
+        // Check whether 'a' or 'b' is a string (primitive or object).
+        // The concatenation of an empty string (+'') converts its argument to a string's primitive.
+        if (a.constructor === String) return a+'' === b+''; // a+'' - in case 'a' is a String object
+        if (b.constructor === String) return b+'' === a+''; // b+'' - in case 'b' is a String object
+        return false;
+    }
+
+    /**
+     * Splits the string into an array of values, trimming each value. An empty array is returned for nulls or empty
+     * strings
+     * @param string
+     * @param separator
+     */
+    function splitVal(string, separator) {
+        var val, i, l;
+        if (string === null || string.length < 1) return [];
+        val = string.split(separator);
+        for (i = 0, l = val.length; i < l; i = i + 1) val[i] = $.trim(val[i]);
+        return val;
+    }
+
+    function getSideBorderPadding(element) {
+        return element.outerWidth(false) - element.width();
+    }
+
+    function installKeyUpChangeEvent(element) {
+        var key="keyup-change-value";
+        element.on("keydown", function () {
+            if ($.data(element, key) === undefined) {
+                $.data(element, key, element.val());
+            }
+        });
+        element.on("keyup", function () {
+            var val= $.data(element, key);
+            if (val !== undefined && element.val() !== val) {
+                $.removeData(element, key);
+                element.trigger("keyup-change");
+            }
+        });
+    }
+
+    $document.on("mousemove", function (e) {
+        lastMousePosition.x = e.pageX;
+        lastMousePosition.y = e.pageY;
+    });
+
+    /**
+     * filters mouse events so an event is fired only if the mouse moved.
+     *
+     * filters out mouse events that occur when mouse is stationary but
+     * the elements under the pointer are scrolled.
+     */
+    function installFilteredMouseMove(element) {
+        element.on("mousemove", function (e) {
+            var lastpos = lastMousePosition;
+            if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) {
+                $(e.target).trigger("mousemove-filtered", e);
+            }
+        });
+    }
+
+    /**
+     * Debounces a function. Returns a function that calls the original fn function only if no invocations have been made
+     * within the last quietMillis milliseconds.
+     *
+     * @param quietMillis number of milliseconds to wait before invoking fn
+     * @param fn function to be debounced
+     * @param ctx object to be used as this reference within fn
+     * @return debounced version of fn
+     */
+    function debounce(quietMillis, fn, ctx) {
+        ctx = ctx || undefined;
+        var timeout;
+        return function () {
+            var args = arguments;
+            window.clearTimeout(timeout);
+            timeout = window.setTimeout(function() {
+                fn.apply(ctx, args);
+            }, quietMillis);
+        };
+    }
+
+    /**
+     * A simple implementation of a thunk
+     * @param formula function used to lazily initialize the thunk
+     * @return {Function}
+     */
+    function thunk(formula) {
+        var evaluated = false,
+            value;
+        return function() {
+            if (evaluated === false) { value = formula(); evaluated = true; }
+            return value;
+        };
+    };
+
+    function installDebouncedScroll(threshold, element) {
+        var notify = debounce(threshold, function (e) { element.trigger("scroll-debounced", e);});
+        element.on("scroll", function (e) {
+            if (indexOf(e.target, element.get()) >= 0) notify(e);
+        });
+    }
+
+    function focus($el) {
+        if ($el[0] === document.activeElement) return;
+
+        /* set the focus in a 0 timeout - that way the focus is set after the processing
+            of the current event has finished - which seems like the only reliable way
+            to set focus */
+        window.setTimeout(function() {
+            var el=$el[0], pos=$el.val().length, range;
+
+            $el.focus();
+
+            /* make sure el received focus so we do not error out when trying to manipulate the caret.
+                sometimes modals or others listeners may steal it after its set */
+            if ($el.is(":visible") && el === document.activeElement) {
+
+                /* after the focus is set move the caret to the end, necessary when we val()
+                    just before setting focus */
+                if(el.setSelectionRange)
+                {
+                    el.setSelectionRange(pos, pos);
+                }
+                else if (el.createTextRange) {
+                    range = el.createTextRange();
+                    range.collapse(false);
+                    range.select();
+                }
+            }
+        }, 0);
+    }
+
+    function getCursorInfo(el) {
+        el = $(el)[0];
+        var offset = 0;
+        var length = 0;
+        if ('selectionStart' in el) {
+            offset = el.selectionStart;
+            length = el.selectionEnd - offset;
+        } else if ('selection' in document) {
+            el.focus();
+            var sel = document.selection.createRange();
+            length = document.selection.createRange().text.length;
+            sel.moveStart('character', -el.value.length);
+            offset = sel.text.length - length;
+        }
+        return { offset: offset, length: length };
+    }
+
+    function killEvent(event) {
+        event.preventDefault();
+        event.stopPropagation();
+    }
+    function killEventImmediately(event) {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+    }
+
+    function measureTextWidth(e) {
+        if (!sizer){
+            var style = e[0].currentStyle || window.getComputedStyle(e[0], null);
+            sizer = $(document.createElement("div")).css({
+                position: "absolute",
+                left: "-10000px",
+                top: "-10000px",
+                display: "none",
+                fontSize: style.fontSize,
+                fontFamily: style.fontFamily,
+                fontStyle: style.fontStyle,
+                fontWeight: style.fontWeight,
+                letterSpacing: style.letterSpacing,
+                textTransform: style.textTransform,
+                whiteSpace: "nowrap"
+            });
+            sizer.attr("class","select2-sizer");
+            $("body").append(sizer);
+        }
+        sizer.text(e.val());
+        return sizer.width();
+    }
+
+    function syncCssClasses(dest, src, adapter) {
+        var classes, replacements = [], adapted;
+
+        classes = dest.attr("class");
+        if (classes) {
+            classes = '' + classes; // for IE which returns object
+            $(classes.split(" ")).each2(function() {
+                if (this.indexOf("select2-") === 0) {
+                    replacements.push(this);
+                }
+            });
+        }
+        classes = src.attr("class");
+        if (classes) {
+            classes = '' + classes; // for IE which returns object
+            $(classes.split(" ")).each2(function() {
+                if (this.indexOf("select2-") !== 0) {
+                    adapted = adapter(this);
+                    if (adapted) {
+                        replacements.push(this);
+                    }
+                }
+            });
+        }
+        dest.attr("class", replacements.join(" "));
+    }
+
+
+    function markMatch(text, term, markup, escapeMarkup) {
+        var match=text.toUpperCase().indexOf(term.toUpperCase()),
+            tl=term.length;
+
+        if (match<0) {
+            markup.push(escapeMarkup(text));
+            return;
+        }
+
+        markup.push(escapeMarkup(text.substring(0, match)));
+        markup.push("<span class='select2-match'>");
+        markup.push(escapeMarkup(text.substring(match, match + tl)));
+        markup.push("</span>");
+        markup.push(escapeMarkup(text.substring(match + tl, text.length)));
+    }
+
+    function defaultEscapeMarkup(markup) {
+        var replace_map = {
+            '\\': '&#92;',
+            '&': '&amp;',
+            '<': '&lt;',
+            '>': '&gt;',
+            '"': '&quot;',
+            "'": '&#39;',
+            "/": '&#47;'
+        };
+
+        return String(markup).replace(/[&<>"'\/\\]/g, function (match) {
+            return replace_map[match];
+        });
+    }
+
+    /**
+     * Produces an ajax-based query function
+     *
+     * @param options object containing configuration paramters
+     * @param options.params parameter map for the transport ajax call, can contain such options as cache, jsonpCallback, etc. see $.ajax
+     * @param options.transport function that will be used to execute the ajax request. must be compatible with parameters supported by $.ajax
+     * @param options.url url for the data
+     * @param options.data a function(searchTerm, pageNumber, context) that should return an object containing query string parameters for the above url.
+     * @param options.dataType request data type: ajax, jsonp, other datatatypes supported by jQuery's $.ajax function or the transport function if specified
+     * @param options.quietMillis (optional) milliseconds to wait before making the ajaxRequest, helps debounce the ajax function if invoked too often
+     * @param options.results a function(remoteData, pageNumber) that converts data returned form the remote request to the format expected by Select2.
+     *      The expected format is an object containing the following keys:
+     *      results array of objects that will be used as choices
+     *      more (optional) boolean indicating whether there are more results available
+     *      Example: {results:[{id:1, text:'Red'},{id:2, text:'Blue'}], more:true}
+     */
+    function ajax(options) {
+        var timeout, // current scheduled but not yet executed request
+            requestSequence = 0, // sequence used to drop out-of-order responses
+            handler = null,
+            quietMillis = options.quietMillis || 100,
+            ajaxUrl = options.url,
+            self = this;
+
+        return function (query) {
+            window.clearTimeout(timeout);
+            timeout = window.setTimeout(function () {
+                requestSequence += 1; // increment the sequence
+                var requestNumber = requestSequence, // this request's sequence number
+                    data = options.data, // ajax data function
+                    url = ajaxUrl, // ajax url string or function
+                    transport = options.transport || $.fn.select2.ajaxDefaults.transport,
+                    // deprecated - to be removed in 4.0  - use params instead
+                    deprecated = {
+                        type: options.type || 'GET', // set type of request (GET or POST)
+                        cache: options.cache || false,
+                        jsonpCallback: options.jsonpCallback||undefined,
+                        dataType: options.dataType||"json"
+                    },
+                    params = $.extend({}, $.fn.select2.ajaxDefaults.params, deprecated);
+
+                data = data ? data.call(self, query.term, query.page, query.context) : null;
+                url = (typeof url === 'function') ? url.call(self, query.term, query.page, query.context) : url;
+
+                if (handler) { handler.abort(); }
+
+                if (options.params) {
+                    if ($.isFunction(options.params)) {
+                        $.extend(params, options.params.call(self));
+                    } else {
+                        $.extend(params, options.params);
+                    }
+                }
+
+                $.extend(params, {
+                    url: url,
+                    dataType: options.dataType,
+                    data: data,
+                    success: function (data) {
+                        if (requestNumber < requestSequence) {
+                            return;
+                        }
+                        // TODO - replace query.page with query so users have access to term, page, etc.
+                        var results = options.results(data, query.page);
+                        query.callback(results);
+                    }
+                });
+                handler = transport.call(self, params);
+            }, quietMillis);
+        };
+    }
+
+    /**
+     * Produces a query function that works with a local array
+     *
+     * @param options object containing configuration parameters. The options parameter can either be an array or an
+     * object.
+     *
+     * If the array form is used it is assumed that it contains objects with 'id' and 'text' keys.
+     *
+     * If the object form is used ti is assumed that it contains 'data' and 'text' keys. The 'data' key should contain
+     * an array of objects that will be used as choices. These objects must contain at least an 'id' key. The 'text'
+     * key can either be a String in which case it is expected that each element in the 'data' array has a key with the
+     * value of 'text' which will be used to match choices. Alternatively, text can be a function(item) that can extract
+     * the text.
+     */
+    function local(options) {
+        var data = options, // data elements
+            dataText,
+            tmp,
+            text = function (item) { return ""+item.text; }; // function used to retrieve the text portion of a data item that is matched against the search
+
+         if ($.isArray(data)) {
+            tmp = data;
+            data = { results: tmp };
+        }
+
+         if ($.isFunction(data) === false) {
+            tmp = data;
+            data = function() { return tmp; };
+        }
+
+        var dataItem = data();
+        if (dataItem.text) {
+            text = dataItem.text;
+            // if text is not a function we assume it to be a key name
+            if (!$.isFunction(text)) {
+                dataText = dataItem.text; // we need to store this in a separate variable because in the next step data gets reset and data.text is no longer available
+                text = function (item) { return item[dataText]; };
+            }
+        }
+
+        return function (query) {
+            var t = query.term, filtered = { results: [] }, process;
+            if (t === "") {
+                query.callback(data());
+                return;
+            }
+
+            process = function(datum, collection) {
+                var group, attr;
+                datum = datum[0];
+                if (datum.children) {
+                    group = {};
+                    for (attr in datum) {
+                        if (datum.hasOwnProperty(attr)) group[attr]=datum[attr];
+                    }
+                    group.children=[];
+                    $(datum.children).each2(function(i, childDatum) { process(childDatum, group.children); });
+                    if (group.children.length || query.matcher(t, text(group), datum)) {
+                        collection.push(group);
+                    }
+                } else {
+                    if (query.matcher(t, text(datum), datum)) {
+                        collection.push(datum);
+                    }
+                }
+            };
+
+            $(data().results).each2(function(i, datum) { process(datum, filtered.results); });
+            query.callback(filtered);
+        };
+    }
+
+    // TODO javadoc
+    function tags(data) {
+        var isFunc = $.isFunction(data);
+        return function (query) {
+            var t = query.term, filtered = {results: []};
+            $(isFunc ? data() : data).each(function () {
+                var isObject = this.text !== undefined,
+                    text = isObject ? this.text : this;
+                if (t === "" || query.matcher(t, text)) {
+                    filtered.results.push(isObject ? this : {id: this, text: this});
+                }
+            });
+            query.callback(filtered);
+        };
+    }
+
+    /**
+     * Checks if the formatter function should be used.
+     *
+     * Throws an error if it is not a function. Returns true if it should be used,
+     * false if no formatting should be performed.
+     *
+     * @param formatter
+     */
+    function checkFormatter(formatter, formatterName) {
+        if ($.isFunction(formatter)) return true;
+        if (!formatter) return false;
+        throw new Error(formatterName +" must be a function or a falsy value");
+    }
+
+    function evaluate(val) {
+        return $.isFunction(val) ? val() : val;
+    }
+
+    function countResults(results) {
+        var count = 0;
+        $.each(results, function(i, item) {
+            if (item.children) {
+                count += countResults(item.children);
+            } else {
+                count++;
+            }
+        });
+        return count;
+    }
+
+    /**
+     * Default tokenizer. This function uses breaks the input on substring match of any string from the
+     * opts.tokenSeparators array and uses opts.createSearchChoice to create the choice object. Both of those
+     * two options have to be defined in order for the tokenizer to work.
+     *
+     * @param input text user has typed so far or pasted into the search field
+     * @param selection currently selected choices
+     * @param selectCallback function(choice) callback tho add the choice to selection
+     * @param opts select2's opts
+     * @return undefined/null to leave the current input unchanged, or a string to change the input to the returned value
+     */
+    function defaultTokenizer(input, selection, selectCallback, opts) {
+        var original = input, // store the original so we can compare and know if we need to tell the search to update its text
+            dupe = false, // check for whether a token we extracted represents a duplicate selected choice
+            token, // token
+            index, // position at which the separator was found
+            i, l, // looping variables
+            separator; // the matched separator
+
+        if (!opts.createSearchChoice || !opts.tokenSeparators || opts.tokenSeparators.length < 1) return undefined;
+
+        while (true) {
+            index = -1;
+
+            for (i = 0, l = opts.tokenSeparators.length; i < l; i++) {
+                separator = opts.tokenSeparators[i];
+                index = input.indexOf(separator);
+                if (index >= 0) break;
+            }
+
+            if (index < 0) break; // did not find any token separator in the input string, bail
+
+            token = input.substring(0, index);
+            input = input.substring(index + separator.length);
+
+            if (token.length > 0) {
+                token = opts.createSearchChoice.call(this, token, selection);
+                if (token !== undefined && token !== null && opts.id(token) !== undefined && opts.id(token) !== null) {
+                    dupe = false;
+                    for (i = 0, l = selection.length; i < l; i++) {
+                        if (equal(opts.id(token), opts.id(selection[i]))) {
+                            dupe = true; break;
+                        }
+                    }
+
+                    if (!dupe) selectCallback(token);
+                }
+            }
+        }
+
+        if (original!==input) return input;
+    }
+
+    /**
+     * Creates a new class
+     *
+     * @param superClass
+     * @param methods
+     */
+    function clazz(SuperClass, methods) {
+        var constructor = function () {};
+        constructor.prototype = new SuperClass;
+        constructor.prototype.constructor = constructor;
+        constructor.prototype.parent = SuperClass.prototype;
+        constructor.prototype = $.extend(constructor.prototype, methods);
+        return constructor;
+    }
+
+    AbstractSelect2 = clazz(Object, {
+
+        // abstract
+        bind: function (func) {
+            var self = this;
+            return function () {
+                func.apply(self, arguments);
+            };
+        },
+
+        // abstract
+        init: function (opts) {
+            var results, search, resultsSelector = ".select2-results", disabled, readonly;
+
+            // prepare options
+            this.opts = opts = this.prepareOpts(opts);
+
+            this.id=opts.id;
+
+            // destroy if called on an existing component
+            if (opts.element.data("select2") !== undefined &&
+                opts.element.data("select2") !== null) {
+                opts.element.data("select2").destroy();
+            }
+
+            this.container = this.createContainer();
+
+            this.containerId="s2id_"+(opts.element.attr("id") || "autogen"+nextUid());
+            this.containerSelector="#"+this.containerId.replace(/([;&,\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1');
+            this.container.attr("id", this.containerId);
+
+            // cache the body so future lookups are cheap
+            this.body = thunk(function() { return opts.element.closest("body"); });
+
+            syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
+
+            this.container.css(evaluate(opts.containerCss));
+            this.container.addClass(evaluate(opts.containerCssClass));
+
+            this.elementTabIndex = this.opts.element.attr("tabindex");
+
+            // swap container for the element
+            this.opts.element
+                .data("select2", this)
+                .attr("tabindex", "-1")
+                .before(this.container);
+            this.container.data("select2", this);
+
+            this.dropdown = this.container.find(".select2-drop");
+            this.dropdown.addClass(evaluate(opts.dropdownCssClass));
+            this.dropdown.data("select2", this);
+
+            this.results = results = this.container.find(resultsSelector);
+            this.search = search = this.container.find("input.select2-input");
+
+            this.resultsPage = 0;
+            this.context = null;
+
+            // initialize the container
+            this.initContainer();
+
+            installFilteredMouseMove(this.results);
+            this.dropdown.on("mousemove-filtered touchstart touchmove touchend", resultsSelector, this.bind(this.highlightUnderEvent));
+
+            installDebouncedScroll(80, this.results);
+            this.dropdown.on("scroll-debounced", resultsSelector, this.bind(this.loadMoreIfNeeded));
+
+            // do not propagate change event from the search field out of the component
+            $(this.container).on("change", ".select2-input", function(e) {e.stopPropagation();});
+            $(this.dropdown).on("change", ".select2-input", function(e) {e.stopPropagation();});
+
+            // if jquery.mousewheel plugin is installed we can prevent out-of-bounds scrolling of results via mousewheel
+            if ($.fn.mousewheel) {
+                results.mousewheel(function (e, delta, deltaX, deltaY) {
+                    var top = results.scrollTop(), height;
+                    if (deltaY > 0 && top - deltaY <= 0) {
+                        results.scrollTop(0);
+                        killEvent(e);
+                    } else if (deltaY < 0 && results.get(0).scrollHeight - results.scrollTop() + deltaY <= results.height()) {
+                        results.scrollTop(results.get(0).scrollHeight - results.height());
+                        killEvent(e);
+                    }
+                });
+            }
+
+            installKeyUpChangeEvent(search);
+            search.on("keyup-change input paste", this.bind(this.updateResults));
+            search.on("focus", function () { search.addClass("select2-focused"); });
+            search.on("blur", function () { search.removeClass("select2-focused");});
+
+            this.dropdown.on("mouseup", resultsSelector, this.bind(function (e) {
+                if ($(e.target).closest(".select2-result-selectable").length > 0) {
+                    this.highlightUnderEvent(e);
+                    this.selectHighlighted(e);
+                }
+            }));
+
+            // trap all mouse events from leaving the dropdown. sometimes there may be a modal that is listening
+            // for mouse events outside of itself so it can close itself. since the dropdown is now outside the select2's
+            // dom it will trigger the popup close, which is not what we want
+            this.dropdown.on("click mouseup mousedown", function (e) { e.stopPropagation(); });
+
+            if ($.isFunction(this.opts.initSelection)) {
+                // initialize selection based on the current value of the source element
+                this.initSelection();
+
+                // if the user has provided a function that can set selection based on the value of the source element
+                // we monitor the change event on the element and trigger it, allowing for two way synchronization
+                this.monitorSource();
+            }
+
+            if (opts.maximumInputLength !== null) {
+                this.search.attr("maxlength", opts.maximumInputLength);
+            }
+
+            var disabled = opts.element.prop("disabled");
+            if (disabled === undefined) disabled = false;
+            this.enable(!disabled);
+
+            var readonly = opts.element.prop("readonly");
+            if (readonly === undefined) readonly = false;
+            this.readonly(readonly);
+
+            // Calculate size of scrollbar
+            scrollBarDimensions = scrollBarDimensions || measureScrollbar();
+
+            this.autofocus = opts.element.prop("autofocus")
+            opts.element.prop("autofocus", false);
+            if (this.autofocus) this.focus();
+        },
+
+        // abstract
+        destroy: function () {
+            var element=this.opts.element, select2 = element.data("select2");
+
+            if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; }
+
+            if (select2 !== undefined) {
+                select2.container.remove();
+                select2.dropdown.remove();
+                element
+                    .removeClass("select2-offscreen")
+                    .removeData("select2")
+                    .off(".select2")
+                    .prop("autofocus", this.autofocus || false);
+                if (this.elementTabIndex) {
+                    element.attr({tabindex: this.elementTabIndex});
+                } else {
+                    element.removeAttr("tabindex");
+                }
+                element.show();
+            }
+        },
+
+        // abstract
+        optionToData: function(element) {
+            if (element.is("option")) {
+                return {
+                    id:element.prop("value"),
+                    text:element.text(),
+                    element: element.get(),
+                    css: element.attr("class"),
+                    disabled: element.prop("disabled"),
+                    locked: equal(element.attr("locked"), "locked") || equal(element.data("locked"), true)
+                };
+            } else if (element.is("optgroup")) {
+                return {
+                    text:element.attr("label"),
+                    children:[],
+                    element: element.get(),
+                    css: element.attr("class")
+                };
+            }
+        },
+
+        // abstract
+        prepareOpts: function (opts) {
+            var element, select, idKey, ajaxUrl, self = this;
+
+            element = opts.element;
+
+            if (element.get(0).tagName.toLowerCase() === "select") {
+                this.select = select = opts.element;
+            }
+
+            if (select) {
+                // these options are not allowed when attached to a select because they are picked up off the element itself
+                $.each(["id", "multiple", "ajax", "query", "createSearchChoice", "initSelection", "data", "tags"], function () {
+                    if (this in opts) {
+                        throw new Error("Option '" + this + "' is not allowed for Select2 when attached to a <select> element.");
+                    }
+                });
+            }
+
+            opts = $.extend({}, {
+                populateResults: function(container, results, query) {
+                    var populate,  data, result, children, id=this.opts.id;
+
+                    populate=function(results, container, depth) {
+
+                        var i, l, result, selectable, disabled, compound, node, label, innerContainer, formatted;
+
+                        results = opts.sortResults(results, container, query);
+
+                        for (i = 0, l = results.length; i < l; i = i + 1) {
+
+                            result=results[i];
+
+                            disabled = (result.disabled === true);
+                            selectable = (!disabled) && (id(result) !== undefined);
+
+                            compound=result.children && result.children.length > 0;
+
+                            node=$("<li></li>");
+                            node.addClass("select2-results-dept-"+depth);
+                            node.addClass("select2-result");
+                            node.addClass(selectable ? "select2-result-selectable" : "select2-result-unselectable");
+                            if (disabled) { node.addClass("select2-disabled"); }
+                            if (compound) { node.addClass("select2-result-with-children"); }
+                            node.addClass(self.opts.formatResultCssClass(result));
+
+                            label=$(document.createElement("div"));
+                            label.addClass("select2-result-label");
+
+                            formatted=opts.formatResult(result, label, query, self.opts.escapeMarkup);
+                            if (formatted!==undefined) {
+                                label.html(formatted);
+                            }
+
+                            node.append(label);
+
+                            if (compound) {
+
+                                innerContainer=$("<ul></ul>");
+                                innerContainer.addClass("select2-result-sub");
+                                populate(result.children, innerContainer, depth+1);
+                                node.append(innerContainer);
+                            }
+
+                            node.data("select2-data", result);
+                            container.append(node);
+                        }
+                    };
+
+                    populate(results, container, 0);
+                }
+            }, $.fn.select2.defaults, opts);
+
+            if (typeof(opts.id) !== "function") {
+                idKey = opts.id;
+                opts.id = function (e) { return e[idKey]; };
+            }
+
+            if ($.isArray(opts.element.data("select2Tags"))) {
+                if ("tags" in opts) {
+                    throw "tags specified as both an attribute 'data-select2-tags' and in options of Select2 " + opts.element.attr("id");
+                }
+                opts.tags=opts.element.data("select2Tags");
+            }
+
+            if (select) {
+                opts.query = this.bind(function (query) {
+                    var data = { results: [], more: false },
+                        term = query.term,
+                        children, placeholderOption, process;
+
+                    process=function(element, collection) {
+                        var group;
+                        if (element.is("option")) {
+                            if (query.matcher(term, element.text(), element)) {
+                                collection.push(self.optionToData(element));
+                            }
+                        } else if (element.is("optgroup")) {
+                            group=self.optionToData(element);
+                            element.children().each2(function(i, elm) { process(elm, group.children); });
+                            if (group.children.length>0) {
+                                collection.push(group);
+                            }
+                        }
+                    };
+
+                    children=element.children();
+
+                    // ignore the placeholder option if there is one
+                    if (this.getPlaceholder() !== undefined && children.length > 0) {
+                        placeholderOption = this.getPlaceholderOption();
+                        if (placeholderOption) {
+                            children=children.not(placeholderOption);
+                        }
+                    }
+
+                    children.each2(function(i, elm) { process(elm, data.results); });
+
+                    query.callback(data);
+                });
+                // this is needed because inside val() we construct choices from options and there id is hardcoded
+                opts.id=function(e) { return e.id; };
+                opts.formatResultCssClass = function(data) { return data.css; };
+            } else {
+                if (!("query" in opts)) {
+
+                    if ("ajax" in opts) {
+                        ajaxUrl = opts.element.data("ajax-url");
+                        if (ajaxUrl && ajaxUrl.length > 0) {
+                            opts.ajax.url = ajaxUrl;
+                        }
+                        opts.query = ajax.call(opts.element, opts.ajax);
+                    } else if ("data" in opts) {
+                        opts.query = local(opts.data);
+                    } else if ("tags" in opts) {
+                        opts.query = tags(opts.tags);
+                        if (opts.createSearchChoice === undefined) {
+                            opts.createSearchChoice = function (term) { return {id: term, text: term}; };
+                        }
+                        if (opts.initSelection === undefined) {
+                            opts.initSelection = function (element, callback) {
+                                var data = [];
+                                $(splitVal(element.val(), opts.separator)).each(function () {
+                                    var id = this, text = this, tags=opts.tags;
+                                    if ($.isFunction(tags)) tags=tags();
+                                    $(tags).each(function() { if (equal(this.id, id)) { text = this.text; return false; } });
+                                    data.push({id: id, text: text});
+                                });
+
+                                callback(data);
+                            };
+                        }
+                    }
+                }
+            }
+            if (typeof(opts.query) !== "function") {
+                throw "query function not defined for Select2 " + opts.element.attr("id");
+            }
+
+            return opts;
+        },
+
+        /**
+         * Monitor the original element for changes and update select2 accordingly
+         */
+        // abstract
+        monitorSource: function () {
+            var el = this.opts.element, sync;
+
+            el.on("change.select2", this.bind(function (e) {
+                if (this.opts.element.data("select2-change-triggered") !== true) {
+                    this.initSelection();
+                }
+            }));
+
+            sync = this.bind(function () {
+
+                var enabled, readonly, self = this;
+
+                // sync enabled state
+                var disabled = el.prop("disabled");
+                if (disabled === undefined) disabled = false;
+                this.enable(!disabled);
+
+                var readonly = el.prop("readonly");
+                if (readonly === undefined) readonly = false;
+                this.readonly(readonly);
+
+                syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
+                this.container.addClass(evaluate(this.opts.containerCssClass));
+
+                syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass);
+                this.dropdown.addClass(evaluate(this.opts.dropdownCssClass));
+
+            });
+
+            // mozilla and IE
+            el.on("propertychange.select2 DOMAttrModified.select2", sync);
+
+
+            // hold onto a reference of the callback to work around a chromium bug
+            if (this.mutationCallback === undefined) {
+                this.mutationCallback = function (mutations) {
+                    mutations.forEach(sync);
+                }
+            }
+
+            // safari and chrome
+            if (typeof WebKitMutationObserver !== "undefined") {
+                if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; }
+                this.propertyObserver = new WebKitMutationObserver(this.mutationCallback);
+                this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false });
+            }
+        },
+
+        // abstract
+        triggerSelect: function(data) {
+            var evt = $.Event("select2-selecting", { val: this.id(data), object: data });
+            this.opts.element.trigger(evt);
+            return !evt.isDefaultPrevented();
+        },
+
+        /**
+         * Triggers the change event on the source element
+         */
+        // abstract
+        triggerChange: function (details) {
+
+            details = details || {};
+            details= $.extend({}, details, { type: "change", val: this.val() });
+            // prevents recursive triggering
+            this.opts.element.data("select2-change-triggered", true);
+            this.opts.element.trigger(details);
+            this.opts.element.data("select2-change-triggered", false);
+
+            // some validation frameworks ignore the change event and listen instead to keyup, click for selects
+            // so here we trigger the click event manually
+            this.opts.element.click();
+
+            // ValidationEngine ignorea the change event and listens instead to blur
+            // so here we trigger the blur event manually if so desired
+            if (this.opts.blurOnChange)
+                this.opts.element.blur();
+        },
+
+        //abstract
+        isInterfaceEnabled: function()
+        {
+            return this.enabledInterface === true;
+        },
+
+        // abstract
+        enableInterface: function() {
+            var enabled = this._enabled && !this._readonly,
+                disabled = !enabled;
+
+            if (enabled === this.enabledInterface) return false;
+
+            this.container.toggleClass("select2-container-disabled", disabled);
+            this.close();
+            this.enabledInterface = enabled;
+
+            return true;
+        },
+
+        // abstract
+        enable: function(enabled) {
+            if (enabled === undefined) enabled = true;
+            if (this._enabled === enabled) return false;
+            this._enabled = enabled;
+
+            this.opts.element.prop("disabled", !enabled);
+            this.enableInterface();
+            return true;
+        },
+
+        // abstract
+        readonly: function(enabled) {
+            if (enabled === undefined) enabled = false;
+            if (this._readonly === enabled) return false;
+            this._readonly = enabled;
+
+            this.opts.element.prop("readonly", enabled);
+            this.enableInterface();
+            return true;
+        },
+
+        // abstract
+        opened: function () {
+            return this.container.hasClass("select2-dropdown-open");
+        },
+
+        // abstract
+        positionDropdown: function() {
+            var $dropdown = this.dropdown,
+                offset = this.container.offset(),
+                height = this.container.outerHeight(false),
+                width = this.container.outerWidth(false),
+                dropHeight = $dropdown.outerHeight(false),
+                viewPortRight = $(window).scrollLeft() + $(window).width(),
+                viewportBottom = $(window).scrollTop() + $(window).height(),
+                dropTop = offset.top + height,
+                dropLeft = offset.left,
+                enoughRoomBelow = dropTop + dropHeight <= viewportBottom,
+                enoughRoomAbove = (offset.top - dropHeight) >= this.body().scrollTop(),
+                dropWidth = $dropdown.outerWidth(false),
+                enoughRoomOnRight = dropLeft + dropWidth <= viewPortRight,
+                aboveNow = $dropdown.hasClass("select2-drop-above"),
+                bodyOffset,
+                above,
+                css,
+                resultsListNode;
+
+            if (this.opts.dropdownAutoWidth) {
+                resultsListNode = $('.select2-results', $dropdown)[0];
+                $dropdown.addClass('select2-drop-auto-width');
+                $dropdown.css('width', '');
+                // Add scrollbar width to dropdown if vertical scrollbar is present
+                dropWidth = $dropdown.outerWidth(false) + (resultsListNode.scrollHeight === resultsListNode.clientHeight ? 0 : scrollBarDimensions.width);
+                dropWidth > width ? width = dropWidth : dropWidth = width;
+                enoughRoomOnRight = dropLeft + dropWidth <= viewPortRight;
+            }
+            else {
+                this.container.removeClass('select2-drop-auto-width');
+            }
+
+            //console.log("below/ droptop:", dropTop, "dropHeight", dropHeight, "sum", (dropTop+dropHeight)+" viewport bottom", viewportBottom, "enough?", enoughRoomBelow);
+            //console.log("above/ offset.top", offset.top, "dropHeight", dropHeight, "top", (offset.top-dropHeight), "scrollTop", this.body().scrollTop(), "enough?", enoughRoomAbove);
+
+            // fix positioning when body has an offset and is not position: static
+            if (this.body().css('position') !== 'static') {
+                bodyOffset = this.body().offset();
+                dropTop -= bodyOffset.top;
+                dropLeft -= bodyOffset.left;
+            }
+
+            // always prefer the current above/below alignment, unless there is not enough room
+            if (aboveNow) {
+                above = true;
+                if (!enoughRoomAbove && enoughRoomBelow) above = false;
+            } else {
+                above = false;
+                if (!enoughRoomBelow && enoughRoomAbove) above = true;
+            }
+
+            if (!enoughRoomOnRight) {
+               dropLeft = offset.left + width - dropWidth;
+            }
+
+            if (above) {
+                dropTop = offset.top - dropHeight;
+                this.container.addClass("select2-drop-above");
+                $dropdown.addClass("select2-drop-above");
+            }
+            else {
+                this.container.removeClass("select2-drop-above");
+                $dropdown.removeClass("select2-drop-above");
+            }
+
+            css = $.extend({
+                top: dropTop,
+                left: dropLeft,
+                width: width
+            }, evaluate(this.opts.dropdownCss));
+
+            $dropdown.css(css);
+        },
+
+        // abstract
+        shouldOpen: function() {
+            var event;
+
+            if (this.opened()) return false;
+
+            if (this._enabled === false || this._readonly === true) return false;
+
+            event = $.Event("select2-opening");
+            this.opts.element.trigger(event);
+            return !event.isDefaultPrevented();
+        },
+
+        // abstract
+        clearDropdownAlignmentPreference: function() {
+            // clear the classes used to figure out the preference of where the dropdown should be opened
+            this.container.removeClass("select2-drop-above");
+            this.dropdown.removeClass("select2-drop-above");
+        },
+
+        /**
+         * Opens the dropdown
+         *
+         * @return {Boolean} whether or not dropdown was opened. This method will return false if, for example,
+         * the dropdown is already open, or if the 'open' event listener on the element called preventDefault().
+         */
+        // abstract
+        open: function () {
+
+            if (!this.shouldOpen()) return false;
+
+            this.opening();
+
+            return true;
+        },
+
+        /**
+         * Performs the opening of the dropdown
+         */
+        // abstract
+        opening: function() {
+            var cid = this.containerId,
+                scroll = "scroll." + cid,
+                resize = "resize."+cid,
+                orient = "orientationchange."+cid,
+                mask, maskCss;
+
+            this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
+
+            this.clearDropdownAlignmentPreference();
+
+            if(this.dropdown[0] !== this.body().children().last()[0]) {
+                this.dropdown.detach().appendTo(this.body());
+            }
+
+            // create the dropdown mask if doesnt already exist
+            mask = $("#select2-drop-mask");
+            if (mask.length == 0) {
+                mask = $(document.createElement("div"));
+                mask.attr("id","select2-drop-mask").attr("class","select2-drop-mask");
+                mask.hide();
+                mask.appendTo(this.body());
+                mask.on("mousedown touchstart click", function (e) {
+                    var dropdown = $("#select2-drop"), self;
+                    if (dropdown.length > 0) {
+                        self=dropdown.data("select2");
+                        if (self.opts.selectOnBlur) {
+                            self.selectHighlighted({noFocus: true});
+                        }
+                        self.close();
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+                });
+            }
+
+            // ensure the mask is always right before the dropdown
+            if (this.dropdown.prev()[0] !== mask[0]) {
+                this.dropdown.before(mask);
+            }
+
+            // move the global id to the correct dropdown
+            $("#select2-drop").removeAttr("id");
+            this.dropdown.attr("id", "select2-drop");
+
+            // show the elements
+            maskCss=_makeMaskCss();
+
+            mask.css(maskCss).show();
+
+            this.dropdown.show();
+            this.positionDropdown();
+
+            this.dropdown.addClass("select2-drop-active");
+
+            // attach listeners to events that can change the position of the container and thus require
+            // the position of the dropdown to be updated as well so it does not come unglued from the container
+            var that = this;
+            this.container.parents().add(window).each(function () {
+                $(this).on(resize+" "+scroll+" "+orient, function (e) {
+                    var maskCss=_makeMaskCss();
+                    $("#select2-drop-mask").css(maskCss);
+                    that.positionDropdown();
+                });
+            });
+
+            function _makeMaskCss() {
+                return {
+                    width  : Math.max(document.documentElement.scrollWidth,  $(window).width()),
+                    height : Math.max(document.documentElement.scrollHeight, $(window).height())
+                }
+            }
+        },
+
+        // abstract
+        close: function () {
+            if (!this.opened()) return;
+
+            var cid = this.containerId,
+                scroll = "scroll." + cid,
+                resize = "resize."+cid,
+                orient = "orientationchange."+cid;
+
+            // unbind event listeners
+            this.container.parents().add(window).each(function () { $(this).off(scroll).off(resize).off(orient); });
+
+            this.clearDropdownAlignmentPreference();
+
+            $("#select2-drop-mask").hide();
+            this.dropdown.removeAttr("id"); // only the active dropdown has the select2-drop id
+            this.dropdown.hide();
+            this.container.removeClass("select2-dropdown-open");
+            this.results.empty();
+
+
+            this.clearSearch();
+            this.search.removeClass("select2-active");
+            this.opts.element.trigger($.Event("select2-close"));
+        },
+
+        /**
+         * Opens control, sets input value, and updates results.
+         */
+        // abstract
+        externalSearch: function (term) {
+            this.open();
+            this.search.val(term);
+            this.updateResults(false);
+        },
+
+        // abstract
+        clearSearch: function () {
+
+        },
+
+        //abstract
+        getMaximumSelectionSize: function() {
+            return evaluate(this.opts.maximumSelectionSize);
+        },
+
+        // abstract
+        ensureHighlightVisible: function () {
+            var results = this.results, children, index, child, hb, rb, y, more;
+
+            index = this.highlight();
+
+            if (index < 0) return;
+
+            if (index == 0) {
+
+                // if the first element is highlighted scroll all the way to the top,
+                // that way any unselectable headers above it will also be scrolled
+                // into view
+
+                results.scrollTop(0);
+                return;
+            }
+
+            children = this.findHighlightableChoices().find('.select2-result-label');
+
+            child = $(children[index]);
+
+            hb = child.offset().top + child.outerHeight(true);
+
+            // if this is the last child lets also make sure select2-more-results is visible
+            if (index === children.length - 1) {
+                more = results.find("li.select2-more-results");
+                if (more.length > 0) {
+                    hb = more.offset().top + more.outerHeight(true);
+                }
+            }
+
+            rb = results.offset().top + results.outerHeight(true);
+            if (hb > rb) {
+                results.scrollTop(results.scrollTop() + (hb - rb));
+            }
+            y = child.offset().top - results.offset().top;
+
+            // make sure the top of the element is visible
+            if (y < 0 && child.css('display') != 'none' ) {
+                results.scrollTop(results.scrollTop() + y); // y is negative
+            }
+        },
+
+        // abstract
+        findHighlightableChoices: function() {
+            return this.results.find(".select2-result-selectable:not(.select2-selected):not(.select2-disabled)");
+        },
+
+        // abstract
+        moveHighlight: function (delta) {
+            var choices = this.findHighlightableChoices(),
+                index = this.highlight();
+
+            while (index > -1 && index < choices.length) {
+                index += delta;
+                var choice = $(choices[index]);
+                if (choice.hasClass("select2-result-selectable") && !choice.hasClass("select2-disabled") && !choice.hasClass("select2-selected")) {
+                    this.highlight(index);
+                    break;
+                }
+            }
+        },
+
+        // abstract
+        highlight: function (index) {
+            var choices = this.findHighlightableChoices(),
+                choice,
+                data;
+
+            if (arguments.length === 0) {
+                return indexOf(choices.filter(".select2-highlighted")[0], choices.get());
+            }
+
+            if (index >= choices.length) index = choices.length - 1;
+            if (index < 0) index = 0;
+
+            this.results.find(".select2-highlighted").removeClass("select2-highlighted");
+
+            choice = $(choices[index]);
+            choice.addClass("select2-highlighted");
+
+            this.ensureHighlightVisible();
+
+            data = choice.data("select2-data");
+            if (data) {
+                this.opts.element.trigger({ type: "select2-highlight", val: this.id(data), choice: data });
+            }
+        },
+
+        // abstract
+        countSelectableResults: function() {
+            return this.findHighlightableChoices().length;
+        },
+
+        // abstract
+        highlightUnderEvent: function (event) {
+            var el = $(event.target).closest(".select2-result-selectable");
+            if (el.length > 0 && !el.is(".select2-highlighted")) {
+                var choices = this.findHighlightableChoices();
+                this.highlight(choices.index(el));
+            } else if (el.length == 0) {
+                // if we are over an unselectable item remove al highlights
+                this.results.find(".select2-highlighted").removeClass("select2-highlighted");
+            }
+        },
+
+        // abstract
+        loadMoreIfNeeded: function () {
+            var results = this.results,
+                more = results.find("li.select2-more-results"),
+                below, // pixels the element is below the scroll fold, below==0 is when the element is starting to be visible
+                offset = -1, // index of first element without data
+                page = this.resultsPage + 1,
+                self=this,
+                term=this.search.val(),
+                context=this.context;
+
+            if (more.length === 0) return;
+            below = more.offset().top - results.offset().top - results.height();
+
+            if (below <= this.opts.loadMorePadding) {
+                more.addClass("select2-active");
+                this.opts.query({
+                        element: this.opts.element,
+                        term: term,
+                        page: page,
+                        context: context,
+                        matcher: this.opts.matcher,
+                        callback: this.bind(function (data) {
+
+                    // ignore a response if the select2 has been closed before it was received
+                    if (!self.opened()) return;
+
+
+                    self.opts.populateResults.call(this, results, data.results, {term: term, page: page, context:context});
+                    self.postprocessResults(data, false, false);
+
+                    if (data.more===true) {
+                        more.detach().appendTo(results).text(self.opts.formatLoadMore(page+1));
+                        window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
+                    } else {
+                        more.remove();
+                    }
+                    self.positionDropdown();
+                    self.resultsPage = page;
+                    self.context = data.context;
+                })});
+            }
+        },
+
+        /**
+         * Default tokenizer function which does nothing
+         */
+        tokenize: function() {
+
+        },
+
+        /**
+         * @param initial whether or not this is the call to this method right after the dropdown has been opened
+         */
+        // abstract
+        updateResults: function (initial) {
+            var search = this.search,
+                results = this.results,
+                opts = this.opts,
+                data,
+                self = this,
+                input,
+                term = search.val(),
+                lastTerm=$.data(this.container, "select2-last-term");
+
+            // prevent duplicate queries against the same term
+            if (initial !== true && lastTerm && equal(term, lastTerm)) return;
+
+            $.data(this.container, "select2-last-term", term);
+
+            // if the search is currently hidden we do not alter the results
+            if (initial !== true && (this.showSearchInput === false || !this.opened())) {
+                return;
+            }
+
+            function postRender() {
+                search.removeClass("select2-active");
+                self.positionDropdown();
+            }
+
+            function render(html) {
+                results.html(html);
+                postRender();
+            }
+
+            var maxSelSize = this.getMaximumSelectionSize();
+            if (maxSelSize >=1) {
+                data = this.data();
+                if ($.isArray(data) && data.length >= maxSelSize && checkFormatter(opts.formatSelectionTooBig, "formatSelectionTooBig")) {
+                    render("<li class='select2-selection-limit'>" + opts.formatSelectionTooBig(maxSelSize) + "</li>");
+                    return;
+                }
+            }
+
+            if (search.val().length < opts.minimumInputLength) {
+                if (checkFormatter(opts.formatInputTooShort, "formatInputTooShort")) {
+                    render("<li class='select2-no-results'>" + opts.formatInputTooShort(search.val(), opts.minimumInputLength) + "</li>");
+                } else {
+                    render("");
+                }
+                if (initial && this.showSearch) this.showSearch(true);
+                return;
+            }
+
+            if (opts.maximumInputLength && search.val().length > opts.maximumInputLength) {
+                if (checkFormatter(opts.formatInputTooLong, "formatInputTooLong")) {
+                    render("<li class='select2-no-results'>" + opts.formatInputTooLong(search.val(), opts.maximumInputLength) + "</li>");
+                } else {
+                    render("");
+                }
+                return;
+            }
+
+            if (opts.formatSearching && this.findHighlightableChoices().length === 0) {
+                render("<li class='select2-searching'>" + opts.formatSearching() + "</li>");
+            }
+
+            search.addClass("select2-active");
+
+            // give the tokenizer a chance to pre-process the input
+            input = this.tokenize();
+            if (input != undefined && input != null) {
+                search.val(input);
+            }
+
+            this.resultsPage = 1;
+
+            opts.query({
+                element: opts.element,
+                    term: search.val(),
+                    page: this.resultsPage,
+                    context: null,
+                    matcher: opts.matcher,
+                    callback: this.bind(function (data) {
+                var def; // default choice
+
+                // ignore a response if the select2 has been closed before it was received
+                if (!this.opened()) {
+                    this.search.removeClass("select2-active");
+                    return;
+                }
+
+                // save context, if any
+                this.context = (data.context===undefined) ? null : data.context;
+                // create a default choice and prepend it to the list
+                if (this.opts.createSearchChoice && search.val() !== "") {
+                    def = this.opts.createSearchChoice.call(self, search.val(), data.results);
+                    if (def !== undefined && def !== null && self.id(def) !== undefined && self.id(def) !== null) {
+                        if ($(data.results).filter(
+                            function () {
+                                return equal(self.id(this), self.id(def));
+                            }).length === 0) {
+                            data.results.unshift(def);
+                        }
+                    }
+                }
+
+                if (data.results.length === 0 && checkFormatter(opts.formatNoMatches, "formatNoMatches")) {
+                    render("<li class='select2-no-results'>" + opts.formatNoMatches(search.val()) + "</li>");
+                    return;
+                }
+
+                results.empty();
+                self.opts.populateResults.call(this, results, data.results, {term: search.val(), page: this.resultsPage, context:null});
+
+                if (data.more === true && checkFormatter(opts.formatLoadMore, "formatLoadMore")) {
+                    results.append("<li class='select2-more-results'>" + self.opts.escapeMarkup(opts.formatLoadMore(this.resultsPage)) + "</li>");
+                    window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
+                }
+
+                this.postprocessResults(data, initial);
+
+                postRender();
+
+                this.opts.element.trigger({ type: "select2-loaded", items: data });
+            })});
+        },
+
+        // abstract
+        cancel: function () {
+            this.close();
+        },
+
+        // abstract
+        blur: function () {
+            // if selectOnBlur == true, select the currently highlighted option
+            if (this.opts.selectOnBlur)
+                this.selectHighlighted({noFocus: true});
+
+            this.close();
+            this.container.removeClass("select2-container-active");
+            // synonymous to .is(':focus'), which is available in jquery >= 1.6
+            if (this.search[0] === document.activeElement) { this.search.blur(); }
+            this.clearSearch();
+            this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
+        },
+
+        // abstract
+        focusSearch: function () {
+            focus(this.search);
+        },
+
+        // abstract
+        selectHighlighted: function (options) {
+            var index=this.highlight(),
+                highlighted=this.results.find(".select2-highlighted"),
+                data = highlighted.closest('.select2-result').data("select2-data");
+
+            if (data) {
+                this.highlight(index);
+                this.onSelect(data, options);
+            } else if (options && options.noFocus) {
+                this.close();
+            }
+        },
+
+        // abstract
+        getPlaceholder: function () {
+            var placeholderOption;
+            return this.opts.element.attr("placeholder") ||
+                this.opts.element.attr("data-placeholder") || // jquery 1.4 compat
+                this.opts.element.data("placeholder") ||
+                this.opts.placeholder ||
+                ((placeholderOption = this.getPlaceholderOption()) !== undefined ? placeholderOption.text() : undefined);
+        },
+
+        // abstract
+        getPlaceholderOption: function() {
+            if (this.select) {
+                var firstOption = this.select.children().first();
+                if (this.opts.placeholderOption !== undefined ) {
+                    //Determine the placeholder option based on the specified placeholderOption setting
+                    return (this.opts.placeholderOption === "first" && firstOption) ||
+                           (typeof this.opts.placeholderOption === "function" && this.opts.placeholderOption(this.select));
+                } else if (firstOption.text() === "" && firstOption.val() === "") {
+                    //No explicit placeholder option specified, use the first if it's blank
+                    return firstOption;
+                }
+            }
+        },
+
+        /**
+         * Get the desired width for the container element.  This is
+         * derived first from option `width` passed to select2, then
+         * the inline 'style' on the original element, and finally
+         * falls back to the jQuery calculated element width.
+         */
+        // abstract
+        initContainerWidth: function () {
+            function resolveContainerWidth() {
+                var style, attrs, matches, i, l;
+
+                if (this.opts.width === "off") {
+                    return null;
+                } else if (this.opts.width === "element"){
+                    return this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px';
+                } else if (this.opts.width === "copy" || this.opts.width === "resolve") {
+                    // check if there is inline style on the element that contains width
+                    style = this.opts.element.attr('style');
+                    if (style !== undefined) {
+                        attrs = style.split(';');
+                        for (i = 0, l = attrs.length; i < l; i = i + 1) {
+                            matches = attrs[i].replace(/\s/g, '')
+                                .match(/width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i);
+                            if (matches !== null && matches.length >= 1)
+                                return matches[1];
+                        }
+                    }
+
+                    if (this.opts.width === "resolve") {
+                        // next check if css('width') can resolve a width that is percent based, this is sometimes possible
+                        // when attached to input type=hidden or elements hidden via css
+                        style = this.opts.element.css('width');
+                        if (style.indexOf("%") > 0) return style;
+
+                        // finally, fallback on the calculated width of the element
+                        return (this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px');
+                    }
+
+                    return null;
+                } else if ($.isFunction(this.opts.width)) {
+                    return this.opts.width();
+                } else {
+                    return this.opts.width;
+               }
+            };
+
+            var width = resolveContainerWidth.call(this);
+            if (width !== null) {
+                this.container.css("width", width);
+            }
+        }
+    });
+
+    SingleSelect2 = clazz(AbstractSelect2, {
+
+        // single
+
+        createContainer: function () {
+            var container = $(document.createElement("div")).attr({
+                "class": "select2-container"
+            }).html([
+                "<a href='javascript:void(0)' onclick='return false;' class='select2-choice' tabindex='-1'>",
+                "   <span class='select2-chosen'>&nbsp;</span><abbr class='select2-search-choice-close'></abbr>",
+                "   <span class='select2-arrow'><b></b></span>",
+                "</a>",
+                "<input class='select2-focusser select2-offscreen' type='text'/>",
+                "<div class='select2-drop select2-display-none'>",
+                "   <div class='select2-search'>",
+                "       <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input'/>",
+                "   </div>",
+                "   <ul class='select2-results'>",
+                "   </ul>",
+                "</div>"].join(""));
+            return container;
+        },
+
+        // single
+        enableInterface: function() {
+            if (this.parent.enableInterface.apply(this, arguments)) {
+                this.focusser.prop("disabled", !this.isInterfaceEnabled());
+            }
+        },
+
+        // single
+        opening: function () {
+            var el, range, len;
+
+            if (this.opts.minimumResultsForSearch >= 0) {
+                this.showSearch(true);
+            }
+
+            this.parent.opening.apply(this, arguments);
+
+            if (this.showSearchInput !== false) {
+                // IE appends focusser.val() at the end of field :/ so we manually insert it at the beginning using a range
+                // all other browsers handle this just fine
+
+                this.search.val(this.focusser.val());
+            }
+            this.search.focus();
+            // move the cursor to the end after focussing, otherwise it will be at the beginning and
+            // new text will appear *before* focusser.val()
+            el = this.search.get(0);
+            if (el.createTextRange) {
+                range = el.createTextRange();
+                range.collapse(false);
+                range.select();
+            } else if (el.setSelectionRange) {
+                len = this.search.val().length;
+                el.setSelectionRange(len, len);
+            }
+
+            this.focusser.prop("disabled", true).val("");
+            this.updateResults(true);
+            this.opts.element.trigger($.Event("select2-open"));
+        },
+
+        // single
+        close: function () {
+            if (!this.opened()) return;
+            this.parent.close.apply(this, arguments);
+            this.focusser.removeAttr("disabled");
+            this.focusser.focus();
+        },
+
+        // single
+        focus: function () {
+            if (this.opened()) {
+                this.close();
+            } else {
+                this.focusser.removeAttr("disabled");
+                this.focusser.focus();
+            }
+        },
+
+        // single
+        isFocused: function () {
+            return this.container.hasClass("select2-container-active");
+        },
+
+        // single
+        cancel: function () {
+            this.parent.cancel.apply(this, arguments);
+            this.focusser.removeAttr("disabled");
+            this.focusser.focus();
+        },
+
+        // single
+        initContainer: function () {
+
+            var selection,
+                container = this.container,
+                dropdown = this.dropdown;
+
+            if (this.opts.minimumResultsForSearch < 0) {
+                this.showSearch(false);
+            } else {
+                this.showSearch(true);
+            }
+
+            this.selection = selection = container.find(".select2-choice");
+
+            this.focusser = container.find(".select2-focusser");
+
+            // rewrite labels from original element to focusser
+            this.focusser.attr("id", "s2id_autogen"+nextUid());
+
+            $("label[for='" + this.opts.element.attr("id") + "']")
+                .attr('for', this.focusser.attr('id'));
+
+            this.focusser.attr("tabindex", this.elementTabIndex);
+
+            this.search.on("keydown", this.bind(function (e) {
+                if (!this.isInterfaceEnabled()) return;
+
+                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
+                    // prevent the page from scrolling
+                    killEvent(e);
+                    return;
+                }
+
+                switch (e.which) {
+                    case KEY.UP:
+                    case KEY.DOWN:
+                        this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
+                        killEvent(e);
+                        return;
+                    case KEY.ENTER:
+                        this.selectHighlighted();
+                        killEvent(e);
+                        return;
+                    case KEY.TAB:
+                        this.selectHighlighted({noFocus: true});
+                        return;
+                    case KEY.ESC:
+                        this.cancel(e);
+                        killEvent(e);
+                        return;
+                }
+            }));
+
+            this.search.on("blur", this.bind(function(e) {
+                // a workaround for chrome to keep the search field focussed when the scroll bar is used to scroll the dropdown.
+                // without this the search field loses focus which is annoying
+                if (document.activeElement === this.body().get(0)) {
+                    window.setTimeout(this.bind(function() {
+                        this.search.focus();
+                    }), 0);
+                }
+            }));
+
+            this.focusser.on("keydown", this.bind(function (e) {
+                if (!this.isInterfaceEnabled()) return;
+
+                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) {
+                    return;
+                }
+
+                if (this.opts.openOnEnter === false && e.which === KEY.ENTER) {
+                    killEvent(e);
+                    return;
+                }
+
+                if (e.which == KEY.DOWN || e.which == KEY.UP
+                    || (e.which == KEY.ENTER && this.opts.openOnEnter)) {
+
+                    if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) return;
+
+                    this.open();
+                    killEvent(e);
+                    return;
+                }
+
+                if (e.which == KEY.DELETE || e.which == KEY.BACKSPACE) {
+                    if (this.opts.allowClear) {
+                        this.clear();
+                    }
+                    killEvent(e);
+                    return;
+                }
+            }));
+
+
+            installKeyUpChangeEvent(this.focusser);
+            this.focusser.on("keyup-change input", this.bind(function(e) {
+                if (this.opts.minimumResultsForSearch >= 0) {
+                    e.stopPropagation();
+                    if (this.opened()) return;
+                    this.open();
+                }
+            }));
+
+            selection.on("mousedown", "abbr", this.bind(function (e) {
+                if (!this.isInterfaceEnabled()) return;
+                this.clear();
+                killEventImmediately(e);
+                this.close();
+                this.selection.focus();
+            }));
+
+            selection.on("mousedown", this.bind(function (e) {
+
+                if (!this.container.hasClass("select2-container-active")) {
+                    this.opts.element.trigger($.Event("select2-focus"));
+                }
+
+                if (this.opened()) {
+                    this.close();
+                } else if (this.isInterfaceEnabled()) {
+                    this.open();
+                }
+
+                killEvent(e);
+            }));
+
+            dropdown.on("mousedown", this.bind(function() { this.search.focus(); }));
+
+            selection.on("focus", this.bind(function(e) {
+                killEvent(e);
+            }));
+
+            this.focusser.on("focus", this.bind(function(){
+                if (!this.container.hasClass("select2-container-active")) {
+                    this.opts.element.trigger($.Event("select2-focus"));
+                }
+                this.container.addClass("select2-container-active");
+            })).on("blur", this.bind(function() {
+                if (!this.opened()) {
+                    this.container.removeClass("select2-container-active");
+                    this.opts.element.trigger($.Event("select2-blur"));
+                }
+            }));
+            this.search.on("focus", this.bind(function(){
+                if (!this.container.hasClass("select2-container-active")) {
+                    this.opts.element.trigger($.Event("select2-focus"));
+                }
+                this.container.addClass("select2-container-active");
+            }));
+
+            this.initContainerWidth();
+            this.opts.element.addClass("select2-offscreen");
+            this.setPlaceholder();
+
+        },
+
+        // single
+        clear: function(triggerChange) {
+            var data=this.selection.data("select2-data");
+            if (data) { // guard against queued quick consecutive clicks
+                var placeholderOption = this.getPlaceholderOption();
+                this.opts.element.val(placeholderOption ? placeholderOption.val() : "");
+                this.selection.find(".select2-chosen").empty();
+                this.selection.removeData("select2-data");
+                this.setPlaceholder();
+
+                if (triggerChange !== false){
+                    this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data });
+                    this.triggerChange({removed:data});
+                }
+            }
+        },
+
+        /**
+         * Sets selection based on source element's value
+         */
+        // single
+        initSelection: function () {
+            var selected;
+            if (this.isPlaceholderOptionSelected()) {
+                this.updateSelection([]);
+                this.close();
+                this.setPlaceholder();
+            } else {
+                var self = this;
+                this.opts.initSelection.call(null, this.opts.element, function(selected){
+                    if (selected !== undefined && selected !== null) {
+                        self.updateSelection(selected);
+                        self.close();
+                        self.setPlaceholder();
+                    }
+                });
+            }
+        },
+
+        isPlaceholderOptionSelected: function() {
+            var placeholderOption;
+            return ((placeholderOption = this.getPlaceholderOption()) !== undefined && placeholderOption.is(':selected')) ||
+                   (this.opts.element.val() === "") ||
+                   (this.opts.element.val() === undefined) ||
+                   (this.opts.element.val() === null);
+        },
+
+        // single
+        prepareOpts: function () {
+            var opts = this.parent.prepareOpts.apply(this, arguments),
+                self=this;
+
+            if (opts.element.get(0).tagName.toLowerCase() === "select") {
+                // install the selection initializer
+                opts.initSelection = function (element, callback) {
+                    var selected = element.find(":selected");
+                    // a single select box always has a value, no need to null check 'selected'
+                    callback(self.optionToData(selected));
+                };
+            } else if ("data" in opts) {
+                // install default initSelection when applied to hidden input and data is local
+                opts.initSelection = opts.initSelection || function (element, callback) {
+                    var id = element.val();
+                    //search in data by id, storing the actual matching item
+                    var match = null;
+                    opts.query({
+                        matcher: function(term, text, el){
+                            var is_match = equal(id, opts.id(el));
+                            if (is_match) {
+                                match = el;
+                            }
+                            return is_match;
+                        },
+                        callback: !$.isFunction(callback) ? $.noop : function() {
+                            callback(match);
+                        }
+                    });
+                };
+            }
+
+            return opts;
+        },
+
+        // single
+        getPlaceholder: function() {
+            // if a placeholder is specified on a single select without a valid placeholder option ignore it
+            if (this.select) {
+                if (this.getPlaceholderOption() === undefined) {
+                    return undefined;
+                }
+            }
+
+            return this.parent.getPlaceholder.apply(this, arguments);
+        },
+
+        // single
+        setPlaceholder: function () {
+            var placeholder = this.getPlaceholder();
+
+            if (this.isPlaceholderOptionSelected() && placeholder !== undefined) {
+
+                // check for a placeholder option if attached to a select
+                if (this.select && this.getPlaceholderOption() === undefined) return;
+
+                this.selection.find(".select2-chosen").html(this.opts.escapeMarkup(placeholder));
+
+                this.selection.addClass("select2-default");
+
+                this.container.removeClass("select2-allowclear");
+            }
+        },
+
+        // single
+        postprocessResults: function (data, initial, noHighlightUpdate) {
+            var selected = 0, self = this, showSearchInput = true;
+
+            // find the selected element in the result list
+
+            this.findHighlightableChoices().each2(function (i, elm) {
+                if (equal(self.id(elm.data("select2-data")), self.opts.element.val())) {
+                    selected = i;
+                    return false;
+                }
+            });
+
+            // and highlight it
+            if (noHighlightUpdate !== false) {
+                if (initial === true && selected >= 0) {
+                    this.highlight(selected);
+                } else {
+                    this.highlight(0);
+                }
+            }
+
+            // hide the search box if this is the first we got the results and there are enough of them for search
+
+            if (initial === true) {
+                var min = this.opts.minimumResultsForSearch;
+                if (min >= 0) {
+                    this.showSearch(countResults(data.results) >= min);
+                }
+            }
+        },
+
+        // single
+        showSearch: function(showSearchInput) {
+            if (this.showSearchInput === showSearchInput) return;
+
+            this.showSearchInput = showSearchInput;
+
+            this.dropdown.find(".select2-search").toggleClass("select2-search-hidden", !showSearchInput);
+            this.dropdown.find(".select2-search").toggleClass("select2-offscreen", !showSearchInput);
+            //add "select2-with-searchbox" to the container if search box is shown
+            $(this.dropdown, this.container).toggleClass("select2-with-searchbox", showSearchInput);
+        },
+
+        // single
+        onSelect: function (data, options) {
+
+            if (!this.triggerSelect(data)) { return; }
+
+            var old = this.opts.element.val(),
+                oldData = this.data();
+
+            this.opts.element.val(this.id(data));
+            this.updateSelection(data);
+
+            this.opts.element.trigger({ type: "select2-selected", val: this.id(data), choice: data });
+
+            this.close();
+
+            if (!options || !options.noFocus)
+                this.selection.focus();
+
+            if (!equal(old, this.id(data))) { this.triggerChange({added:data,removed:oldData}); }
+        },
+
+        // single
+        updateSelection: function (data) {
+
+            var container=this.selection.find(".select2-chosen"), formatted, cssClass;
+
+            this.selection.data("select2-data", data);
+
+            container.empty();
+            formatted=this.opts.formatSelection(data, container, this.opts.escapeMarkup);
+            if (formatted !== undefined) {
+                container.append(formatted);
+            }
+            cssClass=this.opts.formatSelectionCssClass(data, container);
+            if (cssClass !== undefined) {
+                container.addClass(cssClass);
+            }
+
+            this.selection.removeClass("select2-default");
+
+            if (this.opts.allowClear && this.getPlaceholder() !== undefined) {
+                this.container.addClass("select2-allowclear");
+            }
+        },
+
+        // single
+        val: function () {
+            var val,
+                triggerChange = false,
+                data = null,
+                self = this,
+                oldData = this.data();
+
+            if (arguments.length === 0) {
+                return this.opts.element.val();
+            }
+
+            val = arguments[0];
+
+            if (arguments.length > 1) {
+                triggerChange = arguments[1];
+            }
+
+            if (this.select) {
+                this.select
+                    .val(val)
+                    .find(":selected").each2(function (i, elm) {
+                        data = self.optionToData(elm);
+                        return false;
+                    });
+                this.updateSelection(data);
+                this.setPlaceholder();
+                if (triggerChange) {
+                    this.triggerChange({added: data, removed:oldData});
+                }
+            } else {
+                // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
+                if (!val && val !== 0) {
+                    this.clear(triggerChange);
+                    return;
+                }
+                if (this.opts.initSelection === undefined) {
+                    throw new Error("cannot call val() if initSelection() is not defined");
+                }
+                this.opts.element.val(val);
+                this.opts.initSelection(this.opts.element, function(data){
+                    self.opts.element.val(!data ? "" : self.id(data));
+                    self.updateSelection(data);
+                    self.setPlaceholder();
+                    if (triggerChange) {
+                        self.triggerChange({added: data, removed:oldData});
+                    }
+                });
+            }
+        },
+
+        // single
+        clearSearch: function () {
+            this.search.val("");
+            this.focusser.val("");
+        },
+
+        // single
+        data: function(value, triggerChange) {
+            var data;
+
+            if (arguments.length === 0) {
+                data = this.selection.data("select2-data");
+                if (data == undefined) data = null;
+                return data;
+            } else {
+                if (!value || value === "") {
+                    this.clear(triggerChange);
+                } else {
+                    data = this.data();
+                    this.opts.element.val(!value ? "" : this.id(value));
+                    this.updateSelection(value);
+                    if (triggerChange) {
+                        this.triggerChange({added: value, removed:data});
+                    }
+                }
+            }
+        }
+    });
+
+    MultiSelect2 = clazz(AbstractSelect2, {
+
+        // multi
+        createContainer: function () {
+            var container = $(document.createElement("div")).attr({
+                "class": "select2-container select2-container-multi"
+            }).html([
+                "<ul class='select2-choices'>",
+                "  <li class='select2-search-field'>",
+                "    <input type='text' autocomplete='off' autocorrect='off' autocapitilize='off' spellcheck='false' class='select2-input'>",
+                "  </li>",
+                "</ul>",
+                "<div class='select2-drop select2-drop-multi select2-display-none'>",
+                "   <ul class='select2-results'>",
+                "   </ul>",
+                "</div>"].join(""));
+            return container;
+        },
+
+        // multi
+        prepareOpts: function () {
+            var opts = this.parent.prepareOpts.apply(this, arguments),
+                self=this;
+
+            // TODO validate placeholder is a string if specified
+
+            if (opts.element.get(0).tagName.toLowerCase() === "select") {
+                // install sthe selection initializer
+                opts.initSelection = function (element, callback) {
+
+                    var data = [];
+
+                    element.find(":selected").each2(function (i, elm) {
+                        data.push(self.optionToData(elm));
+                    });
+                    callback(data);
+                };
+            } else if ("data" in opts) {
+                // install default initSelection when applied to hidden input and data is local
+                opts.initSelection = opts.initSelection || function (element, callback) {
+                    var ids = splitVal(element.val(), opts.separator);
+                    //search in data by array of ids, storing matching items in a list
+                    var matches = [];
+                    opts.query({
+                        matcher: function(term, text, el){
+                            var is_match = $.grep(ids, function(id) {
+                                return equal(id, opts.id(el));
+                            }).length;
+                            if (is_match) {
+                                matches.push(el);
+                            }
+                            return is_match;
+                        },
+                        callback: !$.isFunction(callback) ? $.noop : function() {
+                            // reorder matches based on the order they appear in the ids array because right now
+                            // they are in the order in which they appear in data array
+                            var ordered = [];
+                            for (var i = 0; i < ids.length; i++) {
+                                var id = ids[i];
+                                for (var j = 0; j < matches.length; j++) {
+                                    var match = matches[j];
+                                    if (equal(id, opts.id(match))) {
+                                        ordered.push(match);
+                                        matches.splice(j, 1);
+                                        break;
+                                    }
+                                }
+                            }
+                            callback(ordered);
+                        }
+                    });
+                };
+            }
+
+            return opts;
+        },
+
+        selectChoice: function (choice) {
+
+            var selected = this.container.find(".select2-search-choice-focus");
+            if (selected.length && choice && choice[0] == selected[0]) {
+
+            } else {
+                if (selected.length) {
+                    this.opts.element.trigger("choice-deselected", selected);
+                }
+                selected.removeClass("select2-search-choice-focus");
+                if (choice && choice.length) {
+                    this.close();
+                    choice.addClass("select2-search-choice-focus");
+                    this.opts.element.trigger("choice-selected", choice);
+                }
+            }
+        },
+
+        // multi
+        initContainer: function () {
+
+            var selector = ".select2-choices", selection;
+
+            this.searchContainer = this.container.find(".select2-search-field");
+            this.selection = selection = this.container.find(selector);
+
+            var _this = this;
+            this.selection.on("mousedown", ".select2-search-choice", function (e) {
+                //killEvent(e);
+                _this.search[0].focus();
+                _this.selectChoice($(this));
+            })
+
+            // rewrite labels from original element to focusser
+            this.search.attr("id", "s2id_autogen"+nextUid());
+            $("label[for='" + this.opts.element.attr("id") + "']")
+                .attr('for', this.search.attr('id'));
+
+            this.search.on("input paste", this.bind(function() {
+                if (!this.isInterfaceEnabled()) return;
+                if (!this.opened()) {
+                    this.open();
+                }
+            }));
+
+            this.search.attr("tabindex", this.elementTabIndex);
+
+            this.keydowns = 0;
+            this.search.on("keydown", this.bind(function (e) {
+                if (!this.isInterfaceEnabled()) return;
+
+                ++this.keydowns;
+                var selected = selection.find(".select2-search-choice-focus");
+                var prev = selected.prev(".select2-search-choice:not(.select2-locked)");
+                var next = selected.next(".select2-search-choice:not(.select2-locked)");
+                var pos = getCursorInfo(this.search);
+
+                if (selected.length &&
+                    (e.which == KEY.LEFT || e.which == KEY.RIGHT || e.which == KEY.BACKSPACE || e.which == KEY.DELETE || e.which == KEY.ENTER)) {
+                    var selectedChoice = selected;
+                    if (e.which == KEY.LEFT && prev.length) {
+                        selectedChoice = prev;
+                    }
+                    else if (e.which == KEY.RIGHT) {
+                        selectedChoice = next.length ? next : null;
+                    }
+                    else if (e.which === KEY.BACKSPACE) {
+                        this.unselect(selected.first());
+                        this.search.width(10);
+                        selectedChoice = prev.length ? prev : next;
+                    } else if (e.which == KEY.DELETE) {
+                        this.unselect(selected.first());
+                        this.search.width(10);
+                        selectedChoice = next.length ? next : null;
+                    } else if (e.which == KEY.ENTER) {
+                        selectedChoice = null;
+                    }
+
+                    this.selectChoice(selectedChoice);
+                    killEvent(e);
+                    if (!selectedChoice || !selectedChoice.length) {
+                        this.open();
+                    }
+                    return;
+                } else if (((e.which === KEY.BACKSPACE && this.keydowns == 1)
+                    || e.which == KEY.LEFT) && (pos.offset == 0 && !pos.length)) {
+
+                    this.selectChoice(selection.find(".select2-search-choice:not(.select2-locked)").last());
+                    killEvent(e);
+                    return;
+                } else {
+                    this.selectChoice(null);
+                }
+
+                if (this.opened()) {
+                    switch (e.which) {
+                    case KEY.UP:
+                    case KEY.DOWN:
+                        this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
+                        killEvent(e);
+                        return;
+                    case KEY.ENTER:
+                        this.selectHighlighted();
+                        killEvent(e);
+                        return;
+                    case KEY.TAB:
+                        this.selectHighlighted({noFocus:true});
+                        this.close();
+                        return;
+                    case KEY.ESC:
+                        this.cancel(e);
+                        killEvent(e);
+                        return;
+                    }
+                }
+
+                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e)
+                 || e.which === KEY.BACKSPACE || e.which === KEY.ESC) {
+                    return;
+                }
+
+                if (e.which === KEY.ENTER) {
+                    if (this.opts.openOnEnter === false) {
+                        return;
+                    } else if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) {
+                        return;
+                    }
+                }
+
+                this.open();
+
+                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
+                    // prevent the page from scrolling
+                    killEvent(e);
+                }
+
+                if (e.which === KEY.ENTER) {
+                    // prevent form from being submitted
+                    killEvent(e);
+                }
+
+            }));
+
+            this.search.on("keyup", this.bind(function (e) {
+                this.keydowns = 0;
+                this.resizeSearch();
+            })
+            );
+
+            this.search.on("blur", this.bind(function(e) {
+                this.container.removeClass("select2-container-active");
+                this.search.removeClass("select2-focused");
+                this.selectChoice(null);
+                if (!this.opened()) this.clearSearch();
+                e.stopImmediatePropagation();
+                this.opts.element.trigger($.Event("select2-blur"));
+            }));
+
+            this.container.on("click", selector, this.bind(function (e) {
+                if (!this.isInterfaceEnabled()) return;
+                if ($(e.target).closest(".select2-search-choice").length > 0) {
+                    // clicked inside a select2 search choice, do not open
+                    return;
+                }
+                this.selectChoice(null);
+                this.clearPlaceholder();
+                if (!this.container.hasClass("select2-container-active")) {
+                    this.opts.element.trigger($.Event("select2-focus"));
+                }
+                this.open();
+                this.focusSearch();
+                e.preventDefault();
+            }));
+
+            this.container.on("focus", selector, this.bind(function () {
+                if (!this.isInterfaceEnabled()) return;
+                if (!this.container.hasClass("select2-container-active")) {
+                    this.opts.element.trigger($.Event("select2-focus"));
+                }
+                this.container.addClass("select2-container-active");
+                this.dropdown.addClass("select2-drop-active");
+                this.clearPlaceholder();
+            }));
+
+            this.initContainerWidth();
+            this.opts.element.addClass("select2-offscreen");
+
+            // set the placeholder if necessary
+            this.clearSearch();
+        },
+
+        // multi
+        enableInterface: function() {
+            if (this.parent.enableInterface.apply(this, arguments)) {
+                this.search.prop("disabled", !this.isInterfaceEnabled());
+            }
+        },
+
+        // multi
+        initSelection: function () {
+            var data;
+            if (this.opts.element.val() === "" && this.opts.element.text() === "") {
+                this.updateSelection([]);
+                this.close();
+                // set the placeholder if necessary
+                this.clearSearch();
+            }
+            if (this.select || this.opts.element.val() !== "") {
+                var self = this;
+                this.opts.initSelection.call(null, this.opts.element, function(data){
+                    if (data !== undefined && data !== null) {
+                        self.updateSelection(data);
+                        self.close();
+                        // set the placeholder if necessary
+                        self.clearSearch();
+                    }
+                });
+            }
+        },
+
+        // multi
+        clearSearch: function () {
+            var placeholder = this.getPlaceholder(),
+                maxWidth = this.getMaxSearchWidth();
+
+            if (placeholder !== undefined  && this.getVal().length === 0 && this.search.hasClass("select2-focused") === false) {
+                this.search.val(placeholder).addClass("select2-default");
+                // stretch the search box to full width of the container so as much of the placeholder is visible as possible
+                // we could call this.resizeSearch(), but we do not because that requires a sizer and we do not want to create one so early because of a firefox bug, see #944
+                this.search.width(maxWidth > 0 ? maxWidth : this.container.css("width"));
+            } else {
+                this.search.val("").width(10);
+            }
+        },
+
+        // multi
+        clearPlaceholder: function () {
+            if (this.search.hasClass("select2-default")) {
+                this.search.val("").removeClass("select2-default");
+            }
+        },
+
+        // multi
+        opening: function () {
+            this.clearPlaceholder(); // should be done before super so placeholder is not used to search
+            this.resizeSearch();
+
+            this.parent.opening.apply(this, arguments);
+
+            this.focusSearch();
+
+            this.updateResults(true);
+            this.search.focus();
+            this.opts.element.trigger($.Event("select2-open"));
+        },
+
+        // multi
+        close: function () {
+            if (!this.opened()) return;
+            this.parent.close.apply(this, arguments);
+        },
+
+        // multi
+        focus: function () {
+            this.close();
+            this.search.focus();
+        },
+
+        // multi
+        isFocused: function () {
+            return this.search.hasClass("select2-focused");
+        },
+
+        // multi
+        updateSelection: function (data) {
+            var ids = [], filtered = [], self = this;
+
+            // filter out duplicates
+            $(data).each(function () {
+                if (indexOf(self.id(this), ids) < 0) {
+                    ids.push(self.id(this));
+                    filtered.push(this);
+                }
+            });
+            data = filtered;
+
+            this.selection.find(".select2-search-choice").remove();
+            $(data).each(function () {
+                self.addSelectedChoice(this);
+            });
+            self.postprocessResults();
+        },
+
+        // multi
+        tokenize: function() {
+            var input = this.search.val();
+            input = this.opts.tokenizer.call(this, input, this.data(), this.bind(this.onSelect), this.opts);
+            if (input != null && input != undefined) {
+                this.search.val(input);
+                if (input.length > 0) {
+                    this.open();
+                }
+            }
+
+        },
+
+        // multi
+        onSelect: function (data, options) {
+
+            if (!this.triggerSelect(data)) { return; }
+
+            this.addSelectedChoice(data);
+
+            this.opts.element.trigger({ type: "selected", val: this.id(data), choice: data });
+
+            if (this.select || !this.opts.closeOnSelect) this.postprocessResults();
+
+            if (this.opts.closeOnSelect) {
+                this.close();
+                this.search.width(10);
+            } else {
+                if (this.countSelectableResults()>0) {
+                    this.search.width(10);
+                    this.resizeSearch();
+                    if (this.getMaximumSelectionSize() > 0 && this.val().length >= this.getMaximumSelectionSize()) {
+                        // if we reached max selection size repaint the results so choices
+                        // are replaced with the max selection reached message
+                        this.updateResults(true);
+                    }
+                    this.positionDropdown();
+                } else {
+                    // if nothing left to select close
+                    this.close();
+                    this.search.width(10);
+                }
+            }
+
+            // since its not possible to select an element that has already been
+            // added we do not need to check if this is a new element before firing change
+            this.triggerChange({ added: data });
+
+            if (!options || !options.noFocus)
+                this.focusSearch();
+        },
+
+        // multi
+        cancel: function () {
+            this.close();
+            this.focusSearch();
+        },
+
+        addSelectedChoice: function (data) {
+            var enableChoice = !data.locked,
+                enabledItem = $(
+                    "<li class='select2-search-choice'>" +
+                    "    <div></div>" +
+                    "    <a href='#' onclick='return false;' class='select2-search-choice-close'><i class='icon-remove'></i></a>" +
+                    "</li>"),
+                disabledItem = $(
+                    "<li class='select2-search-choice select2-locked'>" +
+                    "<div></div>" +
+                    "</li>");
+            var choice = enableChoice ? enabledItem : disabledItem,
+                id = this.id(data),
+                val = this.getVal(),
+                formatted,
+                cssClass;
+
+            formatted=this.opts.formatSelection(data, choice.find("div"), this.opts.escapeMarkup);
+            if (formatted != undefined) {
+                choice.find("div").replaceWith("<div>"+formatted+"</div>");
+            }
+            cssClass=this.opts.formatSelectionCssClass(data, choice.find("div"));
+            if (cssClass != undefined) {
+                choice.addClass(cssClass);
+            }
+
+            if(enableChoice){
+              choice.find(".select2-search-choice-close")
+                  .on("mousedown", killEvent)
+                  .on("click dblclick", this.bind(function (e) {
+                  if (!this.isInterfaceEnabled()) return;
+
+                  $(e.target).closest(".select2-search-choice").fadeOut('fast', this.bind(function(){
+                      this.unselect($(e.target));
+                      this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
+                      this.close();
+                      this.focusSearch();
+                  })).dequeue();
+                  killEvent(e);
+              })).on("focus", this.bind(function () {
+                  if (!this.isInterfaceEnabled()) return;
+                  this.container.addClass("select2-container-active");
+                  this.dropdown.addClass("select2-drop-active");
+              }));
+            }
+
+            choice.data("select2-data", data);
+            choice.insertBefore(this.searchContainer);
+
+            val.push(id);
+            this.setVal(val);
+        },
+
+        // multi
+        unselect: function (selected) {
+            var val = this.getVal(),
+                data,
+                index;
+
+            selected = selected.closest(".select2-search-choice");
+
+            if (selected.length === 0) {
+                throw "Invalid argument: " + selected + ". Must be .select2-search-choice";
+            }
+
+            data = selected.data("select2-data");
+
+            if (!data) {
+                // prevent a race condition when the 'x' is clicked really fast repeatedly the event can be queued
+                // and invoked on an element already removed
+                return;
+            }
+
+            index = indexOf(this.id(data), val);
+
+            if (index >= 0) {
+                val.splice(index, 1);
+                this.setVal(val);
+                if (this.select) this.postprocessResults();
+            }
+            selected.remove();
+
+            this.opts.element.trigger({ type: "removed", val: this.id(data), choice: data });
+            this.triggerChange({ removed: data });
+        },
+
+        // multi
+        postprocessResults: function (data, initial, noHighlightUpdate) {
+            var val = this.getVal(),
+                choices = this.results.find(".select2-result"),
+                compound = this.results.find(".select2-result-with-children"),
+                self = this;
+
+            choices.each2(function (i, choice) {
+                var id = self.id(choice.data("select2-data"));
+                if (indexOf(id, val) >= 0) {
+                    choice.addClass("select2-selected");
+                    // mark all children of the selected parent as selected
+                    choice.find(".select2-result-selectable").addClass("select2-selected");
+                }
+            });
+
+            compound.each2(function(i, choice) {
+                // hide an optgroup if it doesnt have any selectable children
+                if (!choice.is('.select2-result-selectable')
+                    && choice.find(".select2-result-selectable:not(.select2-selected)").length === 0) {
+                    choice.addClass("select2-selected");
+                }
+            });
+
+            if (this.highlight() == -1 && noHighlightUpdate !== false){
+                self.highlight(0);
+            }
+
+            //If all results are chosen render formatNoMAtches
+            if(!this.opts.createSearchChoice && !choices.filter('.select2-result:not(.select2-selected)').length > 0){
+                if(!data || data && !data.more && this.results.find(".select2-no-results").length === 0) {
+                    if (checkFormatter(self.opts.formatNoMatches, "formatNoMatches")) {
+                        this.results.append("<li class='select2-no-results'>" + self.opts.formatNoMatches(self.search.val()) + "</li>");
+                    }
+                }
+            }
+
+        },
+
+        // multi
+        getMaxSearchWidth: function() {
+            return this.selection.width() - getSideBorderPadding(this.search);
+        },
+
+        // multi
+        resizeSearch: function () {
+            var minimumWidth, left, maxWidth, containerLeft, searchWidth,
+                sideBorderPadding = getSideBorderPadding(this.search);
+
+            minimumWidth = measureTextWidth(this.search) + 10;
+
+            left = this.search.offset().left;
+
+            maxWidth = this.selection.width();
+            containerLeft = this.selection.offset().left;
+
+            searchWidth = maxWidth - (left - containerLeft) - sideBorderPadding;
+
+            if (searchWidth < minimumWidth) {
+                searchWidth = maxWidth - sideBorderPadding;
+            }
+
+            if (searchWidth < 40) {
+                searchWidth = maxWidth - sideBorderPadding;
+            }
+
+            if (searchWidth <= 0) {
+              searchWidth = minimumWidth;
+            }
+
+            this.search.width(searchWidth);
+        },
+
+        // multi
+        getVal: function () {
+            var val;
+            if (this.select) {
+                val = this.select.val();
+                return val === null ? [] : val;
+            } else {
+                val = this.opts.element.val();
+                return splitVal(val, this.opts.separator);
+            }
+        },
+
+        // multi
+        setVal: function (val) {
+            var unique;
+            if (this.select) {
+                this.select.val(val);
+            } else {
+                unique = [];
+                // filter out duplicates
+                $(val).each(function () {
+                    if (indexOf(this, unique) < 0) unique.push(this);
+                });
+                this.opts.element.val(unique.length === 0 ? "" : unique.join(this.opts.separator));
+            }
+        },
+
+        // multi
+        buildChangeDetails: function (old, current) {
+            var current = current.slice(0),
+                old = old.slice(0);
+
+            // remove intersection from each array
+            for (var i = 0; i < current.length; i++) {
+                for (var j = 0; j < old.length; j++) {
+                    if (equal(this.opts.id(current[i]), this.opts.id(old[j]))) {
+                        current.splice(i, 1);
+                        i--;
+                        old.splice(j, 1);
+                        j--;
+                    }
+                }
+            }
+
+            return {added: current, removed: old};
+        },
+
+
+        // multi
+        val: function (val, triggerChange) {
+            var oldData, self=this, changeDetails;
+
+            if (arguments.length === 0) {
+                return this.getVal();
+            }
+
+            oldData=this.data();
+            if (!oldData.length) oldData=[];
+
+            // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
+            if (!val && val !== 0) {
+                this.opts.element.val("");
+                this.updateSelection([]);
+                this.clearSearch();
+                if (triggerChange) {
+                    this.triggerChange({added: this.data(), removed: oldData});
+                }
+                return;
+            }
+
+            // val is a list of ids
+            this.setVal(val);
+
+            if (this.select) {
+                this.opts.initSelection(this.select, this.bind(this.updateSelection));
+                if (triggerChange) {
+                    this.triggerChange(this.buildChangeDetails(oldData, this.data()));
+                }
+            } else {
+                if (this.opts.initSelection === undefined) {
+                    throw new Error("val() cannot be called if initSelection() is not defined");
+                }
+
+                this.opts.initSelection(this.opts.element, function(data){
+                    var ids=$.map(data, self.id);
+                    self.setVal(ids);
+                    self.updateSelection(data);
+                    self.clearSearch();
+                    if (triggerChange) {
+                        self.triggerChange(this.buildChangeDetails(oldData, this.data()));
+                    }
+                });
+            }
+            this.clearSearch();
+        },
+
+        // multi
+        onSortStart: function() {
+            if (this.select) {
+                throw new Error("Sorting of elements is not supported when attached to <select>. Attach to <input type='hidden'/> instead.");
+            }
+
+            // collapse search field into 0 width so its container can be collapsed as well
+            this.search.width(0);
+            // hide the container
+            this.searchContainer.hide();
+        },
+
+        // multi
+        onSortEnd:function() {
+
+            var val=[], self=this;
+
+            // show search and move it to the end of the list
+            this.searchContainer.show();
+            // make sure the search container is the last item in the list
+            this.searchContainer.appendTo(this.searchContainer.parent());
+            // since we collapsed the width in dragStarted, we resize it here
+            this.resizeSearch();
+
+            // update selection
+            this.selection.find(".select2-search-choice").each(function() {
+                val.push(self.opts.id($(this).data("select2-data")));
+            });
+            this.setVal(val);
+            this.triggerChange();
+        },
+
+        // multi
+        data: function(values, triggerChange) {
+            var self=this, ids, old;
+            if (arguments.length === 0) {
+                 return this.selection
+                     .find(".select2-search-choice")
+                     .map(function() { return $(this).data("select2-data"); })
+                     .get();
+            } else {
+                old = this.data();
+                if (!values) { values = []; }
+                ids = $.map(values, function(e) { return self.opts.id(e); });
+                this.setVal(ids);
+                this.updateSelection(values);
+                this.clearSearch();
+                if (triggerChange) {
+                    this.triggerChange(this.buildChangeDetails(old, this.data()));
+                }
+            }
+        }
+    });
+
+    $.fn.select2 = function () {
+
+        var args = Array.prototype.slice.call(arguments, 0),
+            opts,
+            select2,
+            method, value, multiple,
+            allowedMethods = ["val", "destroy", "opened", "open", "close", "focus", "isFocused", "container", "dropdown", "onSortStart", "onSortEnd", "enable", "readonly", "positionDropdown", "data", "search"],
+            valueMethods = ["val", "opened", "isFocused", "container", "data"],
+            methodsMap = { search: "externalSearch" };
+
+        this.each(function () {
+            if (args.length === 0 || typeof(args[0]) === "object") {
+                opts = args.length === 0 ? {} : $.extend({}, args[0]);
+                opts.element = $(this);
+
+                if (opts.element.get(0).tagName.toLowerCase() === "select") {
+                    multiple = opts.element.prop("multiple");
+                } else {
+                    multiple = opts.multiple || false;
+                    if ("tags" in opts) {opts.multiple = multiple = true;}
+                }
+
+                select2 = multiple ? new MultiSelect2() : new SingleSelect2();
+                select2.init(opts);
+            } else if (typeof(args[0]) === "string") {
+
+                if (indexOf(args[0], allowedMethods) < 0) {
+                    throw "Unknown method: " + args[0];
+                }
+
+                value = undefined;
+                select2 = $(this).data("select2");
+                if (select2 === undefined) return;
+
+                method=args[0];
+
+                if (method === "container") {
+                    value = select2.container;
+                } else if (method === "dropdown") {
+                    value = select2.dropdown;
+                } else {
+                    if (methodsMap[method]) method = methodsMap[method];
+
+                    value = select2[method].apply(select2, args.slice(1));
+                }
+                if (indexOf(args[0], valueMethods) >= 0) {
+                    return false;
+                }
+            } else {
+                throw "Invalid arguments to select2 plugin: " + args;
+            }
+        });
+        return (value === undefined) ? this : value;
+    };
+
+    // plugin defaults, accessible to users
+    $.fn.select2.defaults = {
+        width: "copy",
+        loadMorePadding: 0,
+        closeOnSelect: true,
+        openOnEnter: true,
+        containerCss: {},
+        dropdownCss: {},
+        containerCssClass: "",
+        dropdownCssClass: "",
+        formatResult: function(result, container, query, escapeMarkup) {
+            var markup=[];
+            markMatch(result.text, query.term, markup, escapeMarkup);
+            return markup.join("");
+        },
+        formatSelection: function (data, container, escapeMarkup) {
+            return data ? escapeMarkup(data.text) : undefined;
+        },
+        sortResults: function (results, container, query) {
+            return results;
+        },
+        formatResultCssClass: function(data) {return undefined;},
+        formatSelectionCssClass: function(data, container) {return undefined;},
+        formatNoMatches: function () { return "No matches found"; },
+        formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " more character" + (n == 1? "" : "s"); },
+        formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1? "" : "s"); },
+        formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); },
+        formatLoadMore: function (pageNumber) { return "Loading more results..."; },
+        formatSearching: function () { return "Searching..."; },
+        minimumResultsForSearch: 0,
+        minimumInputLength: 0,
+        maximumInputLength: null,
+        maximumSelectionSize: 0,
+        id: function (e) { return e.id; },
+        matcher: function(term, text) {
+            return (''+text).toUpperCase().indexOf((''+term).toUpperCase()) >= 0;
+        },
+        separator: ",",
+        tokenSeparators: [],
+        tokenizer: defaultTokenizer,
+        escapeMarkup: defaultEscapeMarkup,
+        blurOnChange: false,
+        selectOnBlur: false,
+        adaptContainerCssClass: function(c) { return c; },
+        adaptDropdownCssClass: function(c) { return null; }
+    };
+
+    $.fn.select2.ajaxDefaults = {
+        transport: $.ajax,
+        params: {
+            type: "GET",
+            cache: false,
+            dataType: "json"
+        }
+    };
+
+    // exports
+    window.Select2 = {
+        query: {
+            ajax: ajax,
+            local: local,
+            tags: tags
+        }, util: {
+            debounce: debounce,
+            markMatch: markMatch,
+            escapeMarkup: defaultEscapeMarkup
+        }, "class": {
+            "abstract": AbstractSelect2,
+            "single": SingleSelect2,
+            "multi": MultiSelect2
+        }
+    };
+
+}(jQuery));
diff --git a/app/assets/javascripts/vendor/tmpl.min.js b/app/assets/javascripts/vendor/tmpl.min.js
new file mode 100644
index 0000000..065532e
--- /dev/null
+++ b/app/assets/javascripts/vendor/tmpl.min.js
@@ -0,0 +1 @@
+(function(a){"use strict";var b=function(a,c){var d=/[^\w\-\.:]/.test(a)?new Function(b.arg+",tmpl","var _e=tmpl.encode"+b.helper+",_s='"+a.replace(b.regexp,b.func)+"';return _s;"):b.cache[a]=b.cache[a]||b(b.load(a));return c?d(c,b):function(a){return d(a,b)}};b.cache={},b.load=function(a){return document.getElementById(a).innerHTML},b.regexp=/([\s'\\])(?![^%]*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g,b.func=function(a,b,c,d,e,f){if(b)return{"\n":"\\n","\r":"\\r","\t":"\\t"," ":" "}[a]||"\\"+a;if(c)return c==="="?"'+_e("+d+")+'":"'+("+d+"||'')+'";if(e)return"';";if(f)return"_s+='"},b.encReg=/[<>&"'\x00]/g,b.encMap={"<":"&lt;",">":"&gt;","&":"&amp;",'"':"&quot;","'":"&#39;"},b.encode=function(a){return String(a||"").replace(b.encReg,function(a){return b.encMap[a]||""})},b.arg="o",b.helper=",print=function(s,e){_s+=e&&(s||'')||_e(s);},include=function(s,d){_s+=tmpl(s,d);}",typeof define=="function"&&define.amd?define(function(){return b}):a.tmpl=b})(this);
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin.css.scss b/app/assets/stylesheets/admin.css.scss
index 5ef26dd..8aba4f7 100644
--- a/app/assets/stylesheets/admin.css.scss
+++ b/app/assets/stylesheets/admin.css.scss
@@ -1,5 +1,3 @@
-
-
 @import "bootstrap";
 
 @import "fontawesome/font-awesome";
@@ -7,6 +5,7 @@
 @import "redactor";
 @import "pane_hover";
 @import "vendor/select2";
+
 @import "admin/sheets";
 @import "admin/topics";
 @import "admin/uploads";
@@ -821,3 +820,15 @@ padding:0 10px;
 height:auto !important;
 
 }
+
+
+.select2-container.form-control{
+  
+  padding: 0px;
+  border: 0px;
+  border-radius: 0;
+  height: auto;
+  margin: 0;
+  
+}
+
diff --git a/app/assets/stylesheets/admin/framework/accordion.less b/app/assets/stylesheets/admin/framework/accordion.less
deleted file mode 100755
index d63523b..0000000
--- a/app/assets/stylesheets/admin/framework/accordion.less
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Accordion
-// --------------------------------------------------
-
-
-// Parent container
-.accordion {
-  margin-bottom: @baseLineHeight;
-}
-
-// Group == heading + body
-.accordion-group {
-  margin-bottom: 2px;
-  border: 1px solid #e5e5e5;
-  .border-radius(@baseBorderRadius);
-}
-.accordion-heading {
-  border-bottom: 0;
-}
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
-
-// General toggle styles
-.accordion-toggle {
-  cursor: pointer;
-}
-
-// Inner needs the styles because you can't animate properly with any styles on the element
-.accordion-inner {
-  padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
-}
diff --git a/app/assets/stylesheets/admin/framework/alerts.less b/app/assets/stylesheets/admin/framework/alerts.less
deleted file mode 100755
index 0116b19..0000000
--- a/app/assets/stylesheets/admin/framework/alerts.less
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Alerts
-// --------------------------------------------------
-
-
-// Base styles
-// -------------------------
-
-.alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: @baseLineHeight;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  background-color: @warningBackground;
-  border: 1px solid @warningBorder;
-  .border-radius(@baseBorderRadius);
-}
-.alert,
-.alert h4 {
-  // Specified for the h4 to prevent conflicts of changing @headingsColor
-  color: @warningText;
-}
-.alert h4 {
-  margin: 0;
-}
-
-// Adjust close link position
-.alert .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: @baseLineHeight;
-}
-
-
-// Alternate styles
-// -------------------------
-
-.alert-success {
-  background-color: @successBackground;
-  border-color: @successBorder;
-  color: @successText;
-}
-.alert-success h4 {
-  color: @successText;
-}
-.alert-danger,
-.alert-error {
-  background-color: @errorBackground;
-  border-color: @errorBorder;
-  color: @errorText;
-}
-.alert-danger h4,
-.alert-error h4 {
-  color: @errorText;
-}
-.alert-info {
-  background-color: @infoBackground;
-  border-color: @infoBorder;
-  color: @infoText;
-}
-.alert-info h4 {
-  color: @infoText;
-}
-
-
-// Block alerts
-// -------------------------
-
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-.alert-block p + p {
-  margin-top: 5px;
-}
diff --git a/app/assets/stylesheets/admin/framework/bootstrap.less b/app/assets/stylesheets/admin/framework/bootstrap.less
deleted file mode 100755
index dc5d99e..0000000
--- a/app/assets/stylesheets/admin/framework/bootstrap.less
+++ /dev/null
@@ -1,67 +0,0 @@
-/*!
- * Bootstrap v2.3.2
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-// Core variables and mixins
-@import "variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "mixins.less";
-
-// CSS Reset
-@import "reset.less";
-
-// Grid system and page structure
-@import "scaffolding.less";
-@import "grid.less";
-@import "layouts.less";
-
-// Base CSS
-@import "type.less";
-@import "code.less";
-@import "formt.less";
-@import "forms.less";
-@import "tables.less";
-
-// Components: common
-@import "sprites.less";
-@import "dropdowns.less";
-@import "wells.less";
-@import "component-animations.less";
-@import "close.less";
-
-// Components: Buttons & Alerts
-@import "buttons.less";
-@import "button-groups.less";
-@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
-
-// Components: Nav
-@import "navs.less";
-@import "navbar.less";
-@import "breadcrumbs.less";
-@import "pagination.less";
-@import "pager.less";
-
-// Components: Popovers
-@import "modals.less";
-@import "tooltip.less";
-@import "popovers.less";
-
-// Components: Misc
-@import "thumbnails.less";
-@import "media.less";
-@import "labels-badges.less";
-@import "progress-bars.less";
-@import "accordion.less";
-@import "carousel.less";
-@import "hero-unit.less";
-
-// Utility classes
-@import "utilities.less"; // Has to be last to override when necessary
-
-
-@import "slider.less";
diff --git a/app/assets/stylesheets/admin/framework/breadcrumbs.less b/app/assets/stylesheets/admin/framework/breadcrumbs.less
deleted file mode 100755
index f753df6..0000000
--- a/app/assets/stylesheets/admin/framework/breadcrumbs.less
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Breadcrumbs
-// --------------------------------------------------
-
-
-.breadcrumb {
-  padding: 8px 15px;
-  margin: 0 0 @baseLineHeight;
-  list-style: none;
-  background-color: #f5f5f5;
-  .border-radius(@baseBorderRadius);
-  > li {
-    display: inline-block;
-    .ie7-inline-block();
-    text-shadow: 0 1px 0 @white;
-    > .divider {
-      padding: 0 5px;
-      color: #ccc;
-    }
-  }
-  > .active {
-    color: @grayLight;
-  }
-}
diff --git a/app/assets/stylesheets/admin/framework/button-groups.less b/app/assets/stylesheets/admin/framework/button-groups.less
deleted file mode 100755
index 55cdc60..0000000
--- a/app/assets/stylesheets/admin/framework/button-groups.less
+++ /dev/null
@@ -1,229 +0,0 @@
-//
-// Button groups
-// --------------------------------------------------
-
-
-// Make the div behave like a button
-.btn-group {
-  position: relative;
-  display: inline-block;
-  .ie7-inline-block();
-  font-size: 0; // remove as part 1 of font-size inline-block hack
-  vertical-align: middle; // match .btn alignment given font-size hack above
-  white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
-  .ie7-restore-left-whitespace();
-}
-
-// Space out series of button groups
-.btn-group + .btn-group {
-  margin-left: 5px;
-}
-
-// Optional: Group multiple button groups together for a toolbar
-.btn-toolbar {
-  font-size: 0; // Hack to remove whitespace that results from using inline-block
-  margin-top: @baseLineHeight / 2;
-  margin-bottom: @baseLineHeight / 2;
-  > .btn + .btn,
-  > .btn-group + .btn,
-  > .btn + .btn-group {
-    margin-left: 5px;
-  }
-}
-
-// Float them, remove border radius, then re-add to first and last elements
-.btn-group > .btn {
-  position: relative;
-  .border-radius(0);
-}
-.btn-group > .btn + .btn {
-  margin-left: -1px;
-}
-.btn-group > .btn,
-.btn-group > .dropdown-menu,
-.btn-group > .popover {
-  font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
-}
-
-// Reset fonts for other sizes
-.btn-group > .btn-mini {
-  font-size: @fontSizeMini;
-}
-.btn-group > .btn-small {
-  font-size: @fontSizeSmall;
-}
-.btn-group > .btn-large {
-  font-size: @fontSizeLarge;
-}
-
-// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
-.btn-group > .btn:first-child {
-  margin-left: 0;
-  .border-top-left-radius(@baseBorderRadius);
-  .border-bottom-left-radius(@baseBorderRadius);
-}
-// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-  .border-top-right-radius(@baseBorderRadius);
-  .border-bottom-right-radius(@baseBorderRadius);
-}
-// Reset corners for large buttons
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  .border-top-left-radius(@borderRadiusLarge);
-  .border-bottom-left-radius(@borderRadiusLarge);
-}
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  .border-top-right-radius(@borderRadiusLarge);
-  .border-bottom-right-radius(@borderRadiusLarge);
-}
-
-// On hover/focus/active, bring the proper btn to front
-.btn-group > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group > .btn:active,
-.btn-group > .btn.active {
-  z-index: 2;
-}
-
-// On active and open, don't show outline
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-
-
-
-// Split button dropdowns
-// ----------------------
-
-// Give the line between buttons some depth
-.btn-group > .btn + .dropdown-toggle {
-  padding-left: 8px;
-  padding-right: 8px;
-  .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
-  *padding-top: 5px;
-  *padding-bottom: 5px;
-}
-.btn-group > .btn-mini + .dropdown-toggle {
-  padding-left: 5px;
-  padding-right: 5px;
-  *padding-top: 2px;
-  *padding-bottom: 2px;
-}
-.btn-group > .btn-small + .dropdown-toggle {
-  *padding-top: 5px;
-  *padding-bottom: 4px;
-}
-.btn-group > .btn-large + .dropdown-toggle {
-  padding-left: 12px;
-  padding-right: 12px;
-  *padding-top: 7px;
-  *padding-bottom: 7px;
-}
-
-.btn-group.open {
-
-  // The clickable button for toggling the menu
-  // Remove the gradient and set the same inset shadow as the :active state
-  .dropdown-toggle {
-    background-image: none;
-    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
-  }
-
-  // Keep the hover's background when dropdown is open
-  .btn.dropdown-toggle {
-    background-color: @btnBackgroundHighlight;
-  }
-  .btn-primary.dropdown-toggle {
-    background-color: @btnPrimaryBackgroundHighlight;
-  }
-  .btn-warning.dropdown-toggle {
-    background-color: @btnWarningBackgroundHighlight;
-  }
-  .btn-danger.dropdown-toggle {
-    background-color: @btnDangerBackgroundHighlight;
-  }
-  .btn-success.dropdown-toggle {
-    background-color: @btnSuccessBackgroundHighlight;
-  }
-  .btn-info.dropdown-toggle {
-    background-color: @btnInfoBackgroundHighlight;
-  }
-  .btn-inverse.dropdown-toggle {
-    background-color: @btnInverseBackgroundHighlight;
-  }
-}
-
-
-// Reposition the caret
-.btn .caret {
-  margin-top: 8px;
-  margin-left: 0;
-}
-// Carets in other button sizes
-.btn-large .caret {
-  margin-top: 6px;
-}
-.btn-large .caret {
-  border-left-width:  5px;
-  border-right-width: 5px;
-  border-top-width:   5px;
-}
-.btn-mini .caret,
-.btn-small .caret {
-  margin-top: 8px;
-}
-// Upside down carets for .dropup
-.dropup .btn-large .caret {
-  border-bottom-width: 5px;
-}
-
-
-
-// Account for other colors
-.btn-primary,
-.btn-warning,
-.btn-danger,
-.btn-info,
-.btn-success,
-.btn-inverse {
-  .caret {
-    border-top-color: @white;
-    border-bottom-color: @white;
-  }
-}
-
-
-
-// Vertical button groups
-// ----------------------
-
-.btn-group-vertical {
-  display: inline-block; // makes buttons only take up the width they need
-  .ie7-inline-block();
-}
-.btn-group-vertical > .btn {
-  display: block;
-  float: none;
-  max-width: 100%;
-  .border-radius(0);
-}
-.btn-group-vertical > .btn + .btn {
-  margin-left: 0;
-  margin-top: -1px;
-}
-.btn-group-vertical > .btn:first-child {
-  .border-radius(@baseBorderRadius @baseBorderRadius 0 0);
-}
-.btn-group-vertical > .btn:last-child {
-  .border-radius(0 0 @baseBorderRadius @baseBorderRadius);
-}
-.btn-group-vertical > .btn-large:first-child {
-  .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0);
-}
-.btn-group-vertical > .btn-large:last-child {
-  .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge);
-}
diff --git a/app/assets/stylesheets/admin/framework/buttons.less b/app/assets/stylesheets/admin/framework/buttons.less
deleted file mode 100755
index 4cd4d86..0000000
--- a/app/assets/stylesheets/admin/framework/buttons.less
+++ /dev/null
@@ -1,228 +0,0 @@
-//
-// Buttons
-// --------------------------------------------------
-
-
-// Base styles
-// --------------------------------------------------
-
-// Core
-.btn {
-  display: inline-block;
-  .ie7-inline-block();
-  padding: 4px 12px;
-  margin-bottom: 0; // For input.btn
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  text-align: center;
-  vertical-align: middle;
-  cursor: pointer;
-  .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
-  border: 1px solid @btnBorder;
-  *border: 0; // Remove the border to prevent IE7's black border on input:focus
-  border-bottom-color: darken(@btnBorder, 10%);
-  .border-radius(@baseBorderRadius);
-  .ie7-restore-left-whitespace(); // Give IE7 some love
-  .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
-
-  // Hover/focus state
-  &:hover,
-  &:focus {
-    color: @grayDark;
-    text-decoration: none;
-    background-position: 0 -15px;
-
-    // transition is only when going to hover/focus, otherwise the background
-    // behind the gradient (there for IE<=9 fallback) gets mismatched
-    .transition(background-position .1s linear);
-  }
-
-  // Focus state for keyboard and accessibility
-  &:focus {
-    .tab-focus();
-  }
-
-  // Active state
-  &.active,
-  &:active {
-    background-image: none;
-    outline: 0;
-    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
-  }
-
-  // Disabled state
-  &.disabled,
-  &[disabled] {
-    cursor: default;
-    background-image: none;
-    .opacity(65);
-    .box-shadow(none);
-  }
-
-}
-
-
-
-// Button Sizes
-// --------------------------------------------------
-
-// Large
-.btn-large {
-  padding: @paddingLarge;
-  font-size: @fontSizeLarge;
-  .border-radius(@borderRadiusLarge);
-}
-.btn-large [class^="icon-"],
-.btn-large [class*=" icon-"] {
-  margin-top: 4px;
-}
-
-// Small
-.btn-small {
-  padding: @paddingSmall;
-  font-size: @fontSizeSmall;
-  .border-radius(@borderRadiusSmall);
-}
-.btn-small [class^="icon-"],
-.btn-small [class*=" icon-"] {
-  margin-top: 0;
-}
-.btn-mini [class^="icon-"],
-.btn-mini [class*=" icon-"] {
-  margin-top: -1px;
-}
-
-// Mini
-.btn-mini {
-  padding: @paddingMini;
-  font-size: @fontSizeMini;
-  .border-radius(@borderRadiusSmall);
-}
-
-
-// Block button
-// -------------------------
-
-.btn-block {
-  display: block;
-  width: 100%;
-  padding-left: 0;
-  padding-right: 0;
-  .box-sizing(border-box);
-}
-
-// Vertically space out multiple block buttons
-.btn-block + .btn-block {
-  margin-top: 5px;
-}
-
-// Specificity overrides
-input[type="submit"],
-input[type="reset"],
-input[type="button"] {
-  &.btn-block {
-    width: 100%;
-  }
-}
-
-
-
-// Alternate buttons
-// --------------------------------------------------
-
-// Provide *some* extra contrast for those who can get it
-.btn-primary.active,
-.btn-warning.active,
-.btn-danger.active,
-.btn-success.active,
-.btn-info.active,
-.btn-inverse.active {
-  color: rgba(255,255,255,.75);
-}
-
-// Set the backgrounds
-// -------------------------
-.btn-primary {
-  .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
-}
-// Warning appears are orange
-.btn-warning {
-  .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight);
-}
-// Danger and error appear as red
-.btn-danger {
-  .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight);
-}
-// Success appears as green
-.btn-success {
-  .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight);
-}
-// Info appears as a neutral blue
-.btn-info {
-  .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight);
-}
-// Inverse appears as dark gray
-.btn-inverse {
-  .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight);
-}
-
-
-// Cross-browser Jank
-// --------------------------------------------------
-
-button.btn,
-input[type="submit"].btn {
-
-  // Firefox 3.6 only I believe
-  &::-moz-focus-inner {
-    padding: 0;
-    border: 0;
-  }
-
-  // IE7 has some default padding on button controls
-  *padding-top: 3px;
-  *padding-bottom: 3px;
-
-  &.btn-large {
-    *padding-top: 7px;
-    *padding-bottom: 7px;
-  }
-  &.btn-small {
-    *padding-top: 3px;
-    *padding-bottom: 3px;
-  }
-  &.btn-mini {
-    *padding-top: 1px;
-    *padding-bottom: 1px;
-  }
-}
-
-
-// Link buttons
-// --------------------------------------------------
-
-// Make a button look and behave like a link
-.btn-link,
-.btn-link:active,
-.btn-link[disabled] {
-  background-color: transparent;
-  background-image: none;
-  .box-shadow(none);
-}
-.btn-link {
-  border-color: transparent;
-  cursor: pointer;
-  color: @linkColor;
-  .border-radius(0);
-}
-.btn-link:hover,
-.btn-link:focus {
-  color: @linkColorHover;
-  text-decoration: underline;
-  background-color: transparent;
-}
-.btn-link[disabled]:hover,
-.btn-link[disabled]:focus {
-  color: @grayDark;
-  text-decoration: none;
-}
diff --git a/app/assets/stylesheets/admin/framework/carousel.less b/app/assets/stylesheets/admin/framework/carousel.less
deleted file mode 100755
index 55bc050..0000000
--- a/app/assets/stylesheets/admin/framework/carousel.less
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-// Carousel
-// --------------------------------------------------
-
-
-.carousel {
-  position: relative;
-  margin-bottom: @baseLineHeight;
-  line-height: 1;
-}
-
-.carousel-inner {
-  overflow: hidden;
-  width: 100%;
-  position: relative;
-}
-
-.carousel-inner {
-
-  > .item {
-    display: none;
-    position: relative;
-    .transition(.6s ease-in-out left);
-
-    // Account for jankitude on images
-    > img,
-    > a > img {
-      display: block;
-      line-height: 1;
-    }
-  }
-
-  > .active,
-  > .next,
-  > .prev { display: block; }
-
-  > .active {
-    left: 0;
-  }
-
-  > .next,
-  > .prev {
-    position: absolute;
-    top: 0;
-    width: 100%;
-  }
-
-  > .next {
-    left: 100%;
-  }
-  > .prev {
-    left: -100%;
-  }
-  > .next.left,
-  > .prev.right {
-    left: 0;
-  }
-
-  > .active.left {
-    left: -100%;
-  }
-  > .active.right {
-    left: 100%;
-  }
-
-}
-
-// Left/right controls for nav
-// ---------------------------
-
-.carousel-control {
-  position: absolute;
-  top: 40%;
-  left: 15px;
-  width: 40px;
-  height: 40px;
-  margin-top: -20px;
-  font-size: 60px;
-  font-weight: 100;
-  line-height: 30px;
-  color: @white;
-  text-align: center;
-  background: @grayDarker;
-  border: 3px solid @white;
-  .border-radius(23px);
-  .opacity(50);
-
-  // we can't have this transition here
-  // because webkit cancels the carousel
-  // animation if you trip this while
-  // in the middle of another animation
-  // ;_;
-  // .transition(opacity .2s linear);
-
-  // Reposition the right one
-  &.right {
-    left: auto;
-    right: 15px;
-  }
-
-  // Hover/focus state
-  &:hover,
-  &:focus {
-    color: @white;
-    text-decoration: none;
-    .opacity(90);
-  }
-}
-
-// Carousel indicator pips
-// -----------------------------
-.carousel-indicators {
-  position: absolute;
-  top: 15px;
-  right: 15px;
-  z-index: 5;
-  margin: 0;
-  list-style: none;
-
-  li {
-    display: block;
-    float: left;
-    width: 10px;
-    height: 10px;
-    margin-left: 5px;
-    text-indent: -999px;
-    background-color: #ccc;
-    background-color: rgba(255,255,255,.25);
-    border-radius: 5px;
-  }
-  .active {
-    background-color: #fff;
-  }
-}
-
-// Caption for text below images
-// -----------------------------
-
-.carousel-caption {
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding: 15px;
-  background: @grayDark;
-  background: rgba(0,0,0,.75);
-}
-.carousel-caption h4,
-.carousel-caption p {
-  color: @white;
-  line-height: @baseLineHeight;
-}
-.carousel-caption h4 {
-  margin: 0 0 5px;
-}
-.carousel-caption p {
-  margin-bottom: 0;
-}
diff --git a/app/assets/stylesheets/admin/framework/close.less b/app/assets/stylesheets/admin/framework/close.less
deleted file mode 100755
index 4c626bd..0000000
--- a/app/assets/stylesheets/admin/framework/close.less
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Close icons
-// --------------------------------------------------
-
-
-.close {
-  float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: @baseLineHeight;
-  color: @black;
-  text-shadow: 0 1px 0 rgba(255,255,255,1);
-  .opacity(20);
-  &:hover,
-  &:focus {
-    color: @black;
-    text-decoration: none;
-    cursor: pointer;
-    .opacity(40);
-  }
-}
-
-// Additional properties for button version
-// iOS requires the button element instead of an anchor tag.
-// If you want the anchor version, it requires `href="#"`.
-button.close {
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin/framework/code.less b/app/assets/stylesheets/admin/framework/code.less
deleted file mode 100755
index 266a926..0000000
--- a/app/assets/stylesheets/admin/framework/code.less
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// Code (inline and blocK)
-// --------------------------------------------------
-
-
-// Inline and block code styles
-code,
-pre {
-  padding: 0 3px 2px;
-  #font > #family > .monospace;
-  font-size: @baseFontSize - 2;
-  color: @grayDark;
-  .border-radius(3px);
-}
-
-// Inline code
-code {
-  padding: 2px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-  white-space: nowrap;
-}
-
-// Blocks of code
-pre {
-  display: block;
-  padding: (@baseLineHeight - 1) / 2;
-  margin: 0 0 @baseLineHeight / 2;
-  font-size: @baseFontSize - 1; // 14px to 13px
-  line-height: @baseLineHeight;
-  word-break: break-all;
-  word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc; // fallback for IE7-8
-  border: 1px solid rgba(0,0,0,.15);
-  .border-radius(@baseBorderRadius);
-
-  // Make prettyprint styles more spaced out for readability
-  &.prettyprint {
-    margin-bottom: @baseLineHeight;
-  }
-
-  // Account for some code outputs that place code tags in pre tags
-  code {
-    padding: 0;
-    color: inherit;
-    white-space: pre;
-    white-space: pre-wrap;
-    background-color: transparent;
-    border: 0;
-  }
-}
-
-// Enable scrollable blocks of code
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin/framework/component-animations.less b/app/assets/stylesheets/admin/framework/component-animations.less
deleted file mode 100755
index d614263..0000000
--- a/app/assets/stylesheets/admin/framework/component-animations.less
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Component animations
-// --------------------------------------------------
-
-
-.fade {
-  opacity: 0;
-  .transition(opacity .15s linear);
-  &.in {
-    opacity: 1;
-  }
-}
-
-.collapse {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  .transition(height .35s ease);
-  &.in {
-    height: auto;
-  }
-}
diff --git a/app/assets/stylesheets/admin/framework/dropdowns.less b/app/assets/stylesheets/admin/framework/dropdowns.less
deleted file mode 100755
index 9e47b47..0000000
--- a/app/assets/stylesheets/admin/framework/dropdowns.less
+++ /dev/null
@@ -1,248 +0,0 @@
-//
-// Dropdown menus
-// --------------------------------------------------
-
-
-// Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
-.dropup,
-.dropdown {
-  position: relative;
-}
-.dropdown-toggle {
-  // The caret makes the toggle a bit too tall in IE7
-  *margin-bottom: -3px;
-}
-.dropdown-toggle:active,
-.open .dropdown-toggle {
-  outline: 0;
-}
-
-// Dropdown arrow/caret
-// --------------------
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  vertical-align: top;
-  border-top:   4px solid @black;
-  border-right: 4px solid transparent;
-  border-left:  4px solid transparent;
-  content: "";
-}
-
-// Place the caret
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
-}
-
-// The dropdown menu (ul)
-// ----------------------
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: @zindexDropdown;
-  display: none; // none by default, but block on "open" of the menu
-  float: left;
-  min-width: 160px;
-  padding: 5px 0;
-  margin: 2px 0 0; // override default ul
-  list-style: none;
-  background-color: @dropdownBackground;
-  border: 1px solid #ccc; // Fallback for IE7-8
-  border: 1px solid @dropdownBorder;
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-  .border-radius(6px);
-  .box-shadow(0 5px 10px rgba(0,0,0,.2));
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-
-  // Aligns the dropdown menu to right
-  &.pull-right {
-    right: 0;
-    left: auto;
-  }
-
-  // Dividers (basically an hr) within the dropdown
-  .divider {
-    .nav-divider(@dropdownDividerTop, @dropdownDividerBottom);
-  }
-
-  // Links within the dropdown menu
-  > li > a {
-    display: block;
-    padding: 3px 20px;
-    clear: both;
-    font-weight: normal;
-    line-height: @baseLineHeight;
-    color: @dropdownLinkColor;
-    white-space: nowrap;
-  }
-}
-
-// Hover/Focus state
-// -----------
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus,
-.dropdown-submenu:hover > a,
-.dropdown-submenu:focus > a {
-  text-decoration: none;
-  color: @dropdownLinkColorHover;
-  #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
-}
-
-// Active state
-// ------------
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  color: @dropdownLinkColorActive;
-  text-decoration: none;
-  outline: 0;
-  #gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%));
-}
-
-// Disabled state
-// --------------
-// Gray out text and ensure the hover/focus state remains gray
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  color: @grayLight;
-}
-// Nuke hover/focus effects
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  text-decoration: none;
-  background-color: transparent;
-  background-image: none; // Remove CSS gradient
-  .reset-filter();
-  cursor: default;
-}
-
-// Open state for the dropdown
-// ---------------------------
-.open {
-  // IE7's z-index only goes to the nearest positioned ancestor, which would
-  // make the menu appear below buttons that appeared later on the page
-  *z-index: @zindexDropdown;
-
-  & > .dropdown-menu {
-    display: block;
-  }
-}
-
-// Backdrop to catch body clicks on mobile, etc.
-// ---------------------------
-.dropdown-backdrop {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  top: 0;
-  z-index: @zindexDropdown - 10;
-}
-
-// Right aligned dropdowns
-// ---------------------------
-.pull-right > .dropdown-menu {
-  right: 0;
-  left: auto;
-}
-
-// Allow for dropdowns to go bottom up (aka, dropup-menu)
-// ------------------------------------------------------
-// Just add .dropup after the standard .dropdown class and you're set, bro.
-// TODO: abstract this so that the navbar fixed styles are not placed here?
-.dropup,
-.navbar-fixed-bottom .dropdown {
-  // Reverse the caret
-  .caret {
-    border-top: 0;
-    border-bottom: 4px solid @black;
-    content: "";
-  }
-  // Different positioning for bottom up menu
-  .dropdown-menu {
-    top: auto;
-    bottom: 100%;
-    margin-bottom: 1px;
-  }
-}
-
-// Sub menus
-// ---------------------------
-.dropdown-submenu {
-  position: relative;
-}
-// Default dropdowns
-.dropdown-submenu > .dropdown-menu {
-  top: 0;
-  left: 100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  .border-radius(0 6px 6px 6px);
-}
-.dropdown-submenu:hover > .dropdown-menu {
-  display: block;
-}
-
-// Dropups
-.dropup .dropdown-submenu > .dropdown-menu {
-  top: auto;
-  bottom: 0;
-  margin-top: 0;
-  margin-bottom: -2px;
-  .border-radius(5px 5px 5px 0);
-}
-
-// Caret to indicate there is a submenu
-.dropdown-submenu > a:after {
-  display: block;
-  content: " ";
-  float: right;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-  border-width: 5px 0 5px 5px;
-  border-left-color: darken(@dropdownBackground, 20%);
-  margin-top: 5px;
-  margin-right: -10px;
-}
-.dropdown-submenu:hover > a:after {
-  border-left-color: @dropdownLinkColorHover;
-}
-
-// Left aligned submenus
-.dropdown-submenu.pull-left {
-  // Undo the float
-  // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere.
-  float: none;
-
-  // Positioning the submenu
-  > .dropdown-menu {
-    left: -100%;
-    margin-left: 10px;
-    .border-radius(6px 0 6px 6px);
-  }
-}
-
-// Tweak nav headers
-// -----------------
-// Increase padding from 15px to 20px on sides
-.dropdown .dropdown-menu .nav-header {
-  padding-left: 20px;
-  padding-right: 20px;
-}
-
-// Typeahead
-// ---------
-.typeahead {
-  z-index: 1051;
-  margin-top: 2px; // give it some space to breathe
-  .border-radius(@baseBorderRadius);
-}
diff --git a/app/assets/stylesheets/admin/framework/forms.less b/app/assets/stylesheets/admin/framework/forms.less
deleted file mode 100755
index b995858..0000000
--- a/app/assets/stylesheets/admin/framework/forms.less
+++ /dev/null
@@ -1,695 +0,0 @@
-//
-// Forms
-// --------------------------------------------------
-
-
-// GENERAL STYLES
-// --------------
-
-// Make all forms have space below them
-form {
-  margin: 0 0 @baseLineHeight;
-}
-
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-// Groups of fields with labels on top (legends)
-legend {
-  display: block;
-//  width: 100%;
-  padding: 0;
-  margin-bottom: @baseLineHeight;
-  font-size: @baseFontSize * 1.5;
-  line-height: @baseLineHeight * 2;
-  color: @grayDark;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
-
-  // Small
-  small {
-    font-size: @baseLineHeight * .75;
-    color: @grayLight;
-  }
-}
-
-// Set font for forms
-label,
-input,
-button,
-select,
-textarea {
-  #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here
-}
-input,
-button,
-select,
-textarea {
-  font-family: @baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
-}
-
-// Identify controls by their labels
-label {
-  display: block;
-  margin-bottom: 5px;
-}
-
-// Form controls
-// -------------------------
-
-// Shared size and type resets
-select,
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.input-style,
-.uneditable-input {
-  display: inline-block;
-  height: @baseLineHeight;
-  padding: 4px 6px;
-  margin-bottom: @baseLineHeight / 2;
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  color: @gray;
-  .border-radius(@inputBorderRadius);
-  vertical-align: middle;
-}
-
-// Reset appearance properties for textual inputs and textarea
-// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
-input,
-textarea,
-.uneditable-input {
-//  width: 206px; // plus 12px padding and 2px border
-}
-// Reset height since textareas have rows
-textarea {
-  height: auto;
-}
-// Everything else
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.input-style,
-.uneditable-input {
-  background-color: @inputBackground;
-  border: 1px solid @inputBorder;
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
-  .transition(~"border linear .2s, box-shadow linear .2s");
-
-  // Focus state
-  &:focus {
-    border-color: rgba(82,168,236,.8);
-    outline: 0;
-    outline: thin dotted \9; /* IE6-9 */
-    .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
-  }
-}
-
-// Position radios and checkboxes better
-input[type="radio"],
-input[type="checkbox"] {
-  margin: 4px 0 0;
-  *margin-top: 0; /* IE7 */
-  margin-top: 1px \9; /* IE8-9 */
-  line-height: normal;
-}
-
-// Reset width of input images, buttons, radios, checkboxes
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
- // width: auto; // Override of generic input selector
-}
-
-// Set the height of select and file controls to match text inputs
-select,
-input[type="file"] {
-  height: @inputHeight; /* In IE7, the height of the select element cannot be changed by height, only font-size */
-  *margin-top: 4px; /* For IE7, add top margin to align select with labels */
-  line-height: @inputHeight;
-}
-
-// Make select elements obey height by applying a border
-select {
- // width: 220px; // default input width + 10px of padding that doesn't get applied
-  border: 1px solid @inputBorder;
-  background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color
-}
-
-// Make multiple select elements height not fixed
-select[multiple],
-select[size] {
-  height: auto;
-}
-
-// Focus for select, file, radio, and checkbox
-select:focus,
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-  .tab-focus();
-}
-
-
-// Uneditable inputs
-// -------------------------
-
-// Make uneditable inputs look inactive
-.uneditable-input,
-.uneditable-textarea {
-  color: @grayLight;
-  background-color: darken(@inputBackground, 1%);
-  border-color: @inputBorder;
-  .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
-  cursor: not-allowed;
-}
-
-// For text that needs to appear as an input but should not be an input
-.uneditable-input {
-  overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
-  white-space: nowrap;
-}
-
-// Make uneditable textareas behave like a textarea
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-
-
-// Placeholder
-// -------------------------
-
-// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector
-input,
-textarea {
-  .placeholder();
-}
-
-
-// CHECKBOXES & RADIOS
-// -------------------
-
-// Indent the labels to position radios/checkboxes as hanging
-.radio,
-.checkbox {
-  min-height: @baseLineHeight; // clear the floating input if there is no label text
-  padding-left: 20px;
-}
-.radio input[type="radio"],
-.checkbox input[type="checkbox"] {
-  float: left;
-  margin-left: -20px;
-}
-
-// Move the options list down to align with labels
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  padding-top: 5px; // has to be padding because margin collaspes
-}
-
-// Radios and checkboxes on same line
-// TODO v3: Convert .inline to .control-inline
-.radio.inline,
-.checkbox.inline {
-  display: inline-block;
-  padding-top: 5px;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
-  margin-left: 10px; // space out consecutive inline controls
-}
-
-
-
-// INPUT SIZES
-// -----------
-
-// General classes for quick sizes
-/*
-.input-mini       { width: 60px; }
-.input-small      { width: 90px; }
-.input-medium     { width: 150px; }
-.input-large      { width: 210px; }
-.input-xlarge     { width: 270px; }
-.input-xxlarge    { width: 530px; }
-
-*/
-
-// Grid style input sizes
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input[class*="span"],
-// Redeclare since the fluid row class is more specific
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"] {
-  float: none;
-  margin-left: 0;
-}
-// Ensure input-prepend/append never wraps
-.input-append input[class*="span"],
-.input-append .uneditable-input[class*="span"],
-.input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
-  display: inline-block;
-}
-
-
-
-// GRID SIZING FOR INPUTS
-// ----------------------
-
-// Grid sizes
-#grid > .input(@gridColumnWidth, @gridGutterWidth);
-
-// Control row for multiple inputs per line
-.controls-row {
-  .clearfix(); // Clear the float from controls
-}
-
-// Float to collapse white-space for proper grid alignment
-.controls-row [class*="span"],
-// Redeclare the fluid grid collapse since we undo the float for inputs
-.row-fluid .controls-row [class*="span"] {
-  float: left;
-}
-// Explicity set top padding on all checkboxes/radios, not just first-child
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
-  padding-top: 5px;
-}
-
-
-
-
-// DISABLED STATE
-// --------------
-
-// Disabled and read-only inputs
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  cursor: not-allowed;
-  background-color: @inputDisabledBackground;
-}
-// Explicitly reset the colors here
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
-}
-
-
-
-
-// FORM FIELD FEEDBACK STATES
-// --------------------------
-
-// Warning
-.control-group.warning {
-  .formFieldState(@warningText, @warningText, @warningBackground);
-}
-// Error
-.control-group.error {
-  .formFieldState(@errorText, @errorText, @errorBackground);
-}
-// Success
-.control-group.success {
-  .formFieldState(@successText, @successText, @successBackground);
-}
-// Success
-.control-group.info {
-  .formFieldState(@infoText, @infoText, @infoBackground);
-}
-
-// HTML5 invalid states
-// Shares styles with the .control-group.error above
-input:focus:invalid,
-textarea:focus:invalid,
-select:focus:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-  &:focus {
-    border-color: darken(#ee5f5b, 10%);
-    @shadow: 0 0 6px lighten(#ee5f5b, 20%);
-    .box-shadow(@shadow);
-  }
-}
-
-
-
-// FORM ACTIONS
-// ------------
-
-.form-actions {
-  padding: (@baseLineHeight - 1) 20px @baseLineHeight;
-  margin-top: @baseLineHeight;
-  margin-bottom: @baseLineHeight;
-  background-color: @formActionsBackground;
-  border-top: 1px solid #e5e5e5;
-  .clearfix(); // Adding clearfix to allow for .pull-right button containers
-}
-
-
-
-// HELP TEXT
-// ---------
-
-.help-block,
-.help-inline {
-  color: lighten(@textColor, 15%); // lighten the text some for contrast
-}
-
-.help-block {
-  display: block; // account for any element using help-block
-  margin-bottom: @baseLineHeight / 2;
-}
-
-.help-inline {
-  display: inline-block;
-  .ie7-inline-block();
-  vertical-align: middle;
-  padding-left: 5px;
-}
-
-
-
-// INPUT GROUPS
-// ------------
-
-// Allow us to put symbols and text within the input field for a cleaner look
-.input-append,
-.input-prepend {
-  display: inline-block;
-  margin-bottom: @baseLineHeight / 2;
-  vertical-align: middle;
-  font-size: 0; // white space collapse hack
-  white-space: nowrap; // Prevent span and input from separating
-
-  // Reset the white space collapse hack
-  input,
-  select,
-  .uneditable-input,
-  .dropdown-menu,
-  .popover {
-    font-size: @baseFontSize;
-  }
-
-  input,
-  select,
-  .uneditable-input {
-    position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
-    margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
-    *margin-left: 0;
-    vertical-align: top;
-    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-    // Make input on top when focused so blue border and shadow always show
-    &:focus {
-      z-index: 2;
-    }
-  }
-  .add-on {
-    display: inline-block;
-    width: auto;
-    height: @baseLineHeight;
-    min-width: 16px;
-    padding: 4px 5px;
-    font-size: @baseFontSize;
-    font-weight: normal;
-    line-height: @baseLineHeight;
-    text-align: center;
-    text-shadow: 0 1px 0 @white;
-    background-color: @grayLighter;
-    border: 1px solid #ccc;
-  }
-  .add-on,
-  .btn,
-  .btn-group > .dropdown-toggle {
-    vertical-align: top;
-    .border-radius(0);
-  }
-  .active {
-    background-color: lighten(@green, 30);
-    border-color: @green;
-  }
-}
-
-.input-prepend {
-  .add-on,
-  .btn {
-    margin-right: -1px;
-  }
-  .add-on:first-child,
-  .btn:first-child {
-    // FYI, `.btn:first-child` accounts for a button group that's prepended
-    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
-  }
-}
-
-.input-append {
-  input,
-  select,
-  .uneditable-input {
-    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
-    + .btn-group .btn:last-child {
-      .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-    }
-  }
-  .add-on,
-  .btn,
-  .btn-group {
-    margin-left: -1px;
-  }
-  .add-on:last-child,
-  .btn:last-child,
-  .btn-group:last-child > .dropdown-toggle {
-    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-  }
-}
-
-// Remove all border-radius for inputs with both prepend and append
-.input-prepend.input-append {
-  input,
-  select,
-  .uneditable-input {
-    .border-radius(0);
-    + .btn-group .btn {
-      .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-    }
-  }
-  .add-on:first-child,
-  .btn:first-child {
-    margin-right: -1px;
-    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
-  }
-  .add-on:last-child,
-  .btn:last-child {
-    margin-left: -1px;
-    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
-  }
-  .btn-group:first-child {
-    margin-left: 0;
-  }
-}
-
-
-
-
-// SEARCH FORM
-// -----------
-
-input.search-query {
-  padding-right: 14px;
-  padding-right: 4px \9;
-  padding-left: 14px;
-  padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
-  margin-bottom: 0; // Remove the default margin on all inputs
-  .border-radius(15px);
-}
-
-/* Allow for input prepend/append in search forms */
-.form-search .input-append .search-query,
-.form-search .input-prepend .search-query {
-  .border-radius(0); // Override due to specificity
-}
-.form-search .input-append .search-query {
-  .border-radius(14px 0 0 14px);
-}
-.form-search .input-append .btn {
-  .border-radius(0 14px 14px 0);
-}
-.form-search .input-prepend .search-query {
-  .border-radius(0 14px 14px 0);
-}
-.form-search .input-prepend .btn {
-  .border-radius(14px 0 0 14px);
-}
-
-
-
-
-// HORIZONTAL & VERTICAL FORMS
-// ---------------------------
-
-// Common properties
-// -----------------
-
-.form-search,
-.form-inline,
-.form-horizontal {
-  input,
-  textarea,
-  select,
-  .help-inline,
-  .uneditable-input,
-  .input-prepend,
-  .input-append {
-    display: inline-block;
-    .ie7-inline-block();
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  // Re-hide hidden elements due to specifity
-  .hide {
-    display: none;
-  }
-}
-.form-search label,
-.form-inline label,
-.form-search .btn-group,
-.form-inline .btn-group {
-  display: inline-block;
-}
-// Remove margin for input-prepend/-append
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
-  margin-bottom: 0;
-}
-// Inline checkbox/radio labels (remove padding on left)
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
-  padding-left: 0;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-// Remove float and margin, set to inline-block
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
-  float: left;
-  margin-right: 3px;
-  margin-left: 0;
-}
-
-
-// Margin to space out fieldsets
-.control-group {
-  margin-bottom: @baseLineHeight / 2;
-}
-
-// Legend collapses margin, so next element is responsible for spacing
-legend + .control-group {
-  margin-top: @baseLineHeight;
-  -webkit-margin-top-collapse: separate;
-}
-
-// Horizontal-specific styles
-// --------------------------
-
-.form-horizontal {
-  // Increase spacing between groups
-  .control-group {
-    margin-bottom: @baseLineHeight;
-    .clearfix();
-  }
-  // Float the labels left
-  .control-label {
-    float: left;
-    width: @horizontalComponentOffset - 20;
-    padding-top: 5px;
-    text-align: right;
-  }
-  // Move over all input controls and content
-  .controls {
-    // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend
-    // don't inherit the margin of the parent, in this case .controls
-    *display: inline-block;
-    *padding-left: 20px;
-    margin-left: @horizontalComponentOffset;
-    *margin-left: 0;
-    &:first-child {
-      *padding-left: @horizontalComponentOffset;
-    }
-  }
-  // Remove bottom margin on block level help text since that's accounted for on .control-group
-  .help-block {
-    margin-bottom: 0;
-  }
-  // And apply it only to .help-block instances that follow a form control
-  input,
-  select,
-  textarea,
-  .uneditable-input,
-  .input-prepend,
-  .input-append {
-    + .help-block {
-      margin-top: @baseLineHeight / 2;
-    }
-  }
-  // Move over buttons in .form-actions to align with .controls
-  .form-actions {
-    padding-left: @horizontalComponentOffset;
-  }
-}
diff --git a/app/assets/stylesheets/admin/framework/formt.less b/app/assets/stylesheets/admin/framework/formt.less
deleted file mode 100644
index 30ea1a4..0000000
--- a/app/assets/stylesheets/admin/framework/formt.less
+++ /dev/null
@@ -1,310 +0,0 @@
-.formtastic{
-	.label, .badge {
-	display: inline-block;
-	padding: 0px;
-	font-size: inherit;
-	font-weight: normal;
-	font-family:inherit;
-	line-height: 14px;
-	color:inherit;
-	vertical-align: baseline;
-	white-space: auto;
-	text-shadow: none;
-	background-color: transparent;
-	}
-	
-}
-
-
-/* -------------------------------------------------------------------------------------------------
-
-It's *strongly* suggested that you don't modify this file.  Instead, load a new stylesheet after
-this one in your layouts (eg formtastic_changes.css) and override the styles to suit your needs.
-This will allow you to update formtastic.css with new releases without clobbering your own changes.
-
-This stylesheet forms part of the Formtastic Rails Plugin
-(c) 2008-2011 Justin French
-
---------------------------------------------------------------------------------------------------*/
-
-/* NORMALIZE AND RESET - obviously inspired by Yahoo's reset.css, but scoped to just .formtastic
---------------------------------------------------------------------------------------------------*/
-.formtastic,
-.formtastic ul,
-.formtastic ol,
-.formtastic li,
-.formtastic fieldset,
-.formtastic legend,
-.formtastic button,
-.formtastic textarea,
-.formtastic select,
-.formtastic p {
-  margin:0;
-  padding:0;
-}
-
-.formtastic fieldset {
-  border:0;
-}
-
-.formtastic em,
-.formtastic strong {
-  font-style:normal;
-  font-weight:normal;
-}
-
-.formtastic ol,
-.formtastic ul {
-  list-style:none;
-}
-
-.formtastic abbr,
-.formtastic acronym {
-  border:0;
-  font-variant:normal;
-}
-
-.formtastic input,
-.formtastic button,
-.formtastic textarea {
-  font-family:sans-serif;
-  font-size:inherit;
-  font-weight:inherit;
-}
-
-.formtastic input,
-.formtastic textarea,
-.formtastic select {
-  font-size:100%;
-}
-
-.formtastic legend {
-  white-space:normal;
-  color:#000;
-}
-
-
-/* SEMANTIC ERRORS
---------------------------------------------------------------------------------------------------*/
-.formtastic .errors {
-  color:#cc0000;
-  margin:0.5em 0 1.5em 25%;
-  list-style:square;
-}
-
-.formtastic .errors li {
-  padding:0;
-  border:none;
-  display:list-item;
-}
-
-
-/* BUTTONS & ACTIONS
---------------------------------------------------------------------------------------------------*/
-.formtastic .buttons, 
-.formtastic .actions {
-  overflow:hidden; /* clear containing floats */
-  padding-left:25%;
-}
-
-.formtastic .button, 
-.formtastic .action {
-  float:left;
-  padding-right:0.5em;
-}
-
-.formtastic .button_action button {
-  padding:3px 8px;
-}
-
-.formtastic .link_action a {
-  display:block;
-  padding:3px 0;
-}
-
-
-/* INPUTS
---------------------------------------------------------------------------------------------------*/
-.formtastic .inputs {
-  overflow:hidden; /* clear containing floats */
-}
-
-.formtastic .input {
-  overflow:hidden; /* clear containing floats */
-  padding:0.5em 0; /* padding and negative margin juggling is for Firefox */
-  margin-top:-0.5em;
-  margin-bottom:1em;
-}
-
-
-/* LEFT ALIGNED LABELS
---------------------------------------------------------------------------------------------------*/
-.formtastic .input .label {
-  display:block;
-  width:25%;
-  float:left;
-  padding-top:.2em;
-}
-
-.formtastic .fragments .label,
-.formtastic .choices .label {
-  position:absolute;
-  width:95%;
-  left:0px;
-}
-
-.formtastic .fragments .label label,
-.formtastic .choices .label label {
-  position:absolute;
-}
-
-/* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
---------------------------------------------------------------------------------------------------*/
-.formtastic .choices {
-  position:relative;
-}
-
-.formtastic .choices-group {
-  float:left;
-  width:74%;
-  margin:0;
-  padding:0 0 0 25%;
-}
-
-.formtastic .choice {
-  padding:0;
-  border:0;
-}
-
-
-/* INLINE HINTS
---------------------------------------------------------------------------------------------------*/
-.formtastic .input .inline-hints {
-  color:#666;
-  margin:0.5em 0 0 25%;
-}
-
-
-/* INLINE ERRORS
---------------------------------------------------------------------------------------------------*/
-.formtastic .inline-errors {
-  color:#cc0000;
-  margin:0.5em 0 0 25%;
-}
-
-.formtastic .errors {
-  color:#cc0000;
-  margin:0.5em 0 0 25%;
-  list-style:square;
-}
-
-.formtastic .errors li {
-  padding:0;
-  border:none;
-  display:list-item;
-}
-
-
-/* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE, SEARCH (ETC) OVERRIDES
---------------------------------------------------------------------------------------------------*/
-.formtastic .stringish input {
-  width:70%;
-}
-
-.formtastic .stringish input[size],
-.formtastic .stringish input[max] {
-  width:auto;
-  max-width:70%;
-}
-
-
-/* TEXTAREA OVERRIDES
---------------------------------------------------------------------------------------------------*/
-.formtastic .text textarea {
-  width:70%;
-}
-
-.formtastic .text textarea[cols] {
-  width:auto;
-  max-width:70%;
-}
-
-
-/* HIDDEN OVERRIDES
---------------------------------------------------------------------------------------------------*/
-.formtastic .hidden {
-  display:none;
-}
-
-
-/* BOOLEAN LABELS
---------------------------------------------------------------------------------------------------*/
-.formtastic .boolean label {
-  padding-left:25%;
-  display:block;
-}
-
-
-/* CHOICE GROUPS
---------------------------------------------------------------------------------------------------*/
-.formtastic .choices-group {
-  margin-bottom:-0.5em;
-}
-
-.formtastic .choice {
-  margin:0.1em 0 0.5em 0;
-}
-
-.formtastic .choice label {
-  float:none;
-  width:100%;
-  line-height:100%;
-  padding-top:0;
-  margin-bottom:0.6em;
-}
-
-
-/* ADJUSTMENTS FOR INPUTS INSIDE LABELS (boolean input, radio input, check_boxes input)
---------------------------------------------------------------------------------------------------*/
-.formtastic .choice label input,
-.formtastic .boolean label input {
-  margin:0 0.3em 0 0.1em;
-  line-height:100%;
-}
-
-
-/* FRAGMENTED INPUTS (DATE/TIME/DATETIME)
---------------------------------------------------------------------------------------------------*/
-.formtastic .fragments {
-  position:relative;
-}
-
-.formtastic .fragments-group {
-  float:left;
-  width:74%;
-  margin:0;
-  padding:0 0 0 25%;
-}
-
-.formtastic .fragment {
-  float:left;
-  width:auto;
-  margin:0 .3em 0 0;
-  padding:0;
-  border:0;
-}
-
-.formtastic .fragment label {
-  display:none;
-}
-
-.formtastic .fragment label input {
-  display:inline;
-  margin:0;
-  padding:0;
-}
-
-
-.formtastic .button{
-	.btn;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin/framework/grid.less b/app/assets/stylesheets/admin/framework/grid.less
deleted file mode 100755
index 750d203..0000000
--- a/app/assets/stylesheets/admin/framework/grid.less
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Grid system
-// --------------------------------------------------
-
-
-// Fixed (940px)
-#grid > .core(@gridColumnWidth, @gridGutterWidth);
-
-// Fluid (940px)
-#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
-
-// Reset utility classes due to specificity
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
-  display: none;
-}
-
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
-  float: right;
-}
diff --git a/app/assets/stylesheets/admin/framework/hero-unit.less b/app/assets/stylesheets/admin/framework/hero-unit.less
deleted file mode 100755
index 763d86a..0000000
--- a/app/assets/stylesheets/admin/framework/hero-unit.less
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Hero unit
-// --------------------------------------------------
-
-
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  font-size: 18px;
-  font-weight: 200;
-  line-height: @baseLineHeight * 1.5;
-  color: @heroUnitLeadColor;
-  background-color: @heroUnitBackground;
-  .border-radius(6px);
-  h1 {
-    margin-bottom: 0;
-    font-size: 60px;
-    line-height: 1;
-    color: @heroUnitHeadingColor;
-    letter-spacing: -1px;
-  }
-  li {
-    line-height: @baseLineHeight * 1.5; // Reset since we specify in type.less
-  }
-}
diff --git a/app/assets/stylesheets/admin/framework/labels-badges.less b/app/assets/stylesheets/admin/framework/labels-badges.less
deleted file mode 100755
index 6035fcb..0000000
--- a/app/assets/stylesheets/admin/framework/labels-badges.less
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Labels and badges
-// --------------------------------------------------
-
-
-// Base classes
-.label,.label2,
-.badge {
-  display: inline-block;
-  padding: 2px 4px;
-  font-size: @baseFontSize * .846;
-  font-weight: bold;
-  line-height: 14px; // ensure proper line-height if floated
-  color: @white;
-  vertical-align: baseline;
-  white-space: nowrap;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  background-color: @grayLight;
-}
-// Set unique padding and border-radii
-.label,.label2, {
-  .border-radius(3px);
-}
-.badge {
-  padding-left: 9px;
-  padding-right: 9px;
-  .border-radius(9px);
-}
-
-// Empty labels/badges collapse
-.label,.label2,
-.badge {
-  &:empty {
-    display: none;
-  }
-}
-
-// Hover/focus state, but only for links
-a {
-  &.label:hover,
-  &.label:focus,
-  &.badge:hover,
-  &.badge:focus {
-    color: @white;
-    text-decoration: none;
-    cursor: pointer;
-  }
-}
-
-// Colors
-// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
-.label,.label2,
-.badge {
-  // Important (red)
-  &-important         { background-color: @errorText; }
-  &-important[href]   { background-color: darken(@errorText, 10%); }
-  // Warnings (orange)
-  &-warning           { background-color: @orange; }
-  &-warning[href]     { background-color: darken(@orange, 10%); }
-  // Success (green)
-  &-success           { background-color: @successText; }
-  &-success[href]     { background-color: darken(@successText, 10%); }
-  // Info (turquoise)
-  &-info              { background-color: @infoText; }
-  &-info[href]        { background-color: darken(@infoText, 10%); }
-  // Inverse (black)
-  &-inverse           { background-color: @grayDark; }
-  &-inverse[href]     { background-color: darken(@grayDark, 10%); }
-}
-
-// Quick fix for labels/badges in buttons
-.btn {
-  .label.label2,,
-  .badge {
-    position: relative;
-    top: -1px;
-  }
-}
-.btn-mini {
-  .label.label2,,
-  .badge {
-    top: 0;
-  }
-}
diff --git a/app/assets/stylesheets/admin/framework/layouts.less b/app/assets/stylesheets/admin/framework/layouts.less
deleted file mode 100755
index 24a2062..0000000
--- a/app/assets/stylesheets/admin/framework/layouts.less
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Layouts
-// --------------------------------------------------
-
-
-// Container (centered, fixed-width layouts)
-.container {
-  .container-fixed();
-}
-
-// Fluid layouts (left aligned, with sidebar, min- & max-width content)
-.container-fluid {
-  padding-right: @gridGutterWidth;
-  padding-left: @gridGutterWidth;
-  .clearfix();
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin/framework/media.less b/app/assets/stylesheets/admin/framework/media.less
deleted file mode 100755
index e461e44..0000000
--- a/app/assets/stylesheets/admin/framework/media.less
+++ /dev/null
@@ -1,55 +0,0 @@
-// Media objects
-// Source: http://stubbornella.org/content/?p=497
-// --------------------------------------------------
-
-
-// Common styles
-// -------------------------
-
-// Clear the floats
-.media,
-.media-body {
-  overflow: hidden;
-  *overflow: visible;
-  zoom: 1;
-}
-
-// Proper spacing between instances of .media
-.media,
-.media .media {
-  margin-top: 15px;
-}
-.media:first-child {
-  margin-top: 0;
-}
-
-// For images and videos, set to block
-.media-object {
-  display: block;
-}
-
-// Reset margins on headings for tighter default spacing
-.media-heading {
-  margin: 0 0 5px;
-}
-
-
-// Media image alignment
-// -------------------------
-
-.media > .pull-left {
-  margin-right: 10px;
-}
-.media > .pull-right {
-  margin-left: 10px;
-}
-
-
-// Media list variation
-// -------------------------
-
-// Undo default ul/ol styles
-.media-list {
-  margin-left: 0;
-  list-style: none;
-}
diff --git a/app/assets/stylesheets/admin/framework/mixins.less b/app/assets/stylesheets/admin/framework/mixins.less
deleted file mode 100755
index 79d8892..0000000
--- a/app/assets/stylesheets/admin/framework/mixins.less
+++ /dev/null
@@ -1,702 +0,0 @@
-//
-// Mixins
-// --------------------------------------------------
-
-
-// UTILITY MIXINS
-// --------------------------------------------------
-
-// Clearfix
-// --------
-// For clearing floats like a boss h5bp.com/q
-.clearfix {
-  *zoom: 1;
-  &:before,
-  &:after {
-    display: table;
-    content: "";
-    // Fixes Opera/contenteditable bug:
-    // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
-    line-height: 0;
-  }
-  &:after {
-    clear: both;
-  }
-}
-
-// Webkit-style focus
-// ------------------
-.tab-focus() {
-  // Default
-  outline: thin dotted #333;
-  // Webkit
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-// Center-align a block level element
-// ----------------------------------
-.center-block() {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-// IE7 inline-block
-// ----------------
-.ie7-inline-block() {
-  *display: inline; /* IE7 inline-block hack */
-  *zoom: 1;
-}
-
-// IE7 likes to collapse whitespace on either side of the inline-block elements.
-// Ems because we're attempting to match the width of a space character. Left
-// version is for form buttons, which typically come after other elements, and
-// right version is for icons, which come before. Applying both is ok, but it will
-// mean that space between those elements will be .6em (~2 space characters) in IE7,
-// instead of the 1 space in other browsers.
-.ie7-restore-left-whitespace() {
-  *margin-left: .3em;
-
-  &:first-child {
-    *margin-left: 0;
-  }
-}
-
-.ie7-restore-right-whitespace() {
-  *margin-right: .3em;
-}
-
-// Sizing shortcuts
-// -------------------------
-.size(@height, @width) {
-  width: @width;
-  height: @height;
-}
-.square(@size) {
-  .size(@size, @size);
-}
-
-// Placeholder text
-// -------------------------
-.placeholder(@color: @placeholderText) {
-  &:-moz-placeholder {
-    color: @color;
-  }
-  &:-ms-input-placeholder {
-    color: @color;
-  }
-  &::-webkit-input-placeholder {
-    color: @color;
-  }
-}
-
-// Text overflow
-// -------------------------
-// Requires inline-block or block for proper styling
-.text-overflow() {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-// CSS image replacement
-// -------------------------
-// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-
-// FONTS
-// --------------------------------------------------
-
-#font {
-  #family {
-    .serif() {
-      font-family: @serifFontFamily;
-    }
-    .sans-serif() {
-      font-family: @sansFontFamily;
-    }
-    .monospace() {
-      font-family: @monoFontFamily;
-    }
-  }
-  .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    font-size: @size;
-    font-weight: @weight;
-    line-height: @lineHeight;
-  }
-  .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    #font > #family > .serif;
-    #font > .shorthand(@size, @weight, @lineHeight);
-  }
-  .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    #font > #family > .sans-serif;
-    #font > .shorthand(@size, @weight, @lineHeight);
-  }
-  .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
-    #font > #family > .monospace;
-    #font > .shorthand(@size, @weight, @lineHeight);
-  }
-}
-
-
-// FORMS
-// --------------------------------------------------
-
-// Block level inputs
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: @inputHeight; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
-  .box-sizing(border-box); // Makes inputs behave like true block-level elements
-}
-
-
-
-// Mixin for form field states
-.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
-  // Set the text color
-  .control-label,
-  .help-block,
-  .help-inline {
-    color: @textColor;
-  }
-  // Style inputs accordingly
-  .checkbox,
-  .radio,
-  input,
-  select,
-  textarea {
-    color: @textColor;
-  }
-  input,
-  select,
-  textarea {
-    border-color: @borderColor;
-    .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
-    &:focus {
-      border-color: darken(@borderColor, 10%);
-      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
-      .box-shadow(@shadow);
-    }
-  }
-  // Give a small background color for input-prepend/-append
-  .input-prepend .add-on,
-  .input-append .add-on {
-    color: @textColor;
-    background-color: @backgroundColor;
-    border-color: @textColor;
-  }
-}
-
-
-
-// CSS3 PROPERTIES
-// --------------------------------------------------
-
-// Border Radius
-.border-radius(@radius) {
-  -webkit-border-radius: @radius;
-     -moz-border-radius: @radius;
-          border-radius: @radius;
-}
-
-// Single Corner Border Radius
-.border-top-left-radius(@radius) {
-  -webkit-border-top-left-radius: @radius;
-      -moz-border-radius-topleft: @radius;
-          border-top-left-radius: @radius;
-}
-.border-top-right-radius(@radius) {
-  -webkit-border-top-right-radius: @radius;
-      -moz-border-radius-topright: @radius;
-          border-top-right-radius: @radius;
-}
-.border-bottom-right-radius(@radius) {
-  -webkit-border-bottom-right-radius: @radius;
-      -moz-border-radius-bottomright: @radius;
-          border-bottom-right-radius: @radius;
-}
-.border-bottom-left-radius(@radius) {
-  -webkit-border-bottom-left-radius: @radius;
-      -moz-border-radius-bottomleft: @radius;
-          border-bottom-left-radius: @radius;
-}
-
-// Single Side Border Radius
-.border-top-radius(@radius) {
-  .border-top-right-radius(@radius);
-  .border-top-left-radius(@radius);
-}
-.border-right-radius(@radius) {
-  .border-top-right-radius(@radius);
-  .border-bottom-right-radius(@radius);
-}
-.border-bottom-radius(@radius) {
-  .border-bottom-right-radius(@radius);
-  .border-bottom-left-radius(@radius);
-}
-.border-left-radius(@radius) {
-  .border-top-left-radius(@radius);
-  .border-bottom-left-radius(@radius);
-}
-
-// Drop shadows
-.box-shadow(@shadow) {
-  -webkit-box-shadow: @shadow;
-     -moz-box-shadow: @shadow;
-          box-shadow: @shadow;
-}
-
-// Transitions
-.transition(@transition) {
-  -webkit-transition: @transition;
-     -moz-transition: @transition;
-       -o-transition: @transition;
-          transition: @transition;
-}
-.transition-delay(@transition-delay) {
-  -webkit-transition-delay: @transition-delay;
-     -moz-transition-delay: @transition-delay;
-       -o-transition-delay: @transition-delay;
-          transition-delay: @transition-delay;
-}
-.transition-duration(@transition-duration) {
-  -webkit-transition-duration: @transition-duration;
-     -moz-transition-duration: @transition-duration;
-       -o-transition-duration: @transition-duration;
-          transition-duration: @transition-duration;
-}
-
-// Transformations
-.rotate(@degrees) {
-  -webkit-transform: rotate(@degrees);
-     -moz-transform: rotate(@degrees);
-      -ms-transform: rotate(@degrees);
-       -o-transform: rotate(@degrees);
-          transform: rotate(@degrees);
-}
-.scale(@ratio) {
-  -webkit-transform: scale(@ratio);
-     -moz-transform: scale(@ratio);
-      -ms-transform: scale(@ratio);
-       -o-transform: scale(@ratio);
-          transform: scale(@ratio);
-}
-.translate(@x, @y) {
-  -webkit-transform: translate(@x, @y);
-     -moz-transform: translate(@x, @y);
-      -ms-transform: translate(@x, @y);
-       -o-transform: translate(@x, @y);
-          transform: translate(@x, @y);
-}
-.skew(@x, @y) {
-  -webkit-transform: skew(@x, @y);
-     -moz-transform: skew(@x, @y);
-      -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885
-       -o-transform: skew(@x, @y);
-          transform: skew(@x, @y);
-  -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319
-}
-.translate3d(@x, @y, @z) {
-  -webkit-transform: translate3d(@x, @y, @z);
-     -moz-transform: translate3d(@x, @y, @z);
-       -o-transform: translate3d(@x, @y, @z);
-          transform: translate3d(@x, @y, @z);
-}
-
-// Backface visibility
-// Prevent browsers from flickering when using CSS 3D transforms.
-// Default value is `visible`, but can be changed to `hidden
-// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
-.backface-visibility(@visibility){
-	-webkit-backface-visibility: @visibility;
-	   -moz-backface-visibility: @visibility;
-	        backface-visibility: @visibility;
-}
-
-// Background clipping
-// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
-.background-clip(@clip) {
-  -webkit-background-clip: @clip;
-     -moz-background-clip: @clip;
-          background-clip: @clip;
-}
-
-// Background sizing
-.background-size(@size) {
-  -webkit-background-size: @size;
-     -moz-background-size: @size;
-       -o-background-size: @size;
-          background-size: @size;
-}
-
-
-// Box sizing
-.box-sizing(@boxmodel) {
-  -webkit-box-sizing: @boxmodel;
-     -moz-box-sizing: @boxmodel;
-          box-sizing: @boxmodel;
-}
-
-// User select
-// For selecting text on the page
-.user-select(@select) {
-  -webkit-user-select: @select;
-     -moz-user-select: @select;
-      -ms-user-select: @select;
-       -o-user-select: @select;
-          user-select: @select;
-}
-
-// Resize anything
-.resizable(@direction) {
-  resize: @direction; // Options: horizontal, vertical, both
-  overflow: auto; // Safari fix
-}
-
-// CSS3 Content Columns
-.content-columns(@columnCount, @columnGap: @gridGutterWidth) {
-  -webkit-column-count: @columnCount;
-     -moz-column-count: @columnCount;
-          column-count: @columnCount;
-  -webkit-column-gap: @columnGap;
-     -moz-column-gap: @columnGap;
-          column-gap: @columnGap;
-}
-
-// Optional hyphenation
-.hyphens(@mode: auto) {
-  word-wrap: break-word;
-  -webkit-hyphens: @mode;
-     -moz-hyphens: @mode;
-      -ms-hyphens: @mode;
-       -o-hyphens: @mode;
-          hyphens: @mode;
-}
-
-// Opacity
-.opacity(@opacity) {
-  opacity: @opacity / 100;
-  filter: ~"alpha(opacity=@{opacity})";
-}
-
-
-
-// BACKGROUNDS
-// --------------------------------------------------
-
-// Add an alphatransparency value to any background or border color (via Elyse Holladay)
-#translucent {
-  .background(@color: @white, @alpha: 1) {
-    background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
-  }
-  .border(@color: @white, @alpha: 1) {
-    border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
-    .background-clip(padding-box);
-  }
-}
-
-// Gradient Bar Colors for buttons and alerts
-.gradientBar(@primaryColor, @secondaryColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
-  color: @textColor;
-  text-shadow: @textShadow;
-  #gradient > .vertical(@primaryColor, @secondaryColor);
-  border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
-}
-
-// Gradients
-#gradient {
-  .horizontal(@startColor: #555, @endColor: #333) {
-    background-color: @endColor;
-    background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+
-    background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10
-    background-repeat: repeat-x;
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down
-  }
-  .vertical(@startColor: #555, @endColor: #333) {
-    background-color: mix(@startColor, @endColor, 60%);
-    background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10
-    background-repeat: repeat-x;
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down
-  }
-  .directional(@startColor: #555, @endColor: #333, @deg: 45deg) {
-    background-color: @endColor;
-    background-repeat: repeat-x;
-    background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+
-    background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10
-  }
-  .horizontal-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
-    background-color: mix(@midColor, @endColor, 80%);
-    background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
-    background-image: -webkit-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
-    background-image: -moz-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
-    background-image: -o-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
-    background-image: linear-gradient(to right, @startColor, @midColor @colorStop, @endColor);
-    background-repeat: no-repeat;
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback
-  }
-
-  .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
-    background-color: mix(@midColor, @endColor, 80%);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
-    background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
-    background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
-    background-repeat: no-repeat;
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback
-  }
-  .radial(@innerColor: #555, @outerColor: #333) {
-    background-color: @outerColor;
-    background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor));
-    background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor);
-    background-image: -moz-radial-gradient(circle, @innerColor, @outerColor);
-    background-image: -o-radial-gradient(circle, @innerColor, @outerColor);
-    background-repeat: no-repeat;
-  }
-  .striped(@color: #555, @angle: 45deg) {
-    background-color: @color;
-    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
-    background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-    background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-  }
-}
-// Reset filters for IE
-.reset-filter() {
-  filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
-}
-
-
-
-// COMPONENT MIXINS
-// --------------------------------------------------
-
-// Horizontal dividers
-// -------------------------
-// Dividers (basically an hr) within dropdowns and nav lists
-.nav-divider(@top: #e5e5e5, @bottom: @white) {
-  // IE7 needs a set width since we gave a height. Restricting just
-  // to IE7 to keep the 1px left/right space in other browsers.
-  // It is unclear where IE is getting the extra space that we need
-  // to negative-margin away, but so it goes.
-  *width: 100%;
-  height: 1px;
-  margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: @top;
-  border-bottom: 1px solid @bottom;
-}
-
-// Button backgrounds
-// ------------------
-.buttonBackground(@startColor, @endColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
-  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
-  .gradientBar(@startColor, @endColor, @textColor, @textShadow);
-  *background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-  .reset-filter();
-
-  // in these cases the gradient won't cover the background, so we override
-  &:hover, &:focus, &:active, &.active, &.disabled, &[disabled] {
-    color: @textColor;
-    background-color: @endColor;
-    *background-color: darken(@endColor, 5%);
-  }
-
-  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
-  &:active,
-  &.active {
-    background-color: darken(@endColor, 10%) e("\9");
-  }
-}
-
-// Navbar vertical align
-// -------------------------
-// Vertically center elements in the navbar.
-// Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin.
-.navbarVerticalAlign(@elementHeight) {
-  margin-top: (@navbarHeight - @elementHeight) / 2;
-}
-
-
-
-// Grid System
-// -----------
-
-// Centered container element
-.container-fixed() {
-  margin-right: auto;
-  margin-left: auto;
-  .clearfix();
-}
-
-// Table columns
-.tableColumns(@columnSpan: 1) {
-  float: none; // undo default grid column styles
-  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells
-  margin-left: 0; // undo default grid column styles
-}
-
-// Make a Grid
-// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
-.makeRow() {
-  margin-left: @gridGutterWidth * -1;
-  .clearfix();
-}
-.makeColumn(@columns: 1, @offset: 0) {
-  float: left;
-  margin-left: (@gridColumnWidth * @offset) + (@gridGutterWidth * (@offset - 1)) + (@gridGutterWidth * 2);
-  width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-}
-
-// The Grid
-#grid {
-
-  .core (@gridColumnWidth, @gridGutterWidth) {
-
-    .spanX (@index) when (@index > 0) {
-      .span@{index} { .span(@index); }
-      .spanX(@index - 1);
-    }
-    .spanX (0) {}
-
-    .offsetX (@index) when (@index > 0) {
-      .offset@{index} { .offset(@index); }
-      .offsetX(@index - 1);
-    }
-    .offsetX (0) {}
-
-    .offset (@columns) {
-      margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1));
-    }
-
-    .span (@columns) {
-      width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-    }
-
-    .row {
-      margin-left: @gridGutterWidth * -1;
-      .clearfix();
-    }
-
-    [class*="span"] {
-      float: left;
-      min-height: 1px; // prevent collapsing columns
-      margin-left: @gridGutterWidth;
-    }
-
-    // Set the container width, and override it for fixed navbars in media queries
-    .container,
-    .navbar-static-top .container,
-    .navbar-fixed-top .container,
-    .navbar-fixed-bottom .container { .span(@gridColumns); }
-
-    // generate .spanX and .offsetX
-    .spanX (@gridColumns);
-    .offsetX (@gridColumns);
-
-  }
-
-  .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) {
-
-    .spanX (@index) when (@index > 0) {
-      .span@{index} { .span(@index); }
-      .spanX(@index - 1);
-    }
-    .spanX (0) {}
-
-    .offsetX (@index) when (@index > 0) {
-      .offset@{index} { .offset(@index); }
-      .offset@{index}:first-child { .offsetFirstChild(@index); }
-      .offsetX(@index - 1);
-    }
-    .offsetX (0) {}
-
-    .offset (@columns) {
-      margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2);
-  	  *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%);
-    }
-
-    .offsetFirstChild (@columns) {
-      margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth);
-      *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
-    }
-
-    .span (@columns) {
-      width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
-      *width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%);
-    }
-
-    .row-fluid {
-      width: 100%;
-      .clearfix();
-      [class*="span"] {
-        .input-block-level();
-        float: left;
-        margin-left: @fluidGridGutterWidth;
-        *margin-left: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
-      }
-      [class*="span"]:first-child {
-        margin-left: 0;
-      }
-
-      // Space grid-sized controls properly if multiple per line
-      .controls-row [class*="span"] + [class*="span"] {
-        margin-left: @fluidGridGutterWidth;
-      }
-
-      // generate .spanX and .offsetX
-      .spanX (@gridColumns);
-      .offsetX (@gridColumns);
-    }
-
-  }
-
-  .input(@gridColumnWidth, @gridGutterWidth) {
-
-    .spanX (@index) when (@index > 0) {
-      input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index} { .span(@index); }
-      .spanX(@index - 1);
-    }
-    .spanX (0) {}
-
-    .span(@columns) {
-      width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 14;
-    }
-
-    input,
-    textarea,
-    .uneditable-input {
-      margin-left: 0; // override margin-left from core grid system
-    }
-
-    // Space grid-sized controls properly if multiple per line
-    .controls-row [class*="span"] + [class*="span"] {
-      margin-left: @gridGutterWidth;
-    }
-
-    // generate .spanX
-    .spanX (@gridColumns);
-
-  }
-}
diff --git a/app/assets/stylesheets/admin/framework/modals.less b/app/assets/stylesheets/admin/framework/modals.less
deleted file mode 100755
index 5688260..0000000
--- a/app/assets/stylesheets/admin/framework/modals.less
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Modals
-// --------------------------------------------------
-
-// Background
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: @zindexModalBackdrop;
-  background-color: @black;
-  // Fade for backdrop
-  &.fade { opacity: 0; }
-}
-
-.modal-backdrop,
-.modal-backdrop.fade.in {
-  .opacity(0.6);
-}
-
-// Base modal
-.modal {
-  position: fixed;
-  top: 10%;
-  left: 50%;
-  z-index: @zindexModal;
-  width: 560px;
-  margin-left: -280px;
-  background-color: @white;
-  border: 1px solid #999;
-  border: 1px solid rgba(0,0,0,.3);
-  *border: 1px solid #999; /* IE6-7 */
-  .border-radius(6px);
-  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
-  .background-clip(padding-box);
-  // Remove focus outline from opened modal
-  outline: none;
-
-  &.fade {
-    .transition(e('opacity .3s linear, top .3s ease-out'));
-    top: -25%;
-  }
-  &.fade.in { top: 10%; }
-}
-.modal-header {
-  padding: 9px 15px;
-  border-bottom: 1px solid #eee;
-  // Close icon
-  .close { margin-top: 2px; }
-  // Heading
-  h3 {
-    margin: 0;
-    line-height: 30px;
-  }
-}
-
-// Body (where all modal content resides)
-.modal-body {
-  position: relative;
-  overflow-y: auto;
-  max-height: 400px;
-  padding: 15px;
-}
-// Remove bottom margin if need be
-.modal-form {
-  margin-bottom: 0;
-}
-
-// Footer (for actions)
-.modal-footer {
-  padding: 14px 15px 15px;
-  margin-bottom: 0;
-  text-align: right; // right align buttons
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  .border-radius(0 0 6px 6px);
-  .box-shadow(inset 0 1px 0 @white);
-  .clearfix(); // clear it in case folks use .pull-* classes on buttons
-
-  // Properly space out buttons
-  .btn + .btn {
-    margin-left: 5px;
-    margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
-  }
-  // but override that for button groups
-  .btn-group .btn + .btn {
-    margin-left: -1px;
-  }
-  // and override it for block buttons as well
-  .btn-block + .btn-block {
-    margin-left: 0;
-  }
-}
diff --git a/app/assets/stylesheets/admin/framework/navbar.less b/app/assets/stylesheets/admin/framework/navbar.less
deleted file mode 100755
index 93d09bc..0000000
--- a/app/assets/stylesheets/admin/framework/navbar.less
+++ /dev/null
@@ -1,497 +0,0 @@
-//
-// Navbars (Redux)
-// --------------------------------------------------
-
-
-// COMMON STYLES
-// -------------
-
-// Base class and wrapper
-.navbar {
-  overflow: visible;
-  margin-bottom: @baseLineHeight;
-
-  // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
-  *position: relative;
-  *z-index: 2;
-}
-
-// Inner for background effects
-// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present
-.navbar-inner {
-  min-height: @navbarHeight;
-  padding-left:  20px;
-  padding-right: 20px;
-  #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
-  border: 1px solid @navbarBorder;
-  .border-radius(@baseBorderRadius);
-  .box-shadow(0 1px 4px rgba(0,0,0,.065));
-
-  // Prevent floats from breaking the navbar
-  .clearfix();
-}
-
-// Set width to auto for default container
-// We then reset it for fixed navbars in the #gridSystem mixin
-.navbar .container {
-  width: auto;
-}
-
-// Override the default collapsed state
-.nav-collapse.collapse {
-  height: auto;
-  overflow: visible;
-}
-
-
-// Brand: website or project name
-// -------------------------
-.navbar .brand {
-  float: left;
-  display: block;
-  // Vertically center the text given @navbarHeight
-  padding: ((@navbarHeight - @baseLineHeight) / 2) 20px ((@navbarHeight - @baseLineHeight) / 2);
-  margin-left: -20px; // negative indent to left-align the text down the page
-  font-size: 20px;
-  font-weight: 200;
-  color: @navbarBrandColor;
-  text-shadow: 0 1px 0 @navbarBackgroundHighlight;
-  &:hover,
-  &:focus {
-    text-decoration: none;
-  }
-}
-
-// Plain text in topbar
-// -------------------------
-.navbar-text {
-  margin-bottom: 0;
-  line-height: @navbarHeight;
-  color: @navbarText;
-}
-
-// Janky solution for now to account for links outside the .nav
-// -------------------------
-.navbar-link {
-  color: @navbarLinkColor;
-  &:hover,
-  &:focus {
-    color: @navbarLinkColorHover;
-  }
-}
-
-// Dividers in navbar
-// -------------------------
-.navbar .divider-vertical {
-  height: @navbarHeight;
-  margin: 0 9px;
-  border-left: 1px solid @navbarBackground;
-  border-right: 1px solid @navbarBackgroundHighlight;
-}
-
-// Buttons in navbar
-// -------------------------
-.navbar .btn,
-.navbar .btn-group {
-  .navbarVerticalAlign(30px); // Vertically center in navbar
-}
-.navbar .btn-group .btn,
-.navbar .input-prepend .btn,
-.navbar .input-append .btn,
-.navbar .input-prepend .btn-group,
-.navbar .input-append .btn-group {
-  margin-top: 0; // then undo the margin here so we don't accidentally double it
-}
-
-// Navbar forms
-// -------------------------
-.navbar-form {
-  margin-bottom: 0; // remove default bottom margin
-  .clearfix();
-  input,
-  select,
-  .radio,
-  .checkbox {
-    .navbarVerticalAlign(30px); // Vertically center in navbar
-  }
-  input,
-  select,
-  .btn {
-    display: inline-block;
-    margin-bottom: 0;
-  }
-  input[type="image"],
-  input[type="checkbox"],
-  input[type="radio"] {
-    margin-top: 3px;
-  }
-  .input-append,
-  .input-prepend {
-    margin-top: 5px;
-    white-space: nowrap; // preven two  items from separating within a .navbar-form that has .pull-left
-    input {
-      margin-top: 0; // remove the margin on top since it's on the parent
-    }
-  }
-}
-
-// Navbar search
-// -------------------------
-.navbar-search {
-  position: relative;
-  float: left;
-  .navbarVerticalAlign(30px); // Vertically center in navbar
-  margin-bottom: 0;
-  .search-query {
-    margin-bottom: 0;
-    padding: 4px 14px;
-    #font > .sans-serif(13px, normal, 1);
-    .border-radius(15px); // redeclare because of specificity of the type attribute
-  }
-}
-
-
-
-// Static navbar
-// -------------------------
-
-.navbar-static-top {
-  position: static;
-  margin-bottom: 0; // remove 18px margin for default navbar
-  .navbar-inner {
-    .border-radius(0);
-  }
-}
-
-
-
-// Fixed navbar
-// -------------------------
-
-// Shared (top/bottom) styles
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: @zindexFixedNavbar;
-  margin-bottom: 0; // remove 18px margin for default navbar
-}
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
-  border-width: 0 0 1px;
-}
-.navbar-fixed-bottom .navbar-inner {
-  border-width: 1px 0 0;
-}
-.navbar-fixed-top .navbar-inner,
-.navbar-fixed-bottom .navbar-inner {
-  padding-left:  0;
-  padding-right: 0;
-  .border-radius(0);
-}
-
-// Reset container width
-// Required here as we reset the width earlier on and the grid mixins don't override early enough
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  #grid > .core > .span(@gridColumns);
-}
-
-// Fixed to top
-.navbar-fixed-top {
-  top: 0;
-}
-.navbar-fixed-top,
-.navbar-static-top {
-  .navbar-inner {
-    .box-shadow(~"0 1px 10px rgba(0,0,0,.1)");
-  }
-}
-
-// Fixed to bottom
-.navbar-fixed-bottom {
-  bottom: 0;
-  .navbar-inner {
-    .box-shadow(~"0 -1px 10px rgba(0,0,0,.1)");
-  }
-}
-
-
-
-// NAVIGATION
-// ----------
-
-.navbar .nav {
-  position: relative;
-  left: 0;
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.navbar .nav.pull-right {
-  float: right; // redeclare due to specificity
-  margin-right: 0; // remove margin on float right nav
-}
-.navbar .nav > li {
-  float: left;
-}
-
-// Links
-.navbar .nav > li > a {
-  float: none;
-  // Vertically center the text given @navbarHeight
-  padding: ((@navbarHeight - @baseLineHeight) / 2) 15px ((@navbarHeight - @baseLineHeight) / 2);
-  color: @navbarLinkColor;
-  text-decoration: none;
-  text-shadow: 0 1px 0 @navbarBackgroundHighlight;
-}
-.navbar .nav .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-// Hover/focus
-.navbar .nav > li > a:focus,
-.navbar .nav > li > a:hover {
-  background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover/:focus from .active
-  color: @navbarLinkColorHover;
-  text-decoration: none;
-}
-
-// Active nav items
-.navbar .nav > .active > a,
-.navbar .nav > .active > a:hover,
-.navbar .nav > .active > a:focus {
-  color: @navbarLinkColorActive;
-  text-decoration: none;
-  background-color: @navbarLinkBackgroundActive;
-  .box-shadow(inset 0 3px 8px rgba(0,0,0,.125));
-}
-
-// Navbar button for toggling navbar items in responsive layouts
-// These definitions need to come after '.navbar .btn'
-.navbar .btn-navbar {
-  display: none;
-  float: right;
-  padding: 7px 10px;
-  margin-left: 5px;
-  margin-right: 5px;
-  .buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%));
-  .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)");
-}
-.navbar .btn-navbar .icon-bar {
-  display: block;
-  width: 18px;
-  height: 2px;
-  background-color: #f5f5f5;
-  .border-radius(1px);
-  .box-shadow(0 1px 0 rgba(0,0,0,.25));
-}
-.btn-navbar .icon-bar + .icon-bar {
-  margin-top: 3px;
-}
-
-
-
-// Dropdown menus
-// --------------
-
-// Menu position and menu carets
-.navbar .nav > li > .dropdown-menu {
-  &:before {
-    content: '';
-    display: inline-block;
-    border-left:   7px solid transparent;
-    border-right:  7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-bottom-color: @dropdownBorder;
-    position: absolute;
-    top: -7px;
-    left: 9px;
-  }
-  &:after {
-    content: '';
-    display: inline-block;
-    border-left:   6px solid transparent;
-    border-right:  6px solid transparent;
-    border-bottom: 6px solid @dropdownBackground;
-    position: absolute;
-    top: -6px;
-    left: 10px;
-  }
-}
-// Menu position and menu caret support for dropups via extra dropup class
-.navbar-fixed-bottom .nav > li > .dropdown-menu {
-  &:before {
-    border-top: 7px solid #ccc;
-    border-top-color: @dropdownBorder;
-    border-bottom: 0;
-    bottom: -7px;
-    top: auto;
-  }
-  &:after {
-    border-top: 6px solid @dropdownBackground;
-    border-bottom: 0;
-    bottom: -6px;
-    top: auto;
-  }
-}
-
-// Caret should match text color on hover/focus
-.navbar .nav li.dropdown > a:hover .caret,
-.navbar .nav li.dropdown > a:focus .caret {
-  border-top-color: @navbarLinkColorHover;
-  border-bottom-color: @navbarLinkColorHover;
-}
-
-// Remove background color from open dropdown
-.navbar .nav li.dropdown.open > .dropdown-toggle,
-.navbar .nav li.dropdown.active > .dropdown-toggle,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle {
-  background-color: @navbarLinkBackgroundActive;
-  color: @navbarLinkColorActive;
-}
-.navbar .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: @navbarLinkColor;
-  border-bottom-color: @navbarLinkColor;
-}
-.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: @navbarLinkColorActive;
-  border-bottom-color: @navbarLinkColorActive;
-}
-
-// Right aligned menus need alt position
-.navbar .pull-right > li > .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right {
-  left: auto;
-  right: 0;
-  &:before {
-    left: auto;
-    right: 12px;
-  }
-  &:after {
-    left: auto;
-    right: 13px;
-  }
-  .dropdown-menu {
-    left: auto;
-    right: 100%;
-    margin-left: 0;
-    margin-right: -1px;
-    .border-radius(6px 0 6px 6px);
-  }
-}
-
-
-// Inverted navbar
-// -------------------------
-
-.navbar-inverse {
-
-  .navbar-inner {
-    #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
-    border-color: @navbarInverseBorder;
-  }
-
-  .brand,
-  .nav > li > a {
-    color: @navbarInverseLinkColor;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-    &:hover,
-    &:focus {
-      color: @navbarInverseLinkColorHover;
-    }
-  }
-
-  .brand {
-    color: @navbarInverseBrandColor;
-  }
-
-  .navbar-text {
-    color: @navbarInverseText;
-  }
-
-  .nav > li > a:focus,
-  .nav > li > a:hover {
-    background-color: @navbarInverseLinkBackgroundHover;
-    color: @navbarInverseLinkColorHover;
-  }
-
-  .nav .active > a,
-  .nav .active > a:hover,
-  .nav .active > a:focus {
-    color: @navbarInverseLinkColorActive;
-    background-color: @navbarInverseLinkBackgroundActive;
-  }
-
-  // Inline text links
-  .navbar-link {
-    color: @navbarInverseLinkColor;
-    &:hover,
-    &:focus {
-      color: @navbarInverseLinkColorHover;
-    }
-  }
-
-  // Dividers in navbar
-  .divider-vertical {
-    border-left-color: @navbarInverseBackground;
-    border-right-color: @navbarInverseBackgroundHighlight;
-  }
-
-  // Dropdowns
-  .nav li.dropdown.open > .dropdown-toggle,
-  .nav li.dropdown.active > .dropdown-toggle,
-  .nav li.dropdown.open.active > .dropdown-toggle {
-    background-color: @navbarInverseLinkBackgroundActive;
-    color: @navbarInverseLinkColorActive;
-  }
-  .nav li.dropdown > a:hover .caret,
-  .nav li.dropdown > a:focus .caret {
-    border-top-color: @navbarInverseLinkColorActive;
-    border-bottom-color: @navbarInverseLinkColorActive;
-  }
-  .nav li.dropdown > .dropdown-toggle .caret {
-    border-top-color: @navbarInverseLinkColor;
-    border-bottom-color: @navbarInverseLinkColor;
-  }
-  .nav li.dropdown.open > .dropdown-toggle .caret,
-  .nav li.dropdown.active > .dropdown-toggle .caret,
-  .nav li.dropdown.open.active > .dropdown-toggle .caret {
-    border-top-color: @navbarInverseLinkColorActive;
-    border-bottom-color: @navbarInverseLinkColorActive;
-  }
-
-  // Navbar search
-  .navbar-search {
-    .search-query {
-      color: @white;
-      background-color: @navbarInverseSearchBackground;
-      border-color: @navbarInverseSearchBorder;
-      .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
-      .transition(none);
-      .placeholder(@navbarInverseSearchPlaceholderColor);
-
-      // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
-      &:focus,
-      &.focused {
-        padding: 5px 15px;
-        color: @grayDark;
-        text-shadow: 0 1px 0 @white;
-        background-color: @navbarInverseSearchBackgroundFocus;
-        border: 0;
-        .box-shadow(0 0 3px rgba(0,0,0,.15));
-        outline: 0;
-      }
-    }
-  }
-
-  // Navbar collapse button
-  .btn-navbar {
-    .buttonBackground(darken(@navbarInverseBackgroundHighlight, 5%), darken(@navbarInverseBackground, 5%));
-  }
-
-}
diff --git a/app/assets/stylesheets/admin/framework/navs.less b/app/assets/stylesheets/admin/framework/navs.less
deleted file mode 100755
index 01cd805..0000000
--- a/app/assets/stylesheets/admin/framework/navs.less
+++ /dev/null
@@ -1,409 +0,0 @@
-//
-// Navs
-// --------------------------------------------------
-
-
-// BASE CLASS
-// ----------
-
-.nav {
-  margin-left: 0;
-  margin-bottom: @baseLineHeight;
-  list-style: none;
-}
-
-// Make links block level
-.nav > li > a {
-  display: block;
-}
-.nav > li > a:hover,
-.nav > li > a:focus {
-  text-decoration: none;
-  background-color: @grayLighter;
-}
-
-// Prevent IE8 from misplacing imgs
-// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
-.nav > li > a > img {
-  max-width: none;
-}
-
-// Redeclare pull classes because of specifity
-.nav > .pull-right {
-  float: right;
-}
-
-// Nav headers (for dropdowns and lists)
-.nav-header {
-  display: block;
-  padding: 3px 15px;
-  font-size: 11px;
-  font-weight: bold;
-  line-height: @baseLineHeight;
-  color: @grayLight;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  text-transform: uppercase;
-}
-// Space them out when they follow another list item (link)
-.nav li + .nav-header {
-  margin-top: 9px;
-}
-
-
-
-// NAV LIST
-// --------
-
-.nav-list {
-  padding-left: 15px;
-  padding-right: 15px;
-  margin-bottom: 0;
-}
-.nav-list > li > a,
-.nav-list .nav-header {
-  margin-left:  -15px;
-  margin-right: -15px;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-}
-.nav-list > li > a {
-  padding: 3px 15px;
-}
-.nav-list > .active > a,
-.nav-list > .active > a:hover,
-.nav-list > .active > a:focus {
-  color: @white;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
-  background-color: @linkColor;
-}
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
-  margin-right: 2px;
-}
-// Dividers (basically an hr) within the dropdown
-.nav-list .divider {
-  .nav-divider();
-}
-
-
-
-// TABS AND PILLS
-// -------------
-
-// Common styles
-.nav-tabs,
-.nav-pills {
-  .clearfix();
-}
-.nav-tabs > li,
-.nav-pills > li {
-  float: left;
-}
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px; // keeps the overall height an even number
-}
-
-// TABS
-// ----
-
-// Give the tabs something to sit on
-.nav-tabs {
-  border-bottom: 1px solid #ddd;
-}
-// Make the list-items overlay the bottom border
-.nav-tabs > li {
-  margin-bottom: -1px;
-}
-// Actual tabs (as links)
-.nav-tabs > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  line-height: @baseLineHeight;
-  border: 1px solid transparent;
-  .border-radius(4px 4px 0 0);
-  &:hover,
-  &:focus {
-    border-color: @grayLighter @grayLighter #ddd;
-  }
-}
-// Active state, and it's :hover/:focus to override normal :hover/:focus
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-tabs > .active > a:focus {
-  color: @gray;
-  background-color: @bodyBackground;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-  cursor: default;
-}
-
-
-// PILLS
-// -----
-
-// Links rendered as pills
-.nav-pills > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  .border-radius(5px);
-}
-
-// Active state
-.nav-pills > .active > a,
-.nav-pills > .active > a:hover,
-.nav-pills > .active > a:focus {
-  color: @white;
-  background-color: @linkColor;
-}
-
-
-
-// STACKED NAV
-// -----------
-
-// Stacked tabs and pills
-.nav-stacked > li {
-  float: none;
-}
-.nav-stacked > li > a {
-  margin-right: 0; // no need for the gap between nav items
-}
-
-// Tabs
-.nav-tabs.nav-stacked {
-  border-bottom: 0;
-}
-.nav-tabs.nav-stacked > li > a {
-  border: 1px solid #ddd;
-  .border-radius(0);
-}
-.nav-tabs.nav-stacked > li:first-child > a {
-  .border-top-radius(4px);
-}
-.nav-tabs.nav-stacked > li:last-child > a {
-  .border-bottom-radius(4px);
-}
-.nav-tabs.nav-stacked > li > a:hover,
-.nav-tabs.nav-stacked > li > a:focus {
-  border-color: #ddd;
-  z-index: 2;
-}
-
-// Pills
-.nav-pills.nav-stacked > li > a {
-  margin-bottom: 3px;
-}
-.nav-pills.nav-stacked > li:last-child > a {
-  margin-bottom: 1px; // decrease margin to match sizing of stacked tabs
-}
-
-
-
-// DROPDOWNS
-// ---------
-
-.nav-tabs .dropdown-menu {
-  .border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu
-}
-.nav-pills .dropdown-menu {
-  .border-radius(6px); // make rounded corners match the pills
-}
-
-// Default dropdown links
-// -------------------------
-// Make carets use linkColor to start
-.nav .dropdown-toggle .caret {
-  border-top-color: @linkColor;
-  border-bottom-color: @linkColor;
-  margin-top: 6px;
-}
-.nav .dropdown-toggle:hover .caret,
-.nav .dropdown-toggle:focus .caret {
-  border-top-color: @linkColorHover;
-  border-bottom-color: @linkColorHover;
-}
-/* move down carets for tabs */
-.nav-tabs .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-// Active dropdown links
-// -------------------------
-.nav .active .dropdown-toggle .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
-}
-.nav-tabs .active .dropdown-toggle .caret {
-  border-top-color: @gray;
-  border-bottom-color: @gray;
-}
-
-// Active:hover/:focus dropdown links
-// -------------------------
-.nav > .dropdown.active > a:hover,
-.nav > .dropdown.active > a:focus {
-  cursor: pointer;
-}
-
-// Open dropdowns
-// -------------------------
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover,
-.nav > li.dropdown.open.active > a:focus {
-  color: @white;
-  background-color: @grayLight;
-  border-color: @grayLight;
-}
-.nav li.dropdown.open .caret,
-.nav li.dropdown.open.active .caret,
-.nav li.dropdown.open a:hover .caret,
-.nav li.dropdown.open a:focus .caret {
-  border-top-color: @white;
-  border-bottom-color: @white;
-  .opacity(100);
-}
-
-// Dropdowns in stacked tabs
-.tabs-stacked .open > a:hover,
-.tabs-stacked .open > a:focus {
-  border-color: @grayLight;
-}
-
-
-
-// TABBABLE
-// --------
-
-
-// COMMON STYLES
-// -------------
-
-// Clear any floats
-.tabbable {
-  .clearfix();
-}
-.tab-content {
-  overflow: auto; // prevent content from running below tabs
-}
-
-// Remove border on bottom, left, right
-.tabs-below > .nav-tabs,
-.tabs-right > .nav-tabs,
-.tabs-left > .nav-tabs {
-  border-bottom: 0;
-}
-
-// Show/hide tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
-
-// BOTTOM
-// ------
-
-.tabs-below > .nav-tabs {
-  border-top: 1px solid #ddd;
-}
-.tabs-below > .nav-tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
-}
-.tabs-below > .nav-tabs > li > a {
-  .border-radius(0 0 4px 4px);
-  &:hover,
-  &:focus {
-    border-bottom-color: transparent;
-    border-top-color: #ddd;
-  }
-}
-.tabs-below > .nav-tabs > .active > a,
-.tabs-below > .nav-tabs > .active > a:hover,
-.tabs-below > .nav-tabs > .active > a:focus {
-  border-color: transparent #ddd #ddd #ddd;
-}
-
-// LEFT & RIGHT
-// ------------
-
-// Common styles
-.tabs-left > .nav-tabs > li,
-.tabs-right > .nav-tabs > li {
-  float: none;
-}
-.tabs-left > .nav-tabs > li > a,
-.tabs-right > .nav-tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-
-// Tabs on the left
-.tabs-left > .nav-tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid #ddd;
-}
-.tabs-left > .nav-tabs > li > a {
-  margin-right: -1px;
-  .border-radius(4px 0 0 4px);
-}
-.tabs-left > .nav-tabs > li > a:hover,
-.tabs-left > .nav-tabs > li > a:focus {
-  border-color: @grayLighter #ddd @grayLighter @grayLighter;
-}
-.tabs-left > .nav-tabs .active > a,
-.tabs-left > .nav-tabs .active > a:hover,
-.tabs-left > .nav-tabs .active > a:focus {
-  border-color: #ddd transparent #ddd #ddd;
-  *border-right-color: @white;
-}
-
-// Tabs on the right
-.tabs-right > .nav-tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid #ddd;
-}
-.tabs-right > .nav-tabs > li > a {
-  margin-left: -1px;
-  .border-radius(0 4px 4px 0);
-}
-.tabs-right > .nav-tabs > li > a:hover,
-.tabs-right > .nav-tabs > li > a:focus {
-  border-color: @grayLighter @grayLighter @grayLighter #ddd;
-}
-.tabs-right > .nav-tabs .active > a,
-.tabs-right > .nav-tabs .active > a:hover,
-.tabs-right > .nav-tabs .active > a:focus {
-  border-color: #ddd #ddd #ddd transparent;
-  *border-left-color: @white;
-}
-
-
-
-// DISABLED STATES
-// ---------------
-
-// Gray out text
-.nav > .disabled > a {
-  color: @grayLight;
-}
-// Nuke hover/focus effects
-.nav > .disabled > a:hover,
-.nav > .disabled > a:focus {
-  text-decoration: none;
-  background-color: transparent;
-  cursor: default;
-}
diff --git a/app/assets/stylesheets/admin/framework/pager.less b/app/assets/stylesheets/admin/framework/pager.less
deleted file mode 100755
index 1476188..0000000
--- a/app/assets/stylesheets/admin/framework/pager.less
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Pager pagination
-// --------------------------------------------------
-
-
-.pager {
-  margin: @baseLineHeight 0;
-  list-style: none;
-  text-align: center;
-  .clearfix();
-}
-.pager li {
-  display: inline;
-}
-.pager li > a,
-.pager li > span {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  .border-radius(15px);
-}
-.pager li > a:hover,
-.pager li > a:focus {
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-.pager .next > a,
-.pager .next > span {
-  float: right;
-}
-.pager .previous > a,
-.pager .previous > span {
-  float: left;
-}
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
-  color: @grayLight;
-  background-color: #fff;
-  cursor: default;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin/framework/pagination.less b/app/assets/stylesheets/admin/framework/pagination.less
deleted file mode 100755
index a789db2..0000000
--- a/app/assets/stylesheets/admin/framework/pagination.less
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// Pagination (multiple pages)
-// --------------------------------------------------
-
-// Space out pagination from surrounding content
-.pagination {
-  margin: @baseLineHeight 0;
-}
-
-.pagination ul {
-  // Allow for text-based alignment
-  display: inline-block;
-  .ie7-inline-block();
-  // Reset default ul styles
-  margin-left: 0;
-  margin-bottom: 0;
-  // Visuals
-  .border-radius(@baseBorderRadius);
-  .box-shadow(0 1px 2px rgba(0,0,0,.05));
-}
-.pagination ul > li {
-  display: inline; // Remove list-style and block-level defaults
-}
-.pagination ul > li > a,
-.pagination ul > li > span {
-  float: left; // Collapse white-space
-  padding: 4px 12px;
-  line-height: @baseLineHeight;
-  text-decoration: none;
-  background-color: @paginationBackground;
-  border: 1px solid @paginationBorder;
-  border-left-width: 0;
-}
-.pagination ul > li > a:hover,
-.pagination ul > li > a:focus,
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  background-color: @paginationActiveBackground;
-}
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  color: @grayLight;
-  cursor: default;
-}
-.pagination ul > .disabled > span,
-.pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover,
-.pagination ul > .disabled > a:focus {
-  color: @grayLight;
-  background-color: transparent;
-  cursor: default;
-}
-.pagination ul > li:first-child > a,
-.pagination ul > li:first-child > span {
-  border-left-width: 1px;
-  .border-left-radius(@baseBorderRadius);
-}
-.pagination ul > li:last-child > a,
-.pagination ul > li:last-child > span {
-  .border-right-radius(@baseBorderRadius);
-}
-
-
-// Alignment
-// --------------------------------------------------
-
-.pagination-centered {
-  text-align: center;
-}
-.pagination-right {
-  text-align: right;
-}
-
-
-// Sizing
-// --------------------------------------------------
-
-// Large
-.pagination-large {
-  ul > li > a,
-  ul > li > span {
-    padding: @paddingLarge;
-    font-size: @fontSizeLarge;
-  }
-  ul > li:first-child > a,
-  ul > li:first-child > span {
-    .border-left-radius(@borderRadiusLarge);
-  }
-  ul > li:last-child > a,
-  ul > li:last-child > span {
-    .border-right-radius(@borderRadiusLarge);
-  }
-}
-
-// Small and mini
-.pagination-mini,
-.pagination-small {
-  ul > li:first-child > a,
-  ul > li:first-child > span {
-    .border-left-radius(@borderRadiusSmall);
-  }
-  ul > li:last-child > a,
-  ul > li:last-child > span {
-    .border-right-radius(@borderRadiusSmall);
-  }
-}
-
-// Small
-.pagination-small {
-  ul > li > a,
-  ul > li > span {
-    padding: @paddingSmall;
-    font-size: @fontSizeSmall;
-  }
-}
-// Mini
-.pagination-mini {
-  ul > li > a,
-  ul > li > span {
-    padding: @paddingMini;
-    font-size: @fontSizeMini;
-  }
-}
diff --git a/app/assets/stylesheets/admin/framework/popovers.less b/app/assets/stylesheets/admin/framework/popovers.less
deleted file mode 100755
index aae35c8..0000000
--- a/app/assets/stylesheets/admin/framework/popovers.less
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// Popovers
-// --------------------------------------------------
-
-
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: @zindexPopover;
-  display: none;
-  max-width: 276px;
-  padding: 1px;
-  text-align: left; // Reset given new insertion method
-  background-color: @popoverBackground;
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
-  .border-radius(6px);
-  .box-shadow(0 5px 10px rgba(0,0,0,.2));
-
-  // Overrides for proper insertion
-  white-space: normal;
-
-  // Offset the popover to account for the popover arrow
-  &.top     { margin-top: -10px; }
-  &.right   { margin-left: 10px; }
-  &.bottom  { margin-top: 10px; }
-  &.left    { margin-left: -10px; }
-}
-
-.popover-title {
-  margin: 0; // reset heading margin
-  padding: 8px 14px;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 18px;
-  background-color: @popoverTitleBackground;
-  border-bottom: 1px solid darken(@popoverTitleBackground, 5%);
-  .border-radius(5px 5px 0 0);
-
-  &:empty {
-    display: none;
-  }
-}
-
-.popover-content {
-  padding: 9px 14px;
-}
-
-// Arrows
-//
-// .arrow is outer, .arrow:after is inner
-
-.popover .arrow,
-.popover .arrow:after {
-  position: absolute;
-  display: block;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-.popover .arrow {
-  border-width: @popoverArrowOuterWidth;
-}
-.popover .arrow:after {
-  border-width: @popoverArrowWidth;
-  content: "";
-}
-
-.popover {
-  &.top .arrow {
-    left: 50%;
-    margin-left: -@popoverArrowOuterWidth;
-    border-bottom-width: 0;
-    border-top-color: #999; // IE8 fallback
-    border-top-color: @popoverArrowOuterColor;
-    bottom: -@popoverArrowOuterWidth;
-    &:after {
-      bottom: 1px;
-      margin-left: -@popoverArrowWidth;
-      border-bottom-width: 0;
-      border-top-color: @popoverArrowColor;
-    }
-  }
-  &.right .arrow {
-    top: 50%;
-    left: -@popoverArrowOuterWidth;
-    margin-top: -@popoverArrowOuterWidth;
-    border-left-width: 0;
-    border-right-color: #999; // IE8 fallback
-    border-right-color: @popoverArrowOuterColor;
-    &:after {
-      left: 1px;
-      bottom: -@popoverArrowWidth;
-      border-left-width: 0;
-      border-right-color: @popoverArrowColor;
-    }
-  }
-  &.bottom .arrow {
-    left: 50%;
-    margin-left: -@popoverArrowOuterWidth;
-    border-top-width: 0;
-    border-bottom-color: #999; // IE8 fallback
-    border-bottom-color: @popoverArrowOuterColor;
-    top: -@popoverArrowOuterWidth;
-    &:after {
-      top: 1px;
-      margin-left: -@popoverArrowWidth;
-      border-top-width: 0;
-      border-bottom-color: @popoverArrowColor;
-    }
-  }
-
-  &.left .arrow {
-    top: 50%;
-    right: -@popoverArrowOuterWidth;
-    margin-top: -@popoverArrowOuterWidth;
-    border-right-width: 0;
-    border-left-color: #999; // IE8 fallback
-    border-left-color: @popoverArrowOuterColor;
-    &:after {
-      right: 1px;
-      border-right-width: 0;
-      border-left-color: @popoverArrowColor;
-      bottom: -@popoverArrowWidth;
-    }
-  }
-
-}
diff --git a/app/assets/stylesheets/admin/framework/progress-bars.less b/app/assets/stylesheets/admin/framework/progress-bars.less
deleted file mode 100755
index 5e0c3dd..0000000
--- a/app/assets/stylesheets/admin/framework/progress-bars.less
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Progress bars
-// --------------------------------------------------
-
-
-// ANIMATIONS
-// ----------
-
-// Webkit
-@-webkit-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-// Firefox
-@-moz-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-// IE9
-@-ms-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-// Opera
-@-o-keyframes progress-bar-stripes {
-  from  { background-position: 0 0; }
-  to    { background-position: 40px 0; }
-}
-
-// Spec
-@keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-
-
-// THE BARS
-// --------
-
-// Outer container
-.progress {
-  overflow: hidden;
-  height: @baseLineHeight;
-  margin-bottom: @baseLineHeight;
-  #gradient > .vertical(#f5f5f5, #f9f9f9);
-  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
-  .border-radius(@baseBorderRadius);
-}
-
-// Bar of progress
-.progress .bar {
-  width: 0%;
-  height: 100%;
-  color: @white;
-  float: left;
-  font-size: 12px;
-  text-align: center;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  #gradient > .vertical(#149bdf, #0480be);
-  .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
-  .box-sizing(border-box);
-  .transition(width .6s ease);
-}
-.progress .bar + .bar {
-  .box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)");
-}
-
-// Striped bars
-.progress-striped .bar {
-  #gradient > .striped(#149bdf);
-  .background-size(40px 40px);
-}
-
-// Call animation for the active one
-.progress.active .bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-     -moz-animation: progress-bar-stripes 2s linear infinite;
-      -ms-animation: progress-bar-stripes 2s linear infinite;
-       -o-animation: progress-bar-stripes 2s linear infinite;
-          animation: progress-bar-stripes 2s linear infinite;
-}
-
-
-
-// COLORS
-// ------
-
-// Danger (red)
-.progress-danger .bar, .progress .bar-danger {
-  #gradient > .vertical(#ee5f5b, #c43c35);
-}
-.progress-danger.progress-striped .bar, .progress-striped .bar-danger {
-  #gradient > .striped(#ee5f5b);
-}
-
-// Success (green)
-.progress-success .bar, .progress .bar-success {
-  #gradient > .vertical(#62c462, #57a957);
-}
-.progress-success.progress-striped .bar, .progress-striped .bar-success {
-  #gradient > .striped(#62c462);
-}
-
-// Info (teal)
-.progress-info .bar, .progress .bar-info {
-  #gradient > .vertical(#5bc0de, #339bb9);
-}
-.progress-info.progress-striped .bar, .progress-striped .bar-info {
-  #gradient > .striped(#5bc0de);
-}
-
-// Warning (orange)
-.progress-warning .bar, .progress .bar-warning {
-  #gradient > .vertical(lighten(@orange, 15%), @orange);
-}
-.progress-warning.progress-striped .bar, .progress-striped .bar-warning {
-  #gradient > .striped(lighten(@orange, 15%));
-}
diff --git a/app/assets/stylesheets/admin/framework/reset.less b/app/assets/stylesheets/admin/framework/reset.less
deleted file mode 100755
index 4806bd5..0000000
--- a/app/assets/stylesheets/admin/framework/reset.less
+++ /dev/null
@@ -1,216 +0,0 @@
-//
-// Reset CSS
-// Adapted from http://github.com/necolas/normalize.css
-// --------------------------------------------------
-
-
-// Display in IE6-9 and FF3
-// -------------------------
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-  display: block;
-}
-
-// Display block in IE6-9 and FF3
-// -------------------------
-
-audio,
-canvas,
-video {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-}
-
-// Prevents modern browsers from displaying 'audio' without controls
-// -------------------------
-
-audio:not([controls]) {
-    display: none;
-}
-
-// Base settings
-// -------------------------
-
-html {
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-// Focus states
-a:focus {
-  .tab-focus();
-}
-// Hover & Active
-a:hover,
-a:active {
-  outline: 0;
-}
-
-// Prevents sub and sup affecting line-height in all browsers
-// -------------------------
-
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-sup {
-  top: -0.5em;
-}
-sub {
-  bottom: -0.25em;
-}
-
-// Img border in a's and image quality
-// -------------------------
-
-img {
-  /* Responsive images (ensure images don't scale beyond their parents) */
-  max-width: 100%; /* Part 1: Set a maxium relative to the parent */
-  width: auto\9; /* IE7-8 need help adjusting responsive images */
-  height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */
-
-  vertical-align: middle;
-  border: 0;
-  -ms-interpolation-mode: bicubic;
-}
-
-// Prevent max-width from affecting Google Maps
-#map_canvas img,
-.google-maps img {
-  max-width: none;
-}
-
-// Forms
-// -------------------------
-
-// Font size in all browsers, margin changes, misc consistency
-button,
-input,
-select,
-textarea {
-  margin: 0;
-  font-size: 100%;
-  vertical-align: middle;
-}
-button,
-input {
-  *overflow: visible; // Inner spacing ie IE6/7
-  line-height: normal; // FF3/4 have !important on line-height in UA stylesheet
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
-  padding: 0;
-  border: 0;
-}
-button,
-html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls.
-input[type="reset"],
-input[type="submit"] {
-    -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
-    cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
-}
-label,
-select,
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"],
-input[type="radio"],
-input[type="checkbox"] {
-    cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
-}
-input[type="search"] { // Appearance in Safari/Chrome
-  .box-sizing(content-box);
-  -webkit-appearance: textfield;
-}
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
-}
-textarea {
-  overflow: auto; // Remove vertical scrollbar in IE6-9
-  vertical-align: top; // Readability and alignment cross-browser
-}
-
-
-// Printing
-// -------------------------
-// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
-
-@media print {
-
-  * {
-    text-shadow: none !important;
-    color: #000 !important; // Black prints faster: h5bp.com/s
-    background: transparent !important;
-    box-shadow: none !important;
-  }
-
-  a,
-  a:visited {
-    text-decoration: underline;
-  }
-
-  a[href]:after {
-    content: " (" attr(href) ")";
-  }
-
-  abbr[title]:after {
-    content: " (" attr(title) ")";
-  }
-
-  // Don't show links for images, or javascript/internal links
-  .ir a:after,
-  a[href^="javascript:"]:after,
-  a[href^="#"]:after {
-    content: "";
-  }
-
-  pre,
-  blockquote {
-    border: 1px solid #999;
-    page-break-inside: avoid;
-  }
-
-  thead {
-    display: table-header-group; // h5bp.com/t
-  }
-
-  tr,
-  img {
-    page-break-inside: avoid;
-  }
-
-  img {
-    max-width: 100% !important;
-  }
-
-  @page {
-    margin: 0.5cm;
-  }
-
-  p,
-  h2,
-  h3 {
-    orphans: 3;
-    widows: 3;
-  }
-
-  h2,
-  h3 {
-    page-break-after: avoid;
-  }
-}
diff --git a/app/assets/stylesheets/admin/framework/responsive-1200px-min.less b/app/assets/stylesheets/admin/framework/responsive-1200px-min.less
deleted file mode 100755
index 4f35ba6..0000000
--- a/app/assets/stylesheets/admin/framework/responsive-1200px-min.less
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Responsive: Large desktop and up
-// --------------------------------------------------
-
-
-@media (min-width: 1200px) {
-
-  // Fixed grid
-  #grid > .core(@gridColumnWidth1200, @gridGutterWidth1200);
-
-  // Fluid grid
-  #grid > .fluid(@fluidGridColumnWidth1200, @fluidGridGutterWidth1200);
-
-  // Input grid
-  #grid > .input(@gridColumnWidth1200, @gridGutterWidth1200);
-
-  // Thumbnails
-  .thumbnails {
-    margin-left: -@gridGutterWidth1200;
-  }
-  .thumbnails > li {
-    margin-left: @gridGutterWidth1200;
-  }
-  .row-fluid .thumbnails {
-    margin-left: 0;
-  }
-
-}
diff --git a/app/assets/stylesheets/admin/framework/responsive-767px-max.less b/app/assets/stylesheets/admin/framework/responsive-767px-max.less
deleted file mode 100755
index 128f4ce..0000000
--- a/app/assets/stylesheets/admin/framework/responsive-767px-max.less
+++ /dev/null
@@ -1,193 +0,0 @@
-//
-// Responsive: Landscape phone to desktop/tablet
-// --------------------------------------------------
-
-
-@media (max-width: 767px) {
-
-  // Padding to set content in a bit
-  body {
-    padding-left: 20px;
-    padding-right: 20px;
-  }
-  // Negative indent the now static "fixed" navbar
-  .navbar-fixed-top,
-  .navbar-fixed-bottom,
-  .navbar-static-top {
-    margin-left: -20px;
-    margin-right: -20px;
-  }
-  // Remove padding on container given explicit padding set on body
-  .container-fluid {
-    padding: 0;
-  }
-
-  // TYPOGRAPHY
-  // ----------
-  // Reset horizontal dl
-  .dl-horizontal {
-    dt {
-      float: none;
-      clear: none;
-      width: auto;
-      text-align: left;
-    }
-    dd {
-      margin-left: 0;
-    }
-  }
-
-  // GRID & CONTAINERS
-  // -----------------
-  // Remove width from containers
-  .container {
-    width: auto;
-  }
-  // Fluid rows
-  .row-fluid {
-    width: 100%;
-  }
-  // Undo negative margin on rows and thumbnails
-  .row,
-  .thumbnails {
-    margin-left: 0;
-  }
-  .thumbnails > li {
-    float: none;
-    margin-left: 0; // Reset the default margin for all li elements when no .span* classes are present
-  }
-  // Make all grid-sized elements block level again
-  [class*="span"],
-  .uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing
-  .row-fluid [class*="span"] {
-    float: none;
-    display: block;
-    width: 100%;
-    margin-left: 0;
-    .box-sizing(border-box);
-  }
-  .span12,
-  .row-fluid .span12 {
-    width: 100%;
-    .box-sizing(border-box);
-  }
-  .row-fluid [class*="offset"]:first-child {
-    margin-left: 0;
-  }
-
-  // FORM FIELDS
-  // -----------
-  // Make span* classes full width
-  .input-large,
-  .input-xlarge,
-  .input-xxlarge,
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    .input-block-level();
-  }
-  // But don't let it screw up prepend/append inputs
-  .input-prepend input,
-  .input-append input,
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    display: inline-block; // redeclare so they don't wrap to new lines
-    width: auto;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 0;
-  }
-
-  // Modals
-  .modal {
-    position: fixed;
-    top:   20px;
-    left:  20px;
-    right: 20px;
-    width: auto;
-    margin: 0;
-    &.fade  { top: -100px; }
-    &.fade.in { top: 20px; }
-  }
-
-}
-
-
-
-// UP TO LANDSCAPE PHONE
-// ---------------------
-
-@media (max-width: 480px) {
-
-  // Smooth out the collapsing/expanding nav
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0); // activate the GPU
-  }
-
-  // Block level the page header small tag for readability
-  .page-header h1 small {
-    display: block;
-    line-height: @baseLineHeight;
-  }
-
-  // Update checkboxes for iOS
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-
-  // Remove the horizontal form styles
-  .form-horizontal {
-    .control-label {
-      float: none;
-      width: auto;
-      padding-top: 0;
-      text-align: left;
-    }
-    // Move over all input controls and content
-    .controls {
-      margin-left: 0;
-    }
-    // Move the options list down to align with labels
-    .control-list {
-      padding-top: 0; // has to be padding because margin collaspes
-    }
-    // Move over buttons in .form-actions to align with .controls
-    .form-actions {
-      padding-left: 10px;
-      padding-right: 10px;
-    }
-  }
-
-  // Medias
-  // Reset float and spacing to stack
-  .media .pull-left,
-  .media .pull-right  {
-    float: none;
-    display: block;
-    margin-bottom: 10px;
-  }
-  // Remove side margins since we stack instead of indent
-  .media-object {
-    margin-right: 0;
-    margin-left: 0;
-  }
-
-  // Modals
-  .modal {
-    top:   10px;
-    left:  10px;
-    right: 10px;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-
-  // Carousel
-  .carousel-caption {
-    position: static;
-  }
-
-}
diff --git a/app/assets/stylesheets/admin/framework/responsive-768px-979px.less b/app/assets/stylesheets/admin/framework/responsive-768px-979px.less
deleted file mode 100755
index 8e8c486..0000000
--- a/app/assets/stylesheets/admin/framework/responsive-768px-979px.less
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Responsive: Tablet to desktop
-// --------------------------------------------------
-
-
-@media (min-width: 768px) and (max-width: 979px) {
-
-  // Fixed grid
-  #grid > .core(@gridColumnWidth768, @gridGutterWidth768);
-
-  // Fluid grid
-  #grid > .fluid(@fluidGridColumnWidth768, @fluidGridGutterWidth768);
-
-  // Input grid
-  #grid > .input(@gridColumnWidth768, @gridGutterWidth768);
-
-  // No need to reset .thumbnails here since it's the same @gridGutterWidth
-
-}
diff --git a/app/assets/stylesheets/admin/framework/responsive-navbar.less b/app/assets/stylesheets/admin/framework/responsive-navbar.less
deleted file mode 100755
index 21cd3ba..0000000
--- a/app/assets/stylesheets/admin/framework/responsive-navbar.less
+++ /dev/null
@@ -1,189 +0,0 @@
-//
-// Responsive: Navbar
-// --------------------------------------------------
-
-
-// TABLETS AND BELOW
-// -----------------
-@media (max-width: @navbarCollapseWidth) {
-
-  // UNFIX THE TOPBAR
-  // ----------------
-  // Remove any padding from the body
-  body {
-    padding-top: 0;
-  }
-  // Unfix the navbars
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: static;
-  }
-  .navbar-fixed-top {
-    margin-bottom: @baseLineHeight;
-  }
-  .navbar-fixed-bottom {
-    margin-top: @baseLineHeight;
-  }
-  .navbar-fixed-top .navbar-inner,
-  .navbar-fixed-bottom .navbar-inner {
-    padding: 5px;
-  }
-  .navbar .container {
-    width: auto;
-    padding: 0;
-  }
-  // Account for brand name
-  .navbar .brand {
-    padding-left: 10px;
-    padding-right: 10px;
-    margin: 0 0 0 -5px;
-  }
-
-  // COLLAPSIBLE NAVBAR
-  // ------------------
-  // Nav collapse clears brand
-  .nav-collapse {
-    clear: both;
-  }
-  // Block-level the nav
-  .nav-collapse .nav {
-    float: none;
-    margin: 0 0 (@baseLineHeight / 2);
-  }
-  .nav-collapse .nav > li {
-    float: none;
-  }
-  .nav-collapse .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > .divider-vertical {
-    display: none;
-  }
-  .nav-collapse .nav .nav-header {
-    color: @navbarText;
-    text-shadow: none;
-  }
-  // Nav and dropdown links in navbar
-  .nav-collapse .nav > li > a,
-  .nav-collapse .dropdown-menu a {
-    padding: 9px 15px;
-    font-weight: bold;
-    color: @navbarLinkColor;
-    .border-radius(3px);
-  }
-  // Buttons
-  .nav-collapse .btn {
-    padding: 4px 10px 4px;
-    font-weight: normal;
-    .border-radius(@baseBorderRadius);
-  }
-  .nav-collapse .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > li > a:hover,
-  .nav-collapse .nav > li > a:focus,
-  .nav-collapse .dropdown-menu a:hover,
-  .nav-collapse .dropdown-menu a:focus {
-    background-color: @navbarBackground;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a,
-  .navbar-inverse .nav-collapse .dropdown-menu a {
-    color: @navbarInverseLinkColor;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a:hover,
-  .navbar-inverse .nav-collapse .nav > li > a:focus,
-  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
-  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
-    background-color: @navbarInverseBackground;
-  }
-  // Buttons in the navbar
-  .nav-collapse.in .btn-group {
-    margin-top: 5px;
-    padding: 0;
-  }
-  // Dropdowns in the navbar
-  .nav-collapse .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    float: none;
-    display: none;
-    max-width: none;
-    margin: 0 15px;
-    padding: 0;
-    background-color: transparent;
-    border: none;
-    .border-radius(0);
-    .box-shadow(none);
-  }
-  .nav-collapse .open > .dropdown-menu { 
-    display: block; 
-  }
-
-  .nav-collapse .dropdown-menu:before,
-  .nav-collapse .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .dropdown-menu .divider {
-    display: none;
-  }
-  .nav-collapse .nav > li > .dropdown-menu {
-    &:before,
-    &:after {
-      display: none;
-    }
-  }
-  // Forms in navbar
-  .nav-collapse .navbar-form,
-  .nav-collapse .navbar-search {
-    float: none;
-    padding: (@baseLineHeight / 2) 15px;
-    margin: (@baseLineHeight / 2) 0;
-    border-top: 1px solid @navbarBackground;
-    border-bottom: 1px solid @navbarBackground;
-    .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
-  }
-  .navbar-inverse .nav-collapse .navbar-form,
-  .navbar-inverse .nav-collapse .navbar-search {
-    border-top-color: @navbarInverseBackground;
-    border-bottom-color: @navbarInverseBackground;
-  }
-  // Pull right (secondary) nav content
-  .navbar .nav-collapse .nav.pull-right {
-    float: none;
-    margin-left: 0;
-  }
-  // Hide everything in the navbar save .brand and toggle button */
-  .nav-collapse,
-  .nav-collapse.collapse {
-    overflow: hidden;
-    height: 0;
-  }
-  // Navbar button
-  .navbar .btn-navbar {
-    display: block;
-  }
-
-  // STATIC NAVBAR
-  // -------------
-  .navbar-static .navbar-inner {
-    padding-left:  10px;
-    padding-right: 10px;
-  }
-
-
-}
-
-
-// DEFAULT DESKTOP
-// ---------------
-
-@media (min-width: @navbarCollapseDesktopWidth) {
-
-  // Required to make the collapsing navbar work on regular desktops
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-
-}
diff --git a/app/assets/stylesheets/admin/framework/responsive-utilities.less b/app/assets/stylesheets/admin/framework/responsive-utilities.less
deleted file mode 100755
index bf43e8e..0000000
--- a/app/assets/stylesheets/admin/framework/responsive-utilities.less
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Responsive: Utility classes
-// --------------------------------------------------
-
-
-// IE10 Metro responsive
-// Required for Windows 8 Metro split-screen snapping with IE10
-// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
-@-ms-viewport{
-  width: device-width;
-}
-
-// Hide from screenreaders and browsers
-// Credit: HTML5 Boilerplate
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-// Visibility utilities
-
-// For desktops
-.visible-phone     { display: none !important; }
-.visible-tablet    { display: none !important; }
-.hidden-phone      { }
-.hidden-tablet     { }
-.hidden-desktop    { display: none !important; }
-.visible-desktop   { display: inherit !important; }
-
-// Tablets & small desktops only
-@media (min-width: 768px) and (max-width: 979px) {
-  // Hide everything else
-  .hidden-desktop    { display: inherit !important; }
-  .visible-desktop   { display: none !important ; }
-  // Show
-  .visible-tablet    { display: inherit !important; }
-  // Hide
-  .hidden-tablet     { display: none !important; }
-}
-
-// Phones only
-@media (max-width: 767px) {
-  // Hide everything else
-  .hidden-desktop    { display: inherit !important; }
-  .visible-desktop   { display: none !important; }
-  // Show
-  .visible-phone     { display: inherit !important; } // Use inherit to restore previous behavior
-  // Hide
-  .hidden-phone      { display: none !important; }
-}
-
-// Print utilities
-.visible-print    { display: none !important; }
-.hidden-print     { }
-
-@media print {
-  .visible-print  { display: inherit !important; }
-  .hidden-print   { display: none !important; }
-}
diff --git a/app/assets/stylesheets/admin/framework/responsive.less b/app/assets/stylesheets/admin/framework/responsive.less
deleted file mode 100755
index 9e5f9b1..0000000
--- a/app/assets/stylesheets/admin/framework/responsive.less
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
- * Bootstrap Responsive v2.3.2
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-
-// Responsive.less
-// For phone and tablet devices
-// -------------------------------------------------------------
-
-
-// REPEAT VARIABLES & MIXINS
-// -------------------------
-// Required since we compile the responsive stuff separately
-
-@import "variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "mixins.less";
-
-
-// RESPONSIVE CLASSES
-// ------------------
-
-@import "responsive-utilities.less";
-
-
-// MEDIA QUERIES
-// ------------------
-
-// Large desktops
-@import "responsive-1200px-min.less";
-
-// Tablets to regular desktops
-@import "responsive-768px-979px.less";
-
-// Phones to portrait tablets and narrow desktops
-@import "responsive-767px-max.less";
-
-
-// RESPONSIVE NAVBAR
-// ------------------
-
-// From 979px and below, show a button to toggle navbar contents
-@import "responsive-navbar.less";
diff --git a/app/assets/stylesheets/admin/framework/scaffolding.less b/app/assets/stylesheets/admin/framework/scaffolding.less
deleted file mode 100755
index f17e8ca..0000000
--- a/app/assets/stylesheets/admin/framework/scaffolding.less
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Scaffolding
-// --------------------------------------------------
-
-
-// Body reset
-// -------------------------
-
-body {
-  margin: 0;
-  font-family: @baseFontFamily;
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  color: @textColor;
-  background-color: @bodyBackground;
-}
-
-
-// Links
-// -------------------------
-
-a {
-  color: @linkColor;
-  text-decoration: none;
-}
-a:hover,
-a:focus {
-  color: @linkColorHover;
-  text-decoration: underline;
-}
-
-
-// Images
-// -------------------------
-
-// Rounded corners
-.img-rounded {
-  .border-radius(6px);
-}
-
-// Add polaroid-esque trim
-.img-polaroid {
-  padding: 4px;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
-  .box-shadow(0 1px 3px rgba(0,0,0,.1));
-}
-
-// Perfect circle
-.img-circle {
-  .border-radius(500px); // crank the border-radius so it works with most reasonably sized images
-}
diff --git a/app/assets/stylesheets/admin/framework/slider.less b/app/assets/stylesheets/admin/framework/slider.less
deleted file mode 100755
index 2dc9c85..0000000
--- a/app/assets/stylesheets/admin/framework/slider.less
+++ /dev/null
@@ -1,104 +0,0 @@
-/*!
- * Slider for Bootstrap
- *
- * Copyright 2012 Stefan Petre
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- */
-
-.slider {
-	display: inline-block;
-	vertical-align: middle;
-	position: relative;
-	&.slider-horizontal {
-		width: 210px;
-		height: @baseLineHeight;
-		.slider-track {
-			height: @baseLineHeight/2;
-			width: 100%;
-			margin-top: -@baseLineHeight/4;
-			top: 50%;
-			left: 0;
-		}
-		.slider-selection {
-			height: 100%;
-			top: 0;
-			bottom: 0;
-		}
-		.slider-handle {
-			margin-left: -@baseLineHeight/2;
-			margin-top: -@baseLineHeight/4;
-			&.triangle {
-    			border-width: 0 @baseLineHeight/2 @baseLineHeight/2 @baseLineHeight/2;
-				width: 0;
-				height: 0;
-				border-bottom-color: #0480be;
-				margin-top: 0;
-			}
-		}
-	}
-	&.slider-vertical {
-		height: 210px;
-		width: @baseLineHeight;
-		.slider-track {
-			width: @baseLineHeight/2;
-			height: 100%;
-			margin-left: -@baseLineHeight/4;
-			left: 50%;
-			top: 0;
-		}
-		.slider-selection {
-			width: 100%;
-			left: 0;
-			top: 0;
-			bottom: 0;
-		}
-		.slider-handle {
-			margin-left: -@baseLineHeight/4;
-			margin-top: -@baseLineHeight/2;
-			&.triangle {
-				border-width: @baseLineHeight/2 0 @baseLineHeight/2 @baseLineHeight/2;
-				width: 1px;
-				height: 1px;
-				border-left-color: #0480be;
-				margin-left: 0;
-			}
-		}
-	}
-	input {
-		display: none;
-	}
-	.tooltip-inner {
-		white-space: nowrap;
-	}
-}
-.slider-track {
-	position: absolute;
-	cursor: pointer;
-	#gradient > .vertical(#f5f5f5, #f9f9f9);
-	.box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
-	.border-radius(@baseBorderRadius);
-}
-.slider-selection {
-	position: absolute;
-	#gradient > .vertical(#f9f9f9, #f5f5f5);
-	.box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
-	.box-sizing(border-box);
-	.border-radius(@baseBorderRadius);
-}
-.slider-handle {
-	position: absolute;
-	width: @baseLineHeight;
-	height: @baseLineHeight;
-	#gradient > .vertical(#149bdf, #0480be);
-	.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
-	opacity: 0.8;
-	border: 0px solid transparent;
-	&.round {
-		.border-radius(@baseLineHeight);
-	}
-	&.triangle {
-		background: transparent none;
-	}
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin/framework/sprites.less b/app/assets/stylesheets/admin/framework/sprites.less
deleted file mode 100755
index 1812bf7..0000000
--- a/app/assets/stylesheets/admin/framework/sprites.less
+++ /dev/null
@@ -1,197 +0,0 @@
-//
-// Sprites
-// --------------------------------------------------
-
-
-// ICONS
-// -----
-
-// All icons receive the styles of the <i> tag with a base class
-// of .i and are then given a unique class to add width, height,
-// and background-position. Your resulting HTML will look like
-// <i class="icon-inbox"></i>.
-
-// For the white version of the icons, just add the .icon-white class:
-// <i class="icon-inbox icon-white"></i>
-
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  .ie7-restore-right-whitespace();
-  line-height: 14px;
-  vertical-align: text-top;
-  background-image: url("@{iconSpritePath}");
-  background-position: 14px 14px;
-  background-repeat: no-repeat;
-  margin-top: 1px;
-}
-
-/* White icons with optional class, or on hover/focus/active states of certain elements */
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:focus > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > li > a:focus > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:focus > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"],
-.dropdown-submenu:focus > a > [class*=" icon-"] {
-  background-image: url("@{iconWhiteSpritePath}");
-}
-
-.icon-glass              { background-position: 0      0; }
-.icon-music              { background-position: -24px  0; }
-.icon-search             { background-position: -48px  0; }
-.icon-envelope           { background-position: -72px  0; }
-.icon-heart              { background-position: -96px  0; }
-.icon-star               { background-position: -120px 0; }
-.icon-star-empty         { background-position: -144px 0; }
-.icon-user               { background-position: -168px 0; }
-.icon-film               { background-position: -192px 0; }
-.icon-th-large           { background-position: -216px 0; }
-.icon-th                 { background-position: -240px 0; }
-.icon-th-list            { background-position: -264px 0; }
-.icon-ok                 { background-position: -288px 0; }
-.icon-remove             { background-position: -312px 0; }
-.icon-zoom-in            { background-position: -336px 0; }
-.icon-zoom-out           { background-position: -360px 0; }
-.icon-off                { background-position: -384px 0; }
-.icon-signal             { background-position: -408px 0; }
-.icon-cog                { background-position: -432px 0; }
-.icon-trash              { background-position: -456px 0; }
-
-.icon-home               { background-position: 0      -24px; }
-.icon-file               { background-position: -24px  -24px; }
-.icon-time               { background-position: -48px  -24px; }
-.icon-road               { background-position: -72px  -24px; }
-.icon-download-alt       { background-position: -96px  -24px; }
-.icon-download           { background-position: -120px -24px; }
-.icon-upload             { background-position: -144px -24px; }
-.icon-inbox              { background-position: -168px -24px; }
-.icon-play-circle        { background-position: -192px -24px; }
-.icon-repeat             { background-position: -216px -24px; }
-.icon-refresh            { background-position: -240px -24px; }
-.icon-list-alt           { background-position: -264px -24px; }
-.icon-lock               { background-position: -287px -24px; } // 1px off
-.icon-flag               { background-position: -312px -24px; }
-.icon-headphones         { background-position: -336px -24px; }
-.icon-volume-off         { background-position: -360px -24px; }
-.icon-volume-down        { background-position: -384px -24px; }
-.icon-volume-up          { background-position: -408px -24px; }
-.icon-qrcode             { background-position: -432px -24px; }
-.icon-barcode            { background-position: -456px -24px; }
-
-.icon-tag                { background-position: 0      -48px; }
-.icon-tags               { background-position: -25px  -48px; } // 1px off
-.icon-book               { background-position: -48px  -48px; }
-.icon-bookmark           { background-position: -72px  -48px; }
-.icon-print              { background-position: -96px  -48px; }
-.icon-camera             { background-position: -120px -48px; }
-.icon-font               { background-position: -144px -48px; }
-.icon-bold               { background-position: -167px -48px; } // 1px off
-.icon-italic             { background-position: -192px -48px; }
-.icon-text-height        { background-position: -216px -48px; }
-.icon-text-width         { background-position: -240px -48px; }
-.icon-align-left         { background-position: -264px -48px; }
-.icon-align-center       { background-position: -288px -48px; }
-.icon-align-right        { background-position: -312px -48px; }
-.icon-align-justify      { background-position: -336px -48px; }
-.icon-list               { background-position: -360px -48px; }
-.icon-indent-left        { background-position: -384px -48px; }
-.icon-indent-right       { background-position: -408px -48px; }
-.icon-facetime-video     { background-position: -432px -48px; }
-.icon-picture            { background-position: -456px -48px; }
-
-.icon-pencil             { background-position: 0      -72px; }
-.icon-map-marker         { background-position: -24px  -72px; }
-.icon-adjust             { background-position: -48px  -72px; }
-.icon-tint               { background-position: -72px  -72px; }
-.icon-edit               { background-position: -96px  -72px; }
-.icon-share              { background-position: -120px -72px; }
-.icon-check              { background-position: -144px -72px; }
-.icon-move               { background-position: -168px -72px; }
-.icon-step-backward      { background-position: -192px -72px; }
-.icon-fast-backward      { background-position: -216px -72px; }
-.icon-backward           { background-position: -240px -72px; }
-.icon-play               { background-position: -264px -72px; }
-.icon-pause              { background-position: -288px -72px; }
-.icon-stop               { background-position: -312px -72px; }
-.icon-forward            { background-position: -336px -72px; }
-.icon-fast-forward       { background-position: -360px -72px; }
-.icon-step-forward       { background-position: -384px -72px; }
-.icon-eject              { background-position: -408px -72px; }
-.icon-chevron-left       { background-position: -432px -72px; }
-.icon-chevron-right      { background-position: -456px -72px; }
-
-.icon-plus-sign          { background-position: 0      -96px; }
-.icon-minus-sign         { background-position: -24px  -96px; }
-.icon-remove-sign        { background-position: -48px  -96px; }
-.icon-ok-sign            { background-position: -72px  -96px; }
-.icon-question-sign      { background-position: -96px  -96px; }
-.icon-info-sign          { background-position: -120px -96px; }
-.icon-screenshot         { background-position: -144px -96px; }
-.icon-remove-circle      { background-position: -168px -96px; }
-.icon-ok-circle          { background-position: -192px -96px; }
-.icon-ban-circle         { background-position: -216px -96px; }
-.icon-arrow-left         { background-position: -240px -96px; }
-.icon-arrow-right        { background-position: -264px -96px; }
-.icon-arrow-up           { background-position: -289px -96px; } // 1px off
-.icon-arrow-down         { background-position: -312px -96px; }
-.icon-share-alt          { background-position: -336px -96px; }
-.icon-resize-full        { background-position: -360px -96px; }
-.icon-resize-small       { background-position: -384px -96px; }
-.icon-plus               { background-position: -408px -96px; }
-.icon-minus              { background-position: -433px -96px; }
-.icon-asterisk           { background-position: -456px -96px; }
-
-.icon-exclamation-sign   { background-position: 0      -120px; }
-.icon-gift               { background-position: -24px  -120px; }
-.icon-leaf               { background-position: -48px  -120px; }
-.icon-fire               { background-position: -72px  -120px; }
-.icon-eye-open           { background-position: -96px  -120px; }
-.icon-eye-close          { background-position: -120px -120px; }
-.icon-warning-sign       { background-position: -144px -120px; }
-.icon-plane              { background-position: -168px -120px; }
-.icon-calendar           { background-position: -192px -120px; }
-.icon-random             { background-position: -216px -120px; width: 16px; }
-.icon-comment            { background-position: -240px -120px; }
-.icon-magnet             { background-position: -264px -120px; }
-.icon-chevron-up         { background-position: -288px -120px; }
-.icon-chevron-down       { background-position: -313px -119px; } // 1px, 1px off
-.icon-retweet            { background-position: -336px -120px; }
-.icon-shopping-cart      { background-position: -360px -120px; }
-.icon-folder-close       { background-position: -384px -120px; width: 16px; }
-.icon-folder-open        { background-position: -408px -120px; width: 16px; }
-.icon-resize-vertical    { background-position: -432px -119px; } // 1px, 1px off
-.icon-resize-horizontal  { background-position: -456px -118px; } // 1px, 2px off
-
-.icon-hdd                     { background-position: 0      -144px; }
-.icon-bullhorn                { background-position: -24px  -144px; }
-.icon-bell                    { background-position: -48px  -144px; }
-.icon-certificate             { background-position: -72px  -144px; }
-.icon-thumbs-up               { background-position: -96px  -144px; }
-.icon-thumbs-down             { background-position: -120px -144px; }
-.icon-hand-right              { background-position: -144px -144px; }
-.icon-hand-left               { background-position: -168px -144px; }
-.icon-hand-up                 { background-position: -192px -144px; }
-.icon-hand-down               { background-position: -216px -144px; }
-.icon-circle-arrow-right      { background-position: -240px -144px; }
-.icon-circle-arrow-left       { background-position: -264px -144px; }
-.icon-circle-arrow-up         { background-position: -288px -144px; }
-.icon-circle-arrow-down       { background-position: -312px -144px; }
-.icon-globe                   { background-position: -336px -144px; }
-.icon-wrench                  { background-position: -360px -144px; }
-.icon-tasks                   { background-position: -384px -144px; }
-.icon-filter                  { background-position: -408px -144px; }
-.icon-briefcase               { background-position: -432px -144px; }
-.icon-fullscreen              { background-position: -456px -144px; }
diff --git a/app/assets/stylesheets/admin/framework/tables.less b/app/assets/stylesheets/admin/framework/tables.less
deleted file mode 100755
index 0e35271..0000000
--- a/app/assets/stylesheets/admin/framework/tables.less
+++ /dev/null
@@ -1,244 +0,0 @@
-//
-// Tables
-// --------------------------------------------------
-
-
-// BASE TABLES
-// -----------------
-
-table {
-  max-width: 100%;
-  background-color: @tableBackground;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-// BASELINE STYLES
-// ---------------
-
-.table {
-  width: 100%;
-  margin-bottom: @baseLineHeight;
-  // Cells
-  th,
-  td {
-    padding: 8px;
-    line-height: @baseLineHeight;
-    text-align: left;
-    vertical-align: top;
-    border-top: 1px solid @tableBorder;
-  }
-  th {
-    font-weight: bold;
-  }
-  // Bottom align for column headings
-  thead th {
-    vertical-align: bottom;
-  }
-  // Remove top border from thead by default
-  caption + thead tr:first-child th,
-  caption + thead tr:first-child td,
-  colgroup + thead tr:first-child th,
-  colgroup + thead tr:first-child td,
-  thead:first-child tr:first-child th,
-  thead:first-child tr:first-child td {
-    border-top: 0;
-  }
-  // Account for multiple tbody instances
-  tbody + tbody {
-    border-top: 2px solid @tableBorder;
-  }
-
-  // Nesting
-  .table {
-    background-color: @bodyBackground;
-  }
-}
-
-
-
-// CONDENSED TABLE W/ HALF PADDING
-// -------------------------------
-
-.table-condensed {
-  th,
-  td {
-    padding: 4px 5px;
-  }
-}
-
-
-// BORDERED VERSION
-// ----------------
-
-.table-bordered {
-  border: 1px solid @tableBorder;
-  border-collapse: separate; // Done so we can round those corners!
-  *border-collapse: collapse; // IE7 can't round corners anyway
-  border-left: 0;
-  .border-radius(@baseBorderRadius);
-  th,
-  td {
-    border-left: 1px solid @tableBorder;
-  }
-  // Prevent a double border
-  caption + thead tr:first-child th,
-  caption + tbody tr:first-child th,
-  caption + tbody tr:first-child td,
-  colgroup + thead tr:first-child th,
-  colgroup + tbody tr:first-child th,
-  colgroup + tbody tr:first-child td,
-  thead:first-child tr:first-child th,
-  tbody:first-child tr:first-child th,
-  tbody:first-child tr:first-child td {
-    border-top: 0;
-  }
-  // For first th/td in the first row in the first thead or tbody
-  thead:first-child tr:first-child > th:first-child,
-  tbody:first-child tr:first-child > td:first-child,
-  tbody:first-child tr:first-child > th:first-child {
-    .border-top-left-radius(@baseBorderRadius);
-  }
-  // For last th/td in the first row in the first thead or tbody
-  thead:first-child tr:first-child > th:last-child,
-  tbody:first-child tr:first-child > td:last-child,
-  tbody:first-child tr:first-child > th:last-child {
-    .border-top-right-radius(@baseBorderRadius);
-  }
-  // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
-  thead:last-child tr:last-child > th:first-child,
-  tbody:last-child tr:last-child > td:first-child,
-  tbody:last-child tr:last-child > th:first-child,
-  tfoot:last-child tr:last-child > td:first-child,
-  tfoot:last-child tr:last-child > th:first-child {
-    .border-bottom-left-radius(@baseBorderRadius);
-  }
-  // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
-  thead:last-child tr:last-child > th:last-child,
-  tbody:last-child tr:last-child > td:last-child,
-  tbody:last-child tr:last-child > th:last-child,
-  tfoot:last-child tr:last-child > td:last-child,
-  tfoot:last-child tr:last-child > th:last-child {
-    .border-bottom-right-radius(@baseBorderRadius);
-  }
-
-  // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot
-  tfoot + tbody:last-child tr:last-child td:first-child {
-    .border-bottom-left-radius(0);
-  }
-  tfoot + tbody:last-child tr:last-child td:last-child {
-    .border-bottom-right-radius(0);
-  }
-
-  // Special fixes to round the left border on the first td/th
-  caption + thead tr:first-child th:first-child,
-  caption + tbody tr:first-child td:first-child,
-  colgroup + thead tr:first-child th:first-child,
-  colgroup + tbody tr:first-child td:first-child {
-    .border-top-left-radius(@baseBorderRadius);
-  }
-  caption + thead tr:first-child th:last-child,
-  caption + tbody tr:first-child td:last-child,
-  colgroup + thead tr:first-child th:last-child,
-  colgroup + tbody tr:first-child td:last-child {
-    .border-top-right-radius(@baseBorderRadius);
-  }
-
-}
-
-
-
-
-// ZEBRA-STRIPING
-// --------------
-
-// Default zebra-stripe styles (alternating gray and transparent backgrounds)
-.table-striped {
-  tbody {
-    > tr:nth-child(odd) > td,
-    > tr:nth-child(odd) > th {
-      background-color: @tableBackgroundAccent;
-    }
-  }
-}
-
-
-// HOVER EFFECT
-// ------------
-// Placed here since it has to come after the potential zebra striping
-.table-hover {
-  tbody {
-    tr:hover > td,
-    tr:hover > th {
-      background-color: @tableBackgroundHover;
-    }
-  }
-}
-
-
-// TABLE CELL SIZING
-// -----------------
-
-// Reset default grid behavior
-table td[class*="span"],
-table th[class*="span"],
-.row-fluid table td[class*="span"],
-.row-fluid table th[class*="span"] {
-  display: table-cell;
-  float: none; // undo default grid column styles
-  margin-left: 0; // undo default grid column styles
-}
-
-// Change the column widths to account for td/th padding
-.table td,
-.table th {
-  &.span1     { .tableColumns(1); }
-  &.span2     { .tableColumns(2); }
-  &.span3     { .tableColumns(3); }
-  &.span4     { .tableColumns(4); }
-  &.span5     { .tableColumns(5); }
-  &.span6     { .tableColumns(6); }
-  &.span7     { .tableColumns(7); }
-  &.span8     { .tableColumns(8); }
-  &.span9     { .tableColumns(9); }
-  &.span10    { .tableColumns(10); }
-  &.span11    { .tableColumns(11); }
-  &.span12    { .tableColumns(12); }
-}
-
-
-
-// TABLE BACKGROUNDS
-// -----------------
-// Exact selectors below required to override .table-striped
-
-.table tbody tr {
-  &.success > td {
-    background-color: @successBackground;
-  }
-  &.error > td {
-    background-color: @errorBackground;
-  }
-  &.warning > td {
-    background-color: @warningBackground;
-  }
-  &.info > td {
-    background-color: @infoBackground;
-  }
-}
-
-// Hover states for .table-hover
-.table-hover tbody tr {
-  &.success:hover > td {
-    background-color: darken(@successBackground, 5%);
-  }
-  &.error:hover > td {
-    background-color: darken(@errorBackground, 5%);
-  }
-  &.warning:hover > td {
-    background-color: darken(@warningBackground, 5%);
-  }
-  &.info:hover > td {
-    background-color: darken(@infoBackground, 5%);
-  }
-}
diff --git a/app/assets/stylesheets/admin/framework/thumbnails.less b/app/assets/stylesheets/admin/framework/thumbnails.less
deleted file mode 100755
index 4fd07d2..0000000
--- a/app/assets/stylesheets/admin/framework/thumbnails.less
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Thumbnails
-// --------------------------------------------------
-
-
-// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
-
-// Make wrapper ul behave like the grid
-.thumbnails {
-  margin-left: -@gridGutterWidth;
-  list-style: none;
-  .clearfix();
-}
-// Fluid rows have no left margin
-.row-fluid .thumbnails {
-  margin-left: 0;
-}
-
-// Float li to make thumbnails appear in a row
-.thumbnails > li {
-  float: left; // Explicity set the float since we don't require .span* classes
-  margin-bottom: @baseLineHeight;
-  margin-left: @gridGutterWidth;
-}
-
-// The actual thumbnail (can be `a` or `div`)
-.thumbnail {
-  display: block;
-  padding: 4px;
-  line-height: @baseLineHeight;
-  border: 1px solid #ddd;
-  .border-radius(@baseBorderRadius);
-  .box-shadow(0 1px 3px rgba(0,0,0,.055));
-  .transition(all .2s ease-in-out);
-}
-// Add a hover/focus state for linked versions only
-a.thumbnail:hover,
-a.thumbnail:focus {
-  border-color: @linkColor;
-  .box-shadow(0 1px 4px rgba(0,105,214,.25));
-}
-
-// Images and captions
-.thumbnail > img {
-  display: block;
-  max-width: 100%;
-  margin-left: auto;
-  margin-right: auto;
-}
-.thumbnail .caption {
-  padding: 9px;
-  color: @gray;
-}
diff --git a/app/assets/stylesheets/admin/framework/tooltip.less b/app/assets/stylesheets/admin/framework/tooltip.less
deleted file mode 100755
index 83d5f2b..0000000
--- a/app/assets/stylesheets/admin/framework/tooltip.less
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Tooltips
-// --------------------------------------------------
-
-
-// Base class
-.tooltip {
-  position: absolute;
-  z-index: @zindexTooltip;
-  display: block;
-  visibility: visible;
-  font-size: 11px;
-  line-height: 1.4;
-  .opacity(0);
-  &.in     { .opacity(80); }
-  &.top    { margin-top:  -3px; padding: 5px 0; }
-  &.right  { margin-left:  3px; padding: 0 5px; }
-  &.bottom { margin-top:   3px; padding: 5px 0; }
-  &.left   { margin-left: -3px; padding: 0 5px; }
-}
-
-// Wrapper for the tooltip content
-.tooltip-inner {
-  max-width: 200px;
-  padding: 8px;
-  color: @tooltipColor;
-  text-align: center;
-  text-decoration: none;
-  background-color: @tooltipBackground;
-  .border-radius(@baseBorderRadius);
-}
-
-// Arrows
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-.tooltip {
-  &.top .tooltip-arrow {
-    bottom: 0;
-    left: 50%;
-    margin-left: -@tooltipArrowWidth;
-    border-width: @tooltipArrowWidth @tooltipArrowWidth 0;
-    border-top-color: @tooltipArrowColor;
-  }
-  &.right .tooltip-arrow {
-    top: 50%;
-    left: 0;
-    margin-top: -@tooltipArrowWidth;
-    border-width: @tooltipArrowWidth @tooltipArrowWidth @tooltipArrowWidth 0;
-    border-right-color: @tooltipArrowColor;
-  }
-  &.left .tooltip-arrow {
-    top: 50%;
-    right: 0;
-    margin-top: -@tooltipArrowWidth;
-    border-width: @tooltipArrowWidth 0 @tooltipArrowWidth @tooltipArrowWidth;
-    border-left-color: @tooltipArrowColor;
-  }
-  &.bottom .tooltip-arrow {
-    top: 0;
-    left: 50%;
-    margin-left: -@tooltipArrowWidth;
-    border-width: 0 @tooltipArrowWidth @tooltipArrowWidth;
-    border-bottom-color: @tooltipArrowColor;
-  }
-}
diff --git a/app/assets/stylesheets/admin/framework/type.less b/app/assets/stylesheets/admin/framework/type.less
deleted file mode 100755
index 337138a..0000000
--- a/app/assets/stylesheets/admin/framework/type.less
+++ /dev/null
@@ -1,247 +0,0 @@
-//
-// Typography
-// --------------------------------------------------
-
-
-// Body text
-// -------------------------
-
-p {
-  margin: 0 0 @baseLineHeight / 2;
-}
-.lead {
-  margin-bottom: @baseLineHeight;
-  font-size: @baseFontSize * 1.5;
-  font-weight: 200;
-  line-height: @baseLineHeight * 1.5;
-}
-
-
-// Emphasis & misc
-// -------------------------
-
-// Ex: 14px base font * 85% = about 12px
-small   { font-size: 85%; }
-
-strong  { font-weight: bold; }
-em      { font-style: italic; }
-cite    { font-style: normal; }
-
-// Utility classes
-.muted               { color: @grayLight; }
-a.muted:hover,
-a.muted:focus        { color: darken(@grayLight, 10%); }
-
-.text-warning        { color: @warningText; }
-a.text-warning:hover,
-a.text-warning:focus { color: darken(@warningText, 10%); }
-
-.text-error          { color: @errorText; }
-a.text-error:hover,
-a.text-error:focus   { color: darken(@errorText, 10%); }
-
-.text-info           { color: @infoText; }
-a.text-info:hover,
-a.text-info:focus    { color: darken(@infoText, 10%); }
-
-.text-success        { color: @successText; }
-a.text-success:hover,
-a.text-success:focus { color: darken(@successText, 10%); }
-
-.text-left           { text-align: left; }
-.text-right          { text-align: right; }
-.text-center         { text-align: center; }
-
-
-// Headings
-// -------------------------
-
-h1, h2, h3, h4, h5, h6 {
-  margin: (@baseLineHeight / 2) 0;
-  font-family: @headingsFontFamily;
-  font-weight: @headingsFontWeight;
-  line-height: @baseLineHeight;
-  color: @headingsColor;
-  text-rendering: optimizelegibility; // Fix the character spacing for headings
-  small {
-    font-weight: normal;
-    line-height: 1;
-    color: @grayLight;
-  }
-}
-
-h1,
-h2,
-h3 { line-height: @baseLineHeight * 2; }
-
-h1 { font-size: @baseFontSize * 2.75; } // ~38px
-h2 { font-size: @baseFontSize * 2.25; } // ~32px
-h3 { font-size: @baseFontSize * 1.75; } // ~24px
-h4 { font-size: @baseFontSize * 1.25; } // ~18px
-h5 { font-size: @baseFontSize; }
-h6 { font-size: @baseFontSize * 0.85; } // ~12px
-
-h1 small { font-size: @baseFontSize * 1.75; } // ~24px
-h2 small { font-size: @baseFontSize * 1.25; } // ~18px
-h3 small { font-size: @baseFontSize; }
-h4 small { font-size: @baseFontSize; }
-
-
-// Page header
-// -------------------------
-
-.page-header {
-  padding-bottom: (@baseLineHeight / 2) - 1;
-  margin: @baseLineHeight 0 (@baseLineHeight * 1.5);
-  border-bottom: 1px solid @grayLighter;
-}
-
-
-
-// Lists
-// --------------------------------------------------
-
-// Unordered and Ordered lists
-ul, ol {
-  padding: 0;
-  margin: 0 0 @baseLineHeight / 2 25px;
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-li {
-  line-height: @baseLineHeight;
-}
-
-// Remove default list styles
-ul.unstyled,
-ol.unstyled {
-  margin-left: 0;
-  list-style: none;
-}
-
-// Single-line list items
-ul.inline,
-ol.inline {
-  margin-left: 0;
-  list-style: none;
-  > li {
-    display: inline-block;
-    .ie7-inline-block();
-    padding-left: 5px;
-    padding-right: 5px;
-  }
-}
-
-// Description Lists
-dl {
-  margin-bottom: @baseLineHeight;
-}
-dt,
-dd {
-  line-height: @baseLineHeight;
-}
-dt {
-  font-weight: bold;
-}
-dd {
-  margin-left: @baseLineHeight / 2;
-}
-// Horizontal layout (like forms)
-.dl-horizontal {
-  .clearfix(); // Ensure dl clears floats if empty dd elements present
-  dt {
-    float: left;
-    width: @horizontalComponentOffset - 20;
-    clear: left;
-    text-align: right;
-    .text-overflow();
-  }
-  dd {
-    margin-left: @horizontalComponentOffset;
-  }
-}
-
-// MISC
-// ----
-
-// Horizontal rules
-hr {
-  margin: @baseLineHeight 0;
-  border: 0;
-  border-top: 1px solid @hrBorder;
-  border-bottom: 1px solid @white;
-}
-
-// Abbreviations and acronyms
-abbr[title],
-// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
-abbr[data-original-title] {
-  cursor: help;
-  border-bottom: 1px dotted @grayLight;
-}
-abbr.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
-
-// Blockquotes
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 @baseLineHeight;
-  border-left: 5px solid @grayLighter;
-  p {
-    margin-bottom: 0;
-    font-size: @baseFontSize * 1.25;
-    font-weight: 300;
-    line-height: 1.25;
-  }
-  small {
-    display: block;
-    line-height: @baseLineHeight;
-    color: @grayLight;
-    &:before {
-      content: '\2014 \00A0';
-    }
-  }
-
-  // Float right with text-align: right
-  &.pull-right {
-    float: right;
-    padding-right: 15px;
-    padding-left: 0;
-    border-right: 5px solid @grayLighter;
-    border-left: 0;
-    p,
-    small {
-      text-align: right;
-    }
-    small {
-      &:before {
-        content: '';
-      }
-      &:after {
-        content: '\00A0 \2014';
-      }
-    }
-  }
-}
-
-// Quotes
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-
-// Addresses
-address {
-  display: block;
-  margin-bottom: @baseLineHeight;
-  font-style: normal;
-  line-height: @baseLineHeight;
-}
diff --git a/app/assets/stylesheets/admin/framework/utilities.less b/app/assets/stylesheets/admin/framework/utilities.less
deleted file mode 100755
index 314b4ff..0000000
--- a/app/assets/stylesheets/admin/framework/utilities.less
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// Utility classes
-// --------------------------------------------------
-
-
-// Quick floats
-.pull-right {
-  float: right;
-}
-.pull-left {
-  float: left;
-}
-
-// Toggling content
-.hide {
-  display: none;
-}
-.show {
-  display: block;
-}
-
-// Visibility
-.invisible {
-  visibility: hidden;
-}
-
-// For Affix plugin
-.affix {
-  position: fixed;
-}
diff --git a/app/assets/stylesheets/admin/framework/variables.less b/app/assets/stylesheets/admin/framework/variables.less
deleted file mode 100755
index ad7a398..0000000
--- a/app/assets/stylesheets/admin/framework/variables.less
+++ /dev/null
@@ -1,301 +0,0 @@
-//
-// Variables
-// --------------------------------------------------
-
-
-// Global values
-// --------------------------------------------------
-
-
-// Grays
-// -------------------------
-@black:                 #000;
-@grayDarker:            #222;
-@grayDark:              #333;
-@gray:                  #555;
-@grayLight:             #999;
-@grayLighter:           #eee;
-@white:                 #fff;
-
-
-// Accent colors
-// -------------------------
-@blue:                  #049cdb;
-@blueDark:              #0064cd;
-@green:                 #46a546;
-@red:                   #9d261d;
-@yellow:                #ffc40d;
-@orange:                #f89406;
-@pink:                  #c3325f;
-@purple:                #7a43b6;
-
-
-// Scaffolding
-// -------------------------
-@bodyBackground:        @white;
-@textColor:             @grayDark;
-
-
-// Links
-// -------------------------
-@linkColor:             #08c;
-@linkColorHover:        darken(@linkColor, 15%);
-
-
-// Typography
-// -------------------------
-@sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
-@serifFontFamily:       Georgia, "Times New Roman", Times, serif;
-@monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace;
-
-@baseFontSize:          14px;
-@baseFontFamily:        @sansFontFamily;
-@baseLineHeight:        20px;
-@altFontFamily:         @serifFontFamily;
-
-@headingsFontFamily:    "Stylograph"; // empty to use BS default, @baseFontFamily
-@headingsFontWeight:    100;    // instead of browser default, bold
-@headingsColor:         inherit; // empty to use BS default, @textColor
-
-
-// Component sizing
-// -------------------------
-// Based on 14px font-size and 20px line-height
-
-@fontSizeLarge:         @baseFontSize * 1.25; // ~18px
-@fontSizeSmall:         @baseFontSize * 0.85; // ~12px
-@fontSizeMini:          @baseFontSize * 0.75; // ~11px
-
-@paddingLarge:          11px 19px; // 44px
-@paddingSmall:          2px 10px;  // 26px
-@paddingMini:           0 6px;   // 22px
-
-@baseBorderRadius:      4px;
-@borderRadiusLarge:     6px;
-@borderRadiusSmall:     3px;
-
-
-// Tables
-// -------------------------
-@tableBackground:                   transparent; // overall background-color
-@tableBackgroundAccent:             #f9f9f9; // for striping
-@tableBackgroundHover:              #f5f5f5; // for hover
-@tableBorder:                       #ddd; // table and cell border
-
-// Buttons
-// -------------------------
-@btnBackground:                     @white;
-@btnBackgroundHighlight:            darken(@white, 10%);
-@btnBorder:                         #ccc;
-
-@btnPrimaryBackground:              @linkColor;
-@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 20%);
-
-@btnInfoBackground:                 #5bc0de;
-@btnInfoBackgroundHighlight:        #2f96b4;
-
-@btnSuccessBackground:              #62c462;
-@btnSuccessBackgroundHighlight:     #51a351;
-
-@btnWarningBackground:              lighten(@orange, 15%);
-@btnWarningBackgroundHighlight:     @orange;
-
-@btnDangerBackground:               #ee5f5b;
-@btnDangerBackgroundHighlight:      #bd362f;
-
-@btnInverseBackground:              #444;
-@btnInverseBackgroundHighlight:     @grayDarker;
-
-
-// Forms
-// -------------------------
-@inputBackground:               @white;
-@inputBorder:                   #ccc;
-@inputBorderRadius:             @baseBorderRadius;
-@inputDisabledBackground:       @grayLighter;
-@formActionsBackground:         #f5f5f5;
-@inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
-
-
-// Dropdowns
-// -------------------------
-@dropdownBackground:            @white;
-@dropdownBorder:                rgba(0,0,0,.2);
-@dropdownDividerTop:            #e5e5e5;
-@dropdownDividerBottom:         @white;
-
-@dropdownLinkColor:             @grayDark;
-@dropdownLinkColorHover:        @white;
-@dropdownLinkColorActive:       @white;
-
-@dropdownLinkBackgroundActive:  @linkColor;
-@dropdownLinkBackgroundHover:   @dropdownLinkBackgroundActive;
-
-
-
-// COMPONENT VARIABLES
-// --------------------------------------------------
-
-
-// Z-index master list
-// -------------------------
-// Used for a bird's eye view of components dependent on the z-axis
-// Try to avoid customizing these :)
-@zindexDropdown:          1000;
-@zindexPopover:           1010;
-@zindexTooltip:           1030;
-@zindexFixedNavbar:       1030;
-@zindexModalBackdrop:     1040;
-@zindexModal:             1050;
-
-
-// Sprite icons path
-// -------------------------
-@iconSpritePath:          "../img/glyphicons-halflings.png";
-@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
-
-
-// Input placeholder text color
-// -------------------------
-@placeholderText:         @grayLight;
-
-
-// Hr border color
-// -------------------------
-@hrBorder:                @grayLighter;
-
-
-// Horizontal forms & lists
-// -------------------------
-@horizontalComponentOffset:       180px;
-
-
-// Wells
-// -------------------------
-@wellBackground:                  #f5f5f5;
-
-
-// Navbar
-// -------------------------
-@navbarCollapseWidth:             979px;
-@navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
-
-@navbarHeight:                    40px;
-@navbarBackgroundHighlight:       #ffffff;
-@navbarBackground:                darken(@navbarBackgroundHighlight, 5%);
-@navbarBorder:                    darken(@navbarBackground, 12%);
-
-@navbarText:                      #777;
-@navbarLinkColor:                 #777;
-@navbarLinkColorHover:            @grayDark;
-@navbarLinkColorActive:           @gray;
-@navbarLinkBackgroundHover:       transparent;
-@navbarLinkBackgroundActive:      darken(@navbarBackground, 5%);
-
-@navbarBrandColor:                @navbarLinkColor;
-
-// Inverted navbar
-@navbarInverseBackground:                #111111;
-@navbarInverseBackgroundHighlight:       #222222;
-@navbarInverseBorder:                    #252525;
-
-@navbarInverseText:                      @grayLight;
-@navbarInverseLinkColor:                 @grayLight;
-@navbarInverseLinkColorHover:            @white;
-@navbarInverseLinkColorActive:           @navbarInverseLinkColorHover;
-@navbarInverseLinkBackgroundHover:       transparent;
-@navbarInverseLinkBackgroundActive:      @navbarInverseBackground;
-
-@navbarInverseSearchBackground:          lighten(@navbarInverseBackground, 25%);
-@navbarInverseSearchBackgroundFocus:     @white;
-@navbarInverseSearchBorder:              @navbarInverseBackground;
-@navbarInverseSearchPlaceholderColor:    #ccc;
-
-@navbarInverseBrandColor:                @navbarInverseLinkColor;
-
-
-// Pagination
-// -------------------------
-@paginationBackground:                #fff;
-@paginationBorder:                    #ddd;
-@paginationActiveBackground:          #f5f5f5;
-
-
-// Hero unit
-// -------------------------
-@heroUnitBackground:              @grayLighter;
-@heroUnitHeadingColor:            inherit;
-@heroUnitLeadColor:               inherit;
-
-
-// Form states and alerts
-// -------------------------
-@warningText:             #c09853;
-@warningBackground:       #fcf8e3;
-@warningBorder:           darken(spin(@warningBackground, -10), 3%);
-
-@errorText:               #b94a48;
-@errorBackground:         #f2dede;
-@errorBorder:             darken(spin(@errorBackground, -10), 3%);
-
-@successText:             #468847;
-@successBackground:       #dff0d8;
-@successBorder:           darken(spin(@successBackground, -10), 5%);
-
-@infoText:                #3a87ad;
-@infoBackground:          #d9edf7;
-@infoBorder:              darken(spin(@infoBackground, -10), 7%);
-
-
-// Tooltips and popovers
-// -------------------------
-@tooltipColor:            #fff;
-@tooltipBackground:       #000;
-@tooltipArrowWidth:       5px;
-@tooltipArrowColor:       @tooltipBackground;
-
-@popoverBackground:       #fff;
-@popoverArrowWidth:       10px;
-@popoverArrowColor:       #fff;
-@popoverTitleBackground:  darken(@popoverBackground, 3%);
-
-// Special enhancement for popovers
-@popoverArrowOuterWidth:  @popoverArrowWidth + 1;
-@popoverArrowOuterColor:  rgba(0,0,0,.25);
-
-
-
-// GRID
-// --------------------------------------------------
-
-
-// Default 940px grid
-// -------------------------
-@gridColumns:             12;
-@gridColumnWidth:         60px;
-@gridGutterWidth:         20px;
-@gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-
-// 1200px min
-@gridColumnWidth1200:     70px;
-@gridGutterWidth1200:     30px;
-@gridRowWidth1200:        (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
-
-// 768px-979px
-@gridColumnWidth768:      42px;
-@gridGutterWidth768:      20px;
-@gridRowWidth768:         (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
-
-
-// Fluid grid
-// -------------------------
-@fluidGridColumnWidth:    percentage(@gridColumnWidth/@gridRowWidth);
-@fluidGridGutterWidth:    percentage(@gridGutterWidth/@gridRowWidth);
-
-// 1200px min
-@fluidGridColumnWidth1200:     percentage(@gridColumnWidth1200/@gridRowWidth1200);
-@fluidGridGutterWidth1200:     percentage(@gridGutterWidth1200/@gridRowWidth1200);
-
-// 768px-979px
-@fluidGridColumnWidth768:      percentage(@gridColumnWidth768/@gridRowWidth768);
-@fluidGridGutterWidth768:      percentage(@gridGutterWidth768/@gridRowWidth768);
diff --git a/app/assets/stylesheets/admin/framework/wells.less b/app/assets/stylesheets/admin/framework/wells.less
deleted file mode 100755
index 84a744b..0000000
--- a/app/assets/stylesheets/admin/framework/wells.less
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Wells
-// --------------------------------------------------
-
-
-// Base class
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: @wellBackground;
-  border: 1px solid darken(@wellBackground, 7%);
-  .border-radius(@baseBorderRadius);
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
-  blockquote {
-    border-color: #ddd;
-    border-color: rgba(0,0,0,.15);
-  }
-}
-
-// Sizes
-.well-large {
-  padding: 24px;
-  .border-radius(@borderRadiusLarge);
-}
-.well-small {
-  padding: 9px;
-  .border-radius(@borderRadiusSmall);
-}
diff --git a/app/assets/stylesheets/admin/lesshat.less b/app/assets/stylesheets/admin/lesshat.less
deleted file mode 100755
index 0658520..0000000
--- a/app/assets/stylesheets/admin/lesshat.less
+++ /dev/null
@@ -1,2200 +0,0 @@
-//  LESS Hat 1.1.1
-//  LESSHat.com
-//  From creators of CSSHat.com
-//  2012
-//  Petr Brzek & Jan Kuca
-
-
-//  @GlobalConfig
-
-//    .animation
-    //    .animation-delay
-    //    .animation-direction
-    //    .animation-duration
-    //    .animation-fill-mode
-    //    .animation-timing-function
-    //    .animation-iteration-count
-    //    .animation-name
-    //    .animation-play-state
-    //    .keyframes - in future
-//    .appearance
-//    .backface-visibility
-//    .background-clip
-//    .background-image
-//    .background-origin
-//    .background-size
-//    .border-radius
-    //    .border-top-left-radius
-    //    .border-top-right-radius
-    //    .border-bottom-left-radius
-    //    .border-bottom-right-radius
-//    .border-image
-//    .box-shadow
-//    .box-sizing
-//    .columns
-    //    .column-count
-    //    .column-gap
-    //    .column-rule
-    //    .column-width
-//    .font-face
-//    .gradient
-//    .opacity
-//    .perspective
-    //    .perspective-origin
-//    .size
-//    .transform
-    //    .transform-origin
-    //    .transform-style
-    //    .translate
-    //    .translate3d
-    //    .translateX
-    //    .translateY
-    //    .translateZ
-    //    .scale
-    //    .scale3d
-    //    .scaleX
-    //    .scaleY
-    //    .scaleZ
-    //    .rotate
-    //    .rotate3d
-    //    .rotateX
-    //    .rotateY
-    //    .rotateZ
-    //    .skew
-    //    .skewX
-    //    .skewY
-//    .transition
-    //    .transition-property
-    //    .transition-duration
-    //    .transition-timing-function
-    //    .transition-delay
-//    .user-select
-//    DEPRECATED mixins
-
-
-//  @GlobalConfig
-
-  // Config supported browsers for your project
-
-    @w3c: true; // Unprefixed W3C syntax
-    @webkit: true; // Chrome 7+, Safari 5+, iOS5, Android
-    @moz: true; //  Firefox 4+
-    @opera: true; // Opera 10.5+
-    @ms: true;  // IE 10+
-
-  // Signals
-
-    @webkitSignal: 1;
-    @mozSignal: 2;
-    @operaSignal: 3;
-    @msSignal: 4;
-    @w3cSignal: 5;
-
-// .animation
-
-  .animation(...){
-
-    //  Local config for disabling properties
-
-    @w3cLocal: true; // Unprefixed W3C syntax
-    @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-    @mozLocal: true; //  Firefox 4+
-    @operaLocal: true; // Opera 10.5+
-    @msLocal: true;  // IE 10+
-
-    @processing: ~`(function(){ var arg = "@{arguments}".replace("[","").replace("]","") || "none"; if( !/^\w*([ X])/.test(arg) ) { arg = arg.replace(/,/g,"") } return arg; })()`;
-
-    .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-      .inception (@signal, @arguments) when (@signal = 1) { -webkit-animation: @processing;}
-      .inception (@signal, @arguments) when (@signal = 2) { -moz-animation: @processing;}
-      .inception (@signal, @arguments) when (@signal = 3) { -o-animation: @processing;}
-      .inception (@signal, @arguments) when (@signal = 4) { -ms-animation: @processing;}
-      .inception (@signal, @arguments) when (@signal = 5) { animation: @processing;}
-      .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-      .inception(@signal, @arguments);
-    }
-    .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-   //  element{ .animation(nameAnimation 2s linear alternate anim 3s linear alternate ); }
-
-
-  //  .animation-delay
-
-  .animation-delay(...){
-
-    //  Local config for disabling properties
-
-    @w3cLocal: true; // Unprefixed W3C syntax
-    @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-    @mozLocal: true; //  Firefox 4+
-    @operaLocal: true; // Opera 10.5+
-    @msLocal: true;  // IE 10+
-
-    @processing: ~`(function(){ var arg = "@{arguments}" || "0"; arg = arg.replace("[","").replace("]",""); return arg; }())`;
-
-    .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-      .inception (@signal, @arguments) when (@signal = 1) { -webkit-animation-delay: @processing;}
-      .inception (@signal, @arguments) when (@signal = 2) { -moz-animation-delay: @processing;}
-      .inception (@signal, @arguments) when (@signal = 3) { -o-animation-delay: @processing;}
-      .inception (@signal, @arguments) when (@signal = 4) { -ms-animation-delay: @processing;}
-      .inception (@signal, @arguments) when (@signal = 5) { animation-delay: @processing;}
-      .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-      .inception(@signal, @arguments);
-    }
-    .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .animation-delay(1s); }
-    //  element{ .animation-delay(750ms, 2s, 3s); } // For multiple animation-direction
-
-
-  //  .animation-direction
-
-    .animation-direction(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      @processing: ~`(function(){ var arg = "@{arguments}" || "normal"; arg = arg.replace("[","").replace("]",""); return arg; }())`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-animation-direction: @processing;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-animation-direction: @processing;}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-animation-direction: @processing;}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-animation-direction: @processing;}
-        .inception (@signal, @arguments) when (@signal = 5) { animation-direction: @processing;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .animation-direction(); }
-    //  element{ .animation-direction(normal, alternate); }
-
-
-  //  .animation-duration
-
-    .animation-duration(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      @processing: ~`(function(){ var arg = "@{arguments}" || "0"; arg = arg.replace("[","").replace("]",""); return arg; }())`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-animation-duration: @processing;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-animation-duration: @processing;}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-animation-duration: @processing;}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-animation-duration: @processing;}
-        .inception (@signal, @arguments) when (@signal = 5) { animation-duration: @processing;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .animation-duration(2s); }
-
-
-  //  .animation-fill-mode
-
-    .animation-fill-mode(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      @processing: ~`(function(){ var arg = "@{arguments}" || "none"; arg = arg.replace("[","").replace("]",""); return arg; }())`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-animation-fill-mode: @processing;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-animation-fill-mode: @processing;}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-animation-fill-mode: @processing;}
-        .inception (@signal, @arguments) when (@signal = 5) { animation-fill-mode: @processing;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .animation-fill-mode(forwards); }
-
-
-  //  .animation-timing-function
-
-    .animation-timing-function(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      @processing: ~`(function(){ var arg = "@{arguments}" || "ease"; arg = arg.replace("[","").replace("]",""); return arg; }())`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-animation-timing-function: @processing;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-animation-timing-function: @processing;}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-animation-timing-function: @processing;}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-animation-timing-function: @processing;}
-        .inception (@signal, @arguments) when (@signal = 5) { animation-timing-function: @processing;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-    }
-
-    //  element{ .animation-timing-function(ease-in-out); }
-
-
-  //  .animation-iteration-count
-
-    .animation-iteration-count(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      @processing: ~`(function(){ var arg = "@{arguments}" || "0"; arg = arg.replace("[","").replace("]",""); return arg; }())`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-animation-iteration-count: @processing;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-animation-iteration-count: @processing;}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-animation-iteration-count: @processing;}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-animation-iteration-count: @processing;}
-        .inception (@signal, @arguments) when (@signal = 5) { animation-iteration-count: @processing;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-    }
-
-      //  element{ .animation-iteration-count(3); }
-
-
-  //  .animation-name
-
-    .animation-name(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      @processing: ~`(function(){ var arg = "@{arguments}" || "none"; arg = arg.replace("[","").replace("]",""); return arg; }())`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-animation-name: @processing;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-animation-name: @processing;}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-animation-name: @processing;}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-animation-name: @processing;}
-        .inception (@signal, @arguments) when (@signal = 5) { animation-name: @processing;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-    }
-
-      //  element{ .animation-name(myReallyCoolAnimationName); }
-
-
-  //  .animation-play-state
-
-    .animation-play-state(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      @processing: ~`(function(){ var arg = "@{arguments}" || "running"; arg = arg.replace("[","").replace("]",""); return arg; }())`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-animation-play-state: @processing;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-animation-play-state: @processing;}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-animation-play-state: @processing;}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-animation-play-state: @processing;}
-        .inception (@signal, @arguments) when (@signal = 5) { animation-play-state: @processing;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-    }
-
-      //  element{ .animation-play-state(paused); }
-
-
-//  .appearance
-
-  .appearance(@argument:none){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @argument) when (@signal = 1) { -webkit-appearance: @argument;}
-        .inception (@signal, @argument) when (@signal = 2) { -moz-appearance: @argument;}
-        .inception (@signal, @argument) when (@signal = 5) { appearance: @argument;}
-        .inception (@signal, @argument) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @argument);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .appearance(button); }
-
-
-//  .backface-visibility
-
-  .backface-visibility(@argument:visible){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @argument) when (@signal = 1) { -webkit-backface-visibility: @argument;}
-        .inception (@signal, @argument) when (@signal = 2) { -moz-backface-visibility: @argument;}
-        .inception (@signal, @argument) when (@signal = 5) { backface-visibility: @argument;}
-        .inception (@signal, @argument) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @argument);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .backface-visibility(hidden); }
-
-
-//  .background-clip
-
-  .background-clip(@arguments:border-box){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-background-clip: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-background-clip: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { background-clip: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .background-clip(padding-box); }
-
-
-//  .background-image
-
-  .background-image(...){
-
-      //  Local config for disabling properties
-
-      @svg: true; //  SVG gradient for IE9
-      @mozLocal: true; //  Firefox 4+
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5+, Android
-      @operaLocal: true; // Opera 10.5+
-      @w3cLocal: true; // Unprefixed W3C syntax
-      
-      @backgroundSVG: ~`(function(){function K(a){var b="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",c,d,e,f,g,h,i,j,k=0,l=0,m="",n=[];if(!a)return a;do c=a.charCodeAt(k++),d=a.charCodeAt(k++),e=a.charCodeAt(k++),j=c<<16|d<<8|e,f=j>>18&63,g=j>>12&63,h=j>>6&63,i=j&63,n[l++]=b.charAt(f)+b.charAt(g)+b.charAt(h)+b.charAt(i);while(k<a.length);m=n.join("");var o=a.length%3;return(o?m.slice(0,o-3):m)+"===".slice(o||3)}String.prototype.trim===undefined&&(String.prototype.trim=function(){return this.replace(/^\s+/,"").replace(/\s+$/,"")});var a="@{arguments}",b=null,c=!0,d=a.split(/,(?=\s*(?:linear|radial))/g),e=d.length,f=/top/,g=/right/,h=/bottom/,i=/left/,j=/to\s*top/,k=/to\s*right/,l=/to\s*bottom/,m=/to\s*left/,n=/45deg/,o=/-45deg/,p=/\d*deg/;for(var q=0;q<e;q++){if(/linear/.test(d[q])){d[q]=d[q].replace(/linear-gradient\s*\(/,'<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none">');if(f.test(d[q])&&!j.test(d[q])||l.test(d[q])||/180deg/.test(d[q])){var r=null;l.test(d[q])?r=l:/180deg/.test(d[q])?r=/180deg/:r=f,d[q]=d[q].replace(r,'<linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="0%" y2="100%">')}else if(g.test(d[q])&&!k.test(d[q])||m.test(d[q])||/270deg/.test(d[q])){var r=null;m.test(d[q])?r=m:/270deg/.test(d[q])?r=/270deg/:r=g,d[q]=d[q].replace(r,'<linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="100%" y1="0%" x2="0%" y2="0%">')}else if(h.test(d[q])&&!l.test(d[q])||j.test(d[q])||/[^\d]0deg/.test(d[q])){var r=null;j.test(d[q])?r=j:/0deg/.test(d[q])?r=/0deg/:r=h,d[q]=d[q].replace(r,'<linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="0%" y1="100%" x2="0%" y2="0%">')}else if(i.test(d[q])&&!m.test(d[q])||k.test(d[q])||/90deg/.test(d[q])){var r=null;k.test(d[q])?r=k:/90deg/.test(d[q])?r=/90deg/:r=i,d[q]=d[q].replace(r,'<linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="100%" y2="0%">')}else n.test(d[q])&&!o.test(d[q])?d[q]=d[q].replace(n,'<linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="0%" y1="100%" x2="100%" y2="0%">'):o.test(d[q])?d[q]=d[q].replace(o,'<linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="100%" y2="100%">'):c=!1}try{"".trim(),b=!0}catch(s){b=!1}b&&(d[q]=d[q].trim());if(/linear/.test(d[q])||/radial/.test(d[q])){d[q]=d[q].slice(0,-1),d[q]="url(data:image/svg+xml;base64--"+d[q]+'</linearGradient><rect x="0" y="0" width="1" height="1" fill="url(***)" /></svg>)';var t=d.join("@@@"),u=t.match(/rgba?\(\d+,\s*\d+,\s*\d+,\s*(?:0|1|\.\d+|0\.\d+)\)\s*\d*%*/g)||0,v=t.match(/hsla?\(\d+,\s*\d+%,\s*\d+%,\s*(?:0|1|\.\d+|0\.\d+)\)\s*\d*%*/g)||0,w=[],x=[];for(var y=0;y<u.length;y++)w[y]=u[y].replace(/,/g,"--");for(var z=0;z<v.length;z++)x[z]=v[z].replace(/,/g,"--");for(var A=0;A<u.length;A++)t=t.replace(u[A],w[A]);for(var B=0;B<v.length;B++)t=t.replace(v[B],x[B]);var C=t.split(","),D=0;for(var E=0;E<C.length;E++){C[E]=C[E].replace(/(#\w{3,6})\s*(\d*.?\d*%)?/g,'<stop offset="$2" stop-color="$1" stop-opacity="1"/>').replace(/(rgba?\(\d+--\s*\d+--\s*\d+--\s*(0|1|\.\d+|0\.\d+)\))\s*(\d*.?\d*%)*/g,'<stop offset="$3" stop-color="$1" stop-opacity="$2"/>').replace(/rgba/g,"rgb").replace(/(hsla?\(\d+--\s*\d+%--\s*\d+%--\s*(0|1|\.\d+|0\.\d+)\))\s*(\d*.?\d*%)*/g,'<stop offset="$3" stop-color="$1" stop-opacity="$2"/>').replace(/hsla/g,"hsl").replace(/((?:aqua|black|blue|fuchsia|gray|grey|green|lime|maroon|navy|olive|purple|red|silver|teal|white|yellow))\s*(\d*%)*/g,'<stop offset="$2" stop-color="$1" stop-opacity="1"/>').replace(/\*\*\*/,"#grad-ucgg-generated");try{"".trim(),b=!0}catch(s){b=!1}b&&(C[E]=C[E].trim());if(/offset=""/g.test(C[E])){var F=C.length-2,G=Math.round(100/F)*D;console.log(G);var H='offset="'+G+'%"';C[E]=C[E].replace(/offset=""/,H),D++}}C=C.toString().replace(/,/g,"").replace(/--/g,",").replace(/(rgb?\(\d+,\s*\d+,\s*\d+),\s*(?:0|1|\.\d+|0\.\d+)\)/g,"$1)").replace(/(hsl?\(\d+,\s*\d+%,\s*\d+%),\s*(?:0|1|\.\d+|0\.\d+)\)/g,"$1)")}}/radial/.test(C)&&(/((ellipse).*(center)|(circle).*(center))/g.test(C)?C=C.replace(/<\/linearGradient>/g,"</radialGradient>").replace(/radial-gradient[^<]+/g,'<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none"><radialGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" cx="50%" cy="50%" r="75%">').replace(/<rect x=\S+\d\S+ y=\S+\d\S+ width=\S+\d\S+ height=\S+\d\S+ fill=\S+\w\S+ \/>/g,'<rect x="-50" y="-50" width="101" height="101" fill="url(#grad-ucgg-generated)" />'):C=!1);var I=null;try{C=C.split("@@@");var J=0;for(J;J<C.length;J++)I=C[J].match(/<\?xml.*<\/svg>/),I=K(I.join("")),C[J]=C[J].replace(/(<\?xml.*<\/svg>)/,I)}catch(s){}return c?C:C=!1,C?C.toString():C})()`;
-      @backgroundMoz: ~`(function(){var a,b,c,d,e,f,g,h,i,j,k;a="@{arguments}",c=null,d=a.split(/,(?=\s*(?:linear|radial))/g),e=d.length,k=/to\s*top/,j=/to\s*right/,h=/to\s*bottom/,i=/to\s*left/,b=/\d*deg/,f=0;while(f<e){/linear/.test(d[f])?(d[f]=d[f].replace(/linear-gradient/,"-moz-linear-gradient"),k.test(d[f])?d[f]=d[f].replace(k,"bottom"):j.test(d[f])?d[f]=d[f].replace(j,"left"):h.test(d[f])?d[f]=d[f].replace(h,"top"):i.test(d[f])?d[f]=d[f].replace(i,"right"):b.test(d[f])&&(g=d[f].match(/\d*deg/),g=(parseInt(g)-90)*-1+"deg",d[f]=d[f].replace(b,g))):d[f]=d[f].replace(/radial-gradient/,"-moz-radial-gradient").replace(/,\s* \d*(px|%) \d*(px|%)/,", circle").replace(/\(+\s*(.*) at\s*([^,]+)/g,"($2, $1");try{"".trim(),c=!0}catch(l){c=!1}c&&(d[f]=d[f].trim()),f++}return d.toString().replace(/\[/g,"").replace(/\]/g,"")}())`;
-      @backgroundWebkit: ~`(function(){var a,b,c,d,e,f,g,h,i,j,k;a="@{arguments}",c=null,d=a.split(/,(?=\s*(?:linear|radial))/g),e=d.length,k=/to\s*top/,j=/to\s*right/,h=/to\s*bottom/,i=/to\s*left/,b=/\d*deg/,f=0;while(f<e){/linear/.test(d[f])?(d[f]=d[f].replace(/linear-gradient/,"-webkit-linear-gradient"),k.test(d[f])?d[f]=d[f].replace(k,"bottom"):j.test(d[f])?d[f]=d[f].replace(j,"left"):h.test(d[f])?d[f]=d[f].replace(h,"top"):i.test(d[f])?d[f]=d[f].replace(i,"right"):b.test(d[f])&&(g=d[f].match(/\d*deg/),g=(parseInt(g)-90)*-1+"deg",d[f]=d[f].replace(b,g))):d[f]=d[f].replace(/radial-gradient/,"-webkit-radial-gradient").replace(/\(+\s*(.*) at\s*([^,]+)/g,"($2, $1");try{"".trim(),c=!0}catch(l){c=!1}c&&(d[f]=d[f].trim()),f++}return d.toString().replace(/\[/g,"").replace(/\]/g,"");}())`;
-      @backgroundOpera: ~`(function(){var a,b,c,d,e,f,g,h,i,j,k;a="@{arguments}",c=null,d=a.split(/,(?=\s*(?:linear|radial))/g),e=d.length,k=/to\s*top/,j=/to\s*right/,h=/to\s*bottom/,i=/to\s*left/,b=/\d*deg/,f=0;while(f<e){/linear/.test(d[f])?(d[f]=d[f].replace(/linear-gradient/,"-o-linear-gradient"),k.test(d[f])?d[f]=d[f].replace(k,"bottom"):j.test(d[f])?d[f]=d[f].replace(j,"left"):h.test(d[f])?d[f]=d[f].replace(h,"top"):i.test(d[f])?d[f]=d[f].replace(i,"right"):b.test(d[f])&&(g=d[f].match(/\d*deg/),g=(parseInt(g)-90)*-1+"deg",d[f]=d[f].replace(b,g))):d[f]=d[f].replace(/radial-gradient/,"-o-radial-gradient").replace(/\(+\s*(.*) at\s*([^,]+)/g,"($2, $1");try{"".trim(),c=!0}catch(l){c=!1}c&&(d[f]=d[f].trim()),f++}return d.toString().replace(/\[/g,"").replace(/\]/g,"");})()`;
-      @backgroundW3C: ~`(function(){var a,b,c,d,e;a="@{arguments}",b=null,c=a.split(/,(?=\s*(?:linear|radial))/g),d=c.length,e=0;while(e<d){try{"".trim(),b=!0}catch(f){b=!1}b&&(c[e]=c[e].trim()),e++}return c.toString().replace(/\[/g,"").replace(/\]/g,"");}())`;
-
-      .result(@arguments, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) { background-image: @arguments; }
-      .result(@arguments, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-      .result(@arguments, @boolean, @localBoolean, @property) when (@boolean = true) and (@localBoolean = true) and (isstring(@property)) { background-image: @arguments; }
-      .result(@arguments, @boolean, @localBoolean, @property) when not (@boolean = true), not (@localBoolean = true), not (isstring(@property)) { }
-
-      .result(@backgroundSVG, @svg, @svg, @backgroundSVG);
-      // --  this comment must be here because of LESS bug
-      .result(@backgroundMoz, @moz, @mozLocal);
-      // --
-      .result(@backgroundWebkit, @webkit, @webkitLocal);
-      // --
-      .result(@backgroundOpera, @opera, @operaLocal);
-      // --
-      .result(@backgroundW3C, @w3c, @w3cLocal);
-  }
-
-   //  element{ .background-image(linear-gradient(to bottom, #ffffff, #929292)); }
-
-
-//  .background-origin
-
-  .background-origin(@arguments:padding-box){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-background-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-background-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { background-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .background-origin(content-box); }
-
-
-//  .background-size
-
-  .background-size(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      @processing: ~`(function(){ var arg = "@{arguments}".replace("[","").replace("]","") || "none"; if( !/^\w*%?([ X])/.test(arg) ) { arg = arg.replace(/,/g,"") } return arg; })()`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-background-size: @processing;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-background-size: @processing;}
-        .inception (@signal, @arguments) when (@signal = 5) { background-size: @processing;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-   //   element{ .background-size(50% auto); }
-
-
-// .border-radius
-
-  .border-radius(@arguments:0) {
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-border-radius: @arguments; -webkit-background-clip: padding-box;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-border-radius: @arguments; -moz-background-clip: padding;}
-        .inception (@signal, @arguments) when (@signal = 5) { border-radius: @arguments; background-clip: padding-box; }
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .border-radius(10px); } //  all corner rounded
-    //  element{ .border-radius(~"10px / 20px"); } //  NEED TO BE ESCAPED OR LESS DEVIDE IT! Horizontal and vertical rounded differently
-    //  element{ .border-radius(0 10px 0 0); } // only top right corner rounded
-
-
-// .border-top-left-radius
-
-  .border-top-left-radius(@arguments:0) {
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-border-top-left-radius: @arguments; -webkit-background-clip: padding-box;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-border-radius-topleft: @arguments; -moz-background-clip: padding;}
-        .inception (@signal, @arguments) when (@signal = 5) { border-top-left-radius: @arguments; background-clip: padding-box; }
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .border-top-left-radius(10px); }
-
-
-// .border-top-right-radius
-
-  .border-top-right-radius(@arguments:0) {
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-border-top-right-radius: @arguments; -webkit-background-clip: padding-box;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-border-radius-topright: @arguments; -moz-background-clip: padding;}
-        .inception (@signal, @arguments) when (@signal = 5) { border-top-right-radius: @arguments; background-clip: padding-box; }
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .border-top-right-radius(10px); }
-
-
-// .border-bottom-left-radius
-
-  .border-bottom-left-radius(@arguments:0) {
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-border-bottom-left-radius: @arguments; -webkit-background-clip: padding-box;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-border-radius-bottomleft: @arguments; -moz-background-clip: padding;}
-        .inception (@signal, @arguments) when (@signal = 5) { border-bottom-left-radius: @arguments; background-clip: padding-box; }
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .border-bottom-left-radius(10px); }
-
-
-// .border-bottom-right-radius
-
-  .border-bottom-right-radius(@arguments:0) {
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-border-bottom-right-radius: @arguments; -webkit-background-clip: padding-box;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-border-radius-bottomright: @arguments; -moz-background-clip: padding;}
-        .inception (@signal, @arguments) when (@signal = 5) { border-bottom-right-radius: @arguments; background-clip: padding-box; }
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .border-bottom-right-radius(10px); }
-
-
-// .border-image
-
-  .border-image(@arguments:none){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-border-image: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-border-image: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-border-image: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { border-image: @arguments; }
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .border-image(url(border.png) 30 30 round); }
-
-
-//  .box-shadow
-
-  .box-shadow(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      @processing: ~`(function(){ var arg = "@{arguments}".replace("[","").replace("]","") || "none"; if( !/^#?\w*%?([ X])/.test(arg) ) { arg = arg.replace(/,(?=[^()]*\))/g,'--').replace(/,/g,"").replace(/--/g,','); } return arg; })()`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-box-shadow: @processing;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-box-shadow: @processing;}
-        .inception (@signal, @arguments) when (@signal = 5) { box-shadow: @processing;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-
-      color: @arguments;
-  }
-
-   //   element{ .box-shadow(0 1px 10px rgba(20,20,20,0.5), 0 1px 10px rgba(20,20,20,0.5)); }
-
-
-//  .box-sizing
-
-  .box-sizing(@arguments:content-box){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-box-sizing: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-box-sizing: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { box-sizing: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .box-sizing(border-box); }
-
-
-//  .columns
-
-  .columns(@arguments:auto auto){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-columns: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-columns: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { columns: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .columns(100px 3); }
-
-
-//  .column-count
-
-  .column-count(@arguments:auto){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-column-count: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-column-count: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { column-count: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .column-count(3); }
-
-
-//  .column-gap
-
-  .column-gap(@arguments:normal){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-column-gap: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-column-gap: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { column-gap: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .column-gap(40px); }
-
-
-//  .column-rule
-
-  .column-rule(@arguments:medium none black){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-column-rule: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-column-rule: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { column-rule: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .column-rule(3px outset #ff00ff); }
-
-
-//  .column-width
-
-  .column-width(@arguments:auto){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-column-width: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-column-width: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { column-width: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .column-width(100px); }
-
-
-//  .font-face
-
-  .font-face(@fontname, @fontfile) {
-
-    font-family: "@{fontname}";
-    src: url("@{fontfile}-webfont.eot");
-    src: url("@{fontfile}-webfont.eot?#iefix") format("embedded-opentype"),
-         url("@{fontfile}-webfont.woff") format("woff"),
-         url("@{fontfile}-webfont.ttf") format("truetype"),
-         url("@{fontfile}-webfont.svg#@{fontname}") format("svg");
-    font-weight: normal;
-    font-style: normal;
-  }
-
-    //  element{  .font-face(ZendaRegular, zenda-webfont); }
-
-
-//  .opacity
-
-  .opacity(@arguments:1){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-opacity: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-opacity: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { opacity: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .opacity(.5); }
-
-
-//  .perspective
-
-  .perspective(@arguments:none){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-perspective: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-perspective: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { perspective: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .perspective(350px); }
-
-
-//  .perspective-origin
-
-  .perspective-origin(@arguments:50% 50%){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-perspective-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-perspective-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { perspective-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .perspective-origin(top left); }
-
-
-//  .size
-
-  .size(@square){
-    width: @square;
-    height: @square;
-  }
-
-  .size(@width, @height){
-    width: @width;
-    height: @height;
-  }
-
-    //  element{ .size(10px); } // render width:10px; height:10px;
-    //  element{ .size(10px, 20px); } // render width:10px; height: 20px;
-
-
-//  .transform
-
-  .transform(@arguments:none, ...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .transform(scale(.5) translate(10px, 20px)); }
-
-
-//  .transform-origin
-
-  .transform-origin(@arguments:50% 50% 0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { transform-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .transform-origin(20% 40%); }
-
-
-//  .transform-style
-
-  .transform-style(@arguments:flat){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal = 5) { transform-origin: @arguments;}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .transform-style(preserve-3d); }
-
-
-//  .translate
-
-  .translate(@x:0, @y:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: translate(@x, @y);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: translate(@x, @y);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: translate(@x, @y);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: translate(@x, @y);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: translate(@x, @y);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{  .translate(100px);  }
-    //  element{  .translate(100px, 50px);  }
-
-
-//  .translate3d
-
-  .translate3d(@x:0, @y:0, @z:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: translate3d(@x, @y, @z);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: translate3d(@x, @y, @z);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: translate3d(@x, @y, @z);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: translate3d(@x, @y, @z);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: translate3d(@x, @y, @z);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .translate3d(10px, 20px, 30px); }
-
-
-//  .translateX
-
-  .translateX(@x:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: translateX(@x);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: translateX(@x);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: translateX(@x);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: translateX(@x);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: translateX(@x);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .translateX(10px); }
-
-
-//  .translateY
-
-  .translateY(@y:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: translateY(@y);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: translateY(@y);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: translateY(@y);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: translateY(@y);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: translateY(@y);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .translateY(15px); }
-
-
-//  .translateZ
-
-  .translateZ(@z:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: translateZ(@z);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: translateZ(@z);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: translateZ(@z);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: translateZ(@z);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: translateZ(@z);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .translateZ(32px); }
-
-
-//  .scale
-
-    .scale(@x:1){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: scale(@x);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: scale(@x);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: scale(@x);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: scale(@x);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: scale(@x);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-  .scale(@x, @y){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: scale(@x, @y);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: scale(@x, @y);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: scale(@x, @y);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: scale(@x, @y);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: scale(@x, @y);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-      //  element{ .scale(2); }
-      //  element{ .scale(2, 1); }
-
-
-//  .scale3d
-
-    .scale3d(@x:1, @y:1, @z:1){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: scale3d(@x, @y, @z);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: scale3d(@x, @y, @z);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: scale3d(@x, @y, @z);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: scale3d(@x, @y, @z);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: scale3d(@x, @y, @z);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-      //  element{ .scale3d(1, 2, 1); }
-
-
-//  .scaleX
-
-    .scaleX(@x:1){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: scaleX(@x);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: scaleX(@x);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: scaleX(@x);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: scaleX(@x);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: scaleX(@x);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-      //  element{ .scaleX(1.5); }
-
-
-//  .scaleY
-
-    .scaleY(@y:1){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: scaleX(@y);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: scaleX(@y);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: scaleX(@y);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: scaleX(@y);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: scaleX(@y);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-      //  element{ .scaleX(1.5); }
-
-
-//  .scaleZ
-
-    .scaleZ(@z:1){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: scaleZ(@z);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: scaleZ(@z);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: scaleZ(@z);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: scaleZ(@z);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: scaleZ(@z);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-      //  element{ .scaleZ(2.7); }
-
-
-//  .rotate
-
-  .rotate(@angle:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: rotate(@angle);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: rotate(@angle);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: rotate(@angle);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: rotate(@angle);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: rotate(@angle);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .rotate(45deg); }
-
-
-//  .rotate3d
-
-  .rotate3d(@x:0, @y:0, @z: 0, @angle:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: rotate3d(@x, @y, @z, @angle);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: rotate3d(@x, @y, @z, @angle);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: rotate3d(@x, @y, @z, @angle);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: rotate3d(@x, @y, @z, @angle);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: rotate3d(@x, @y, @z, @angle);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .rotate3d(1, 2.0, 3.0, 10deg); }
-
-
-//  .rotateX
-
-  .rotateX(@angle:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: rotateX(@angle);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: rotateX(@angle);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: rotateX(@angle);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: rotateX(@angle);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: rotateX(@angle);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .rotateX(63deg); }
-
-
-//  .rotateY
-
-  .rotateY(@angle:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: rotateY(@angle);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: rotateY(@angle);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: rotateY(@angle);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: rotateY(@angle);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: rotateY(@angle);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .rotateY(24deg); }
-
-
-//  .rotateZ
-
-  .rotateZ(@angle:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: rotateZ(@angle);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: rotateZ(@angle);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: rotateZ(@angle);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: rotateZ(@angle);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: rotateZ(@angle);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .rotateZ(280deg); }
-
-
-//  .skew
-
-  .skew(@angle:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: skew(@angle);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: skew(@angle);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: skew(@angle);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: skew(@angle);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: skew(@angle);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .skew(20deg); }
-
-
-//  .skewX
-
-  .skewX(@angle:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: skewX(@angle);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: skewX(@angle);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: skewX(@angle);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: skewX(@angle);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: skewX(@angle);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .skewX(24deg); }
-
-
-//  .skewY
-
-  .skewY(@angle:0){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transform: skewY(@angle);}
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transform: skewY(@angle);}
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transform: skewY(@angle);}
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transform: skewY(@angle);}
-        .inception (@signal, @arguments) when (@signal = 5) { transform: skewY(@angle);}
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .skewY(36deg); }
-
-
-//  .transition
-
-  .transition(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      @transitionWebkit: ~`(function(){var a,b,c,d,e,f,g;a="@{arguments}".split(","),c=["background-size","border-","box-shadow","column","transform"],d=c.length,e=a,f=!1,b=a.length;for(var h=0;h<d;h++)for(var i=0;i<b;i++){g=new RegExp(c[h],"g");try{"".trim(),f=!0}catch(j){f=!1}a[i]=f?a[i].trim():a[i],g.test(a[i])&&(e[i]=a[i].replace(g,"-webkit-"+c[h]))}return e.join(", ").replace("[","").replace("]","");}())`;
-      @transitionMoz: ~`(function(){var a,b,c,d,e,f,g;a="@{arguments}".split(","),c=["background-size","border-","box-shadow","column","transform"],d=c.length,e=a,f=!1,b=a.length;for(var h=0;h<d;h++)for(var i=0;i<b;i++){g=new RegExp(c[h],"g");try{"".trim(),f=!0}catch(j){f=!1}a[i]=f?a[i].trim():a[i],g.test(a[i])&&(e[i]=a[i].replace(g,"-moz-"+c[h]))}return e.join(", ").replace("[","").replace("]","");}())`;
-      @transitionOpera: ~`(function(){var a,b,c,d,e,f,g;a="@{arguments}".split(","),c=["transform"],d=c.length,e=a,f=!1,b=a.length;for(var h=0;h<d;h++)for(var i=0;i<b;i++){g=new RegExp(c[h],"g");try{"".trim(),f=!0}catch(j){f=!1}a[i]=f?a[i].trim():a[i],g.test(a[i])&&(e[i]=a[i].replace(g,"-o-"+c[h]))}return e.join(", ").replace("[","").replace("]","");}())`;
-      @transitionMs: ~`(function(){var a,b,c,d,e,f,g;a="@{arguments}".split(","),c=["transform"],d=c.length,e=a,f=!1,b=a.length;for(var h=0;h<d;h++)for(var i=0;i<b;i++){g=new RegExp(c[h],"g");try{"".trim(),f=!0}catch(j){f=!1}a[i]=f?a[i].trim():a[i],g.test(a[i])&&(e[i]=a[i].replace(g,"-ms-"+c[h]))}return e.join(", ").replace("[","").replace("]","");}())`;
-      @transitionW3C: ~`(function(){var a,b,c;a="@{arguments}".split(","),c=!1,b=a.length;for(var d=0;d<b;d++){try{"".trim(),c=!0}catch(e){c=!1}a[d]=c?a[d].trim():a[d]}return a.join(", ").replace("[","").replace("]","");}())`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transition: ~`(function(){ var arg = "@{transitionWebkit}" || "all 0 ease 0"; if( !/^\w*([ X])/.test(arg) ) { arg = arg.replace(/,/g,"") } return arg; })()`; }
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transition: ~`(function(){ var arg = "@{transitionMoz}" || "all 0 ease 0"; if( !/^\w*([ X])/.test(arg) ) { arg = arg.replace(/,/g,"") } return arg; })()`; }
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transition:~`(function(){ var arg = "@{transitionOpera}" || "all 0 ease 0"; if( !/^\w*([ X])/.test(arg) ) { arg = arg.replace(/,/g,"") } return arg; })()`; }
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transition: ~`(function(){ var arg = "@{transitionMs}" || "all 0 ease 0"; if( !/^\w*([ X])/.test(arg) ) { arg = arg.replace(/,/g,"") } return arg; })()`; }
-        .inception (@signal, @arguments) when (@signal = 5) { transition: ~`(function(){ var arg = "@{transitionW3C}" || "all 0 ease 0"; if( !/^\w*([ X])/.test(arg) ) { arg = arg.replace(/,/g,"") } return arg; })()`; }
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-  //   element{ .transition(transform 3s linear); }
-
-
-//  .transition-property
-
-  .transition-property(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      @transitionWebkit: ~`(function(){var a,b,c,d,e,f,g;a="@{arguments}".split(","),c=["background-size","border-","box-shadow","column","transform"],d=c.length,e=a,f=!1,b=a.length;for(var h=0;h<d;h++)for(var i=0;i<b;i++){g=new RegExp(c[h],"g");try{"".trim(),f=!0}catch(j){f=!1}a[i]=f?a[i].trim():a[i],g.test(a[i])&&(e[i]=a[i].replace(g,"-webkit-"+c[h]))}return e.join(", ").replace("[","").replace("]","");}())`;
-      @transitionMoz: ~`(function(){var a,b,c,d,e,f,g;a="@{arguments}".split(","),c=["background-size","border-","box-shadow","column","transform"],d=c.length,e=a,f=!1,b=a.length;for(var h=0;h<d;h++)for(var i=0;i<b;i++){g=new RegExp(c[h],"g");try{"".trim(),f=!0}catch(j){f=!1}a[i]=f?a[i].trim():a[i],g.test(a[i])&&(e[i]=a[i].replace(g,"-moz-"+c[h]))}return e.join(", ").replace("[","").replace("]","");}())`;
-      @transitionOpera: ~`(function(){var a,b,c,d,e,f,g;a="@{arguments}".split(","),c=["transform"],d=c.length,e=a,f=!1,b=a.length;for(var h=0;h<d;h++)for(var i=0;i<b;i++){g=new RegExp(c[h],"g");try{"".trim(),f=!0}catch(j){f=!1}a[i]=f?a[i].trim():a[i],g.test(a[i])&&(e[i]=a[i].replace(g,"-o-"+c[h]))}return e.join(", ").replace("[","").replace("]","");}())`;
-      @transitionMs: ~`(function(){var a,b,c,d,e,f,g;a="@{arguments}".split(","),c=["transform"],d=c.length,e=a,f=!1,b=a.length;for(var h=0;h<d;h++)for(var i=0;i<b;i++){g=new RegExp(c[h],"g");try{"".trim(),f=!0}catch(j){f=!1}a[i]=f?a[i].trim():a[i],g.test(a[i])&&(e[i]=a[i].replace(g,"-ms-"+c[h]))}return e.join(", ").replace("[","").replace("]","");}())`;
-      @transitionW3C: ~`(function(){var a,b,c;a="@{arguments}".split(","),c=!1,b=a.length;for(var d=0;d<b;d++){try{"".trim(),c=!0}catch(e){c=!1}a[d]=c?a[d].trim():a[d]}return a.join(", ").replace("[","").replace("]","");}())`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transition-property: ~`(function(){ var arg = "@{transitionWebkit}" || "0"; var decision = false; try{ var hasComma = arg.match(/([^ ,][a-z0-9-]*)/g); if (hasComma.length < 2) { decision = true; } } catch (e) {} if (decision === true) arg = hasComma.join(" ").replace(/,/g,""); return arg; }())`; }
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transition-property: ~`(function(){ var arg = "@{transitionMoz}" || "0"; var decision = false; try{ var hasComma = arg.match(/([^ ,][a-z0-9-]*)/g); if (hasComma.length < 2) { decision = true; } } catch (e) {} if (decision === true) arg = hasComma.join(" ").replace(/,/g,""); return arg; }())`; }
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transition-property: ~`(function(){ var arg = "@{transitionOpera}" || "0"; var decision = false; try{ var hasComma = arg.match(/([^ ,][a-z0-9-]*)/g); if (hasComma.length < 2) { decision = true; } } catch (e) {} if (decision === true) arg = hasComma.join(" ").replace(/,/g,""); return arg; }())`; }
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-transition-property: ~`(function(){ var arg = "@{transitionMs}" || "0"; var decision = false; try{ var hasComma = arg.match(/([^ ,][a-z0-9-]*)/g); if (hasComma.length < 2) { decision = true; } } catch (e) {} if (decision === true) arg = hasComma.join(" ").replace(/,/g,""); return arg; }())`; }
-        .inception (@signal, @arguments) when (@signal = 5) { transition-property: ~`(function(){ var arg = "@{transitionW3C}" || "0"; var decision = false; try{ var hasComma = arg.match(/([^ ,][a-z0-9-]*)/g); if (hasComma.length < 2) { decision = true; } } catch (e) {} if (decision === true) arg = hasComma.join(" ").replace(/,/g,""); return arg; }())`; }
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-  //    element{ .transition-property(width, height); }
-
-
-//  .transition-duration
-
-  .transition-duration(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      @processing: ~`(function(){ var arg = "@{arguments}" || "0"; try{ var hasComma = arg.match(/,/g).length > 1 ? true : false; } catch (e) {} if (hasComma === true) arg = arg.replace(/,/g,""); arg = arg.replace("[","").replace("]",""); return arg; }())`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transition-duration: @processing; }
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transition-duration: @processing; }
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transition-duration: @processing; }
-        .inception (@signal, @arguments) when (@signal = 5) { transition-duration: @processing; }
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-   //   element{ .transition-duration(250ms); }
-
-
-//  .transition-timing-function
-
-  .transition-timing-function(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-      @processing: ~`(function(){ var arg = "@{arguments}" || "ease"; arg = arg.replace("[","").replace("]",""); return arg; }())`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transition-timing-function: @processing; }
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transition-timing-function: @processing; }
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transition-timing-function: @processing; }
-        .inception (@signal, @arguments) when (@signal = 5) { transition-timing-function: @processing; }
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-   //   element{ .transition-timing-function(cubic-bezier(0,0,1,1)); }
-
-
-//  .transition-delay
-
-  .transition-delay(...){
-
-      //  Local config for disabling properties
-
-      @w3cLocal: true; // Unprefixed W3C syntax
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @operaLocal: true; // Opera 10.5+
-      @msLocal: true;  // IE 10+
-
-       @processing: ~`(function(){ var arg = "@{arguments}" || "0"; arg = arg.replace("[","").replace("]",""); return arg; }())`;
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-transition-delay: @processing; }
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-transition-delay: @processing; }
-        .inception (@signal, @arguments) when (@signal = 3) { -o-transition-delay: @processing; }
-        .inception (@signal, @arguments) when (@signal = 5) { transition-delay: @processing; }
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @operaSignal, @opera, @operaLocal);
-      // --
-      .result(@arguments, @w3cSignal, @w3c, @w3cLocal);
-  }
-
-    //  element{ .transition-delay(2s); }
-
-
-//  .user-select
-
-  .user-select(@arguments:auto){
-
-      //  Local config for disabling properties
-
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @mozLocal: true; //  Firefox 4+
-      @msLocal: true;  // IE 10+
-
-      .result (@arguments, @signal, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) {
-        .inception (@signal, @arguments) when (@signal = 1) { -webkit-user-select: @arguments; }
-        .inception (@signal, @arguments) when (@signal = 2) { -moz-user-select: @arguments; }
-        .inception (@signal, @arguments) when (@signal = 4) { -ms-user-select: @arguments; }
-        .inception (@signal, @arguments) when (@signal > 5),(@signal < 1) { error: "Signal is out of range"; }
-        .inception(@signal, @arguments);
-      }
-      .result (@arguments, @signal, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-
-      .result(@arguments, @webkitSignal, @webkit, @webkitLocal);
-      // --  this comment must be here because of LESS bug
-      .result(@arguments, @mozSignal, @moz, @mozLocal);
-      // --
-      .result(@arguments, @msSignal, @ms, @msLocal);
-  }
-
-   //   element{ .user-select(text); }
-
-
-//  DEPRECATED mixins (must be supported because of old version of CSS Hat)
-
-  //  .gradient (renamed background-image)
-
-  .gradient(...){
-
-      //  Local config for disabling properties
-
-      @svg: true; //  SVG gradient for IE9
-      @mozLocal: true; //  Firefox 4+
-      @webkitLocal: true; // Chrome 7+, Safari 5+, iOS5, Android
-      @operaLocal: true; // Opera 10.5+
-      @w3cLocal: true; // Unprefixed W3C syntax
-      
-      @backgroundSVG: ~`(function(){function G(a){var b="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",c,d,e,f,g,h,i,j,k=0,l=0,m="",n=[];if(!a)return a;do c=a.charCodeAt(k++),d=a.charCodeAt(k++),e=a.charCodeAt(k++),j=c<<16|d<<8|e,f=j>>18&63,g=j>>12&63,h=j>>6&63,i=j&63,n[l++]=b.charAt(f)+b.charAt(g)+b.charAt(h)+b.charAt(i);while(k<a.length);m=n.join("");var o=a.length%3;return(o?m.slice(0,o-3):m)+"===".slice(o||3)}var a="@{arguments}",b=null,c=!0,d=a.split(/,(?=\s*(?:linear|radial))/g),e=d.length,f=/top/,g=/right/,h=/bottom/,i=/left/,j=/to\s*top/,k=/to\s*right/,l=/to\s*bottom/,m=/to\s*left/,n=/45deg/,o=/-45deg/,p=/\d*deg/;for(var q=0;q<e;q++){if(/linear/.test(d[q])){d[q]=d[q].replace(/linear-gradient\s*\(/,'<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none">');if(f.test(d[q])&&!j.test(d[q])||l.test(d[q])||/180deg/.test(d[q])){var r=null;l.test(d[q])?r=l:/180deg/.test(d[q])?r=/180deg/:r=f,d[q]=d[q].replace(r,'<linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="0%" y2="100%">')}else if(g.test(d[q])&&!k.test(d[q])||m.test(d[q])||/270deg/.test(d[q])){var r=null;m.test(d[q])?r=m:/270deg/.test(d[q])?r=/270deg/:r=g,d[q]=d[q].replace(r,'<linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="100%" y1="0%" x2="0%" y2="0%">')}else if(h.test(d[q])&&!l.test(d[q])||j.test(d[q])||/[^\d]0deg/.test(d[q])){var r=null;j.test(d[q])?r=j:/0deg/.test(d[q])?r=/0deg/:r=h,d[q]=d[q].replace(r,'<linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="0%" y1="100%" x2="0%" y2="0%">')}else if(i.test(d[q])&&!m.test(d[q])||k.test(d[q])||/90deg/.test(d[q])){var r=null;k.test(d[q])?r=k:/90deg/.test(d[q])?r=/90deg/:r=i,d[q]=d[q].replace(r,'<linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="100%" y2="0%">')}else n.test(d[q])&&!o.test(d[q])?d[q]=d[q].replace(n,'<linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="0%" y1="100%" x2="100%" y2="0%">'):o.test(d[q])?d[q]=d[q].replace(o,'<linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="100%" y2="100%">'):c=!1}try{"".trim(),b=!0}catch(s){b=!1}b&&(d[q]=d[q].trim());if(/linear/.test(d[q])||/radial/.test(d[q])){d[q]=d[q].slice(0,-1),d[q]="url(data:image/svg+xml;base64--"+d[q]+'</linearGradient><rect x="0" y="0" width="1" height="1" fill="url(***)" /></svg>)';var t=d.join("@@@"),u=t.match(/rgba?\(\d+,\s*\d+,\s*\d+,\s*(?:0|1|\.\d+|0\.\d+)\)\s*\d*%*/g)||0,v=t.match(/hsla?\(\d+,\s*\d+%,\s*\d+%,\s*(?:0|1|\.\d+|0\.\d+)\)\s*\d*%*/g)||0,w=[],x=[];for(var y=0;y<u.length;y++)w[y]=u[y].replace(/,/g,"--");for(var z=0;z<v.length;z++)x[z]=v[z].replace(/,/g,"--");for(var A=0;A<u.length;A++)t=t.replace(u[A],w[A]);for(var B=0;B<v.length;B++)t=t.replace(v[B],x[B]);var C=t.split(",");for(var D=0;D<C.length;D++){C[D]=C[D].replace(/(#\w{3,6})\s*(\d*%*)/g,'<stop offset="$2" stop-color="$1" stop-opacity="1"/>').replace(/(rgba?\(\d+--\s*\d+--\s*\d+--\s*(0|1|\.\d+|0\.\d+)\))\s*(\d*%)*/g,'<stop offset="$3" stop-color="$1" stop-opacity="$2"/>').replace(/rgba/g,"rgb").replace(/(hsla?\(\d+--\s*\d+%--\s*\d+%--\s*(0|1|\.\d+|0\.\d+)\))\s*(\d*%)*/g,'<stop offset="$3" stop-color="$1" stop-opacity="$2"/>').replace(/hsla/g,"hsl").replace(/((?:aqua|black|blue|fuchsia|gray|grey|green|lime|maroon|navy|olive|purple|red|silver|teal|white|yellow))\s*(\d*%)*/g,'<stop offset="$2" stop-color="$1" stop-opacity="1"/>').replace(/\*\*\*/,"#grad-ucgg-generated");try{"".trim(),b=!0}catch(s){b=!1}b&&(C[D]=C[D].trim())}C=C.toString().replace(/,/g,"").replace(/--/g,",").replace(/(rgb?\(\d+,\s*\d+,\s*\d+),\s*(?:0|1|\.\d+|0\.\d+)\)/g,"$1)").replace(/(hsl?\(\d+,\s*\d+%,\s*\d+%),\s*(?:0|1|\.\d+|0\.\d+)\)/g,"$1)")}}/radial/.test(C)&&(/((ellipse).*(center)|(circle).*(center))/g.test(C)?C=C.replace(/<\/linearGradient>/g,"</radialGradient>").replace(/radial-gradient[^<]+/g,'<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none"><radialGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" cx="50%" cy="50%" r="75%">').replace(/<rect x=\S+\d\S+ y=\S+\d\S+ width=\S+\d\S+ height=\S+\d\S+ fill=\S+\w\S+ \/>/g,'<rect x="-50" y="-50" width="101" height="101" fill="url(#grad-ucgg-generated)" />'):C=!1);var E=null;try{C=C.split("@@@");var F=0;for(F;F<C.length;F++)E=C[F].match(/<\?xml.*<\/svg>/),E=G(E.join("")),C[F]=C[F].replace(/(<\?xml.*<\/svg>)/,E)}catch(s){}return c?C:C=!1,C?C.toString().replace(/\[/g,"").replace(/\]/g,""):C}())`;
-      @backgroundMoz: ~`(function(){var a,b,c,d,e,f,g,h,i,j,k;a="@{arguments}",c=null,d=a.split(/,(?=\s*(?:linear|radial))/g),e=d.length,k=/to\s*top/,j=/to\s*right/,h=/to\s*bottom/,i=/to\s*left/,b=/\d*deg/,f=0;while(f<e){/linear/.test(d[f])?(d[f]=d[f].replace(/linear-gradient/,"-moz-linear-gradient"),k.test(d[f])?d[f]=d[f].replace(k,"bottom"):j.test(d[f])?d[f]=d[f].replace(j,"left"):h.test(d[f])?d[f]=d[f].replace(h,"top"):i.test(d[f])?d[f]=d[f].replace(i,"right"):b.test(d[f])&&(g=d[f].match(/\d*deg/),g=(parseInt(g)-90)*-1+"deg",d[f]=d[f].replace(b,g))):d[f]=d[f].replace(/radial-gradient/,"-moz-radial-gradient").replace(/,\s* \d*(px|%) \d*(px|%)/,", circle").replace(/\(+\s*(.*) at\s*([^,]+)/g,"($2, $1");try{"".trim(),c=!0}catch(l){c=!1}c&&(d[f]=d[f].trim()),f++}return d.toString().replace(/\[/g,"").replace(/\]/g,"");}())`;
-      @backgroundWebkit: ~`(function(){var a,b,c,d,e,f,g,h,i,j,k;a="@{arguments}",c=null,d=a.split(/,(?=\s*(?:linear|radial))/g),e=d.length,k=/to\s*top/,j=/to\s*right/,h=/to\s*bottom/,i=/to\s*left/,b=/\d*deg/,f=0;while(f<e){/linear/.test(d[f])?(d[f]=d[f].replace(/linear-gradient/,"-webkit-linear-gradient"),k.test(d[f])?d[f]=d[f].replace(k,"bottom"):j.test(d[f])?d[f]=d[f].replace(j,"left"):h.test(d[f])?d[f]=d[f].replace(h,"top"):i.test(d[f])?d[f]=d[f].replace(i,"right"):b.test(d[f])&&(g=d[f].match(/\d*deg/),g=(parseInt(g)-90)*-1+"deg",d[f]=d[f].replace(b,g))):d[f]=d[f].replace(/radial-gradient/,"-webkit-radial-gradient").replace(/\(+\s*(.*) at\s*([^,]+)/g,"($2, $1");try{"".trim(),c=!0}catch(l){c=!1}c&&(d[f]=d[f].trim()),f++}return d.toString().replace(/\[/g,"").replace(/\]/g,"");}())`;
-      @backgroundOpera: ~`(function(){var a,b,c,d,e,f,g,h,i,j,k;a="@{arguments}",c=null,d=a.split(/,(?=\s*(?:linear|radial))/g),e=d.length,k=/to\s*top/,j=/to\s*right/,h=/to\s*bottom/,i=/to\s*left/,b=/\d*deg/,f=0;while(f<e){/linear/.test(d[f])?(d[f]=d[f].replace(/linear-gradient/,"-o-linear-gradient"),k.test(d[f])?d[f]=d[f].replace(k,"bottom"):j.test(d[f])?d[f]=d[f].replace(j,"left"):h.test(d[f])?d[f]=d[f].replace(h,"top"):i.test(d[f])?d[f]=d[f].replace(i,"right"):b.test(d[f])&&(g=d[f].match(/\d*deg/),g=(parseInt(g)-90)*-1+"deg",d[f]=d[f].replace(b,g))):d[f]=d[f].replace(/radial-gradient/,"-o-radial-gradient").replace(/\(+\s*(.*) at\s*([^,]+)/g,"($2, $1");try{"".trim(),c=!0}catch(l){c=!1}c&&(d[f]=d[f].trim()),f++}return d.toString().replace(/\[/g,"").replace(/\]/g,"");})()`;
-      @backgroundW3C: ~`(function(){var a,b,c,d,e;a="@{arguments}",b=null,c=a.split(/,(?=\s*(?:linear|radial))/g),d=c.length,e=0;while(e<d){try{"".trim(),b=!0}catch(f){b=!1}b&&(c[e]=c[e].trim()),e++}return c.toString().replace(/\[/g,"").replace(/\]/g,"");}())`;
-
-      .result(@arguments, @boolean, @localBoolean) when (@boolean = true) and (@localBoolean = true) { background-image: @arguments; }
-      .result(@arguments, @boolean, @localBoolean) when not (@boolean = true), not (@localBoolean = true) { }
-      .result(@arguments, @boolean, @localBoolean, @property) when (@boolean = true) and (@localBoolean = true) and (isstring(@property)) { background-image: @arguments; }
-      .result(@arguments, @boolean, @localBoolean, @property) when not (@boolean = true), not (@localBoolean = true), not (isstring(@property)) { }
-
-      .result(@backgroundSVG, @svg, @svg, @backgroundSVG);
-      // --  this comment must be here because of LESS bug
-      .result(@backgroundMoz, @moz, @mozLocal);
-      // --
-      .result(@backgroundWebkit, @webkit, @webkitLocal);
-      // --
-      .result(@backgroundOpera, @opera, @operaLocal);
-      // --
-      .result(@backgroundW3C, @w3c, @w3cLocal);
-  }
-
-    //  element{ .gradient(~"linear-gradient(to right, #1e5799 0%,#2989d8 50%,#207cca 51%,#7db9e8 100%)"); }
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin/pane_hover.less b/app/assets/stylesheets/admin/pane_hover.less
deleted file mode 100644
index 6d20ec1..0000000
--- a/app/assets/stylesheets/admin/pane_hover.less
+++ /dev/null
@@ -1,58 +0,0 @@
-
-/* pane_hover */
-#qi_pane_hover{
-	position:fixed;
-	top:20px;
-	left:0px;
-	bottom:0px;
-	right:0px;
-
-
-	
-	
-}
-
-#qi_pane_hover #qi_pane_hover_content{
-	margin:auto;
-	position:relative;
-
-	background:white;
-	background: -webkit-gradient(linear, 0% 100%, 0% 0%, from(rgb(239,242,242)), to(rgb(255,255,255)));
-	background: -moz-linear-gradient(0% 100%, 0% 0%, from(rgb(239,242,242)), to(rgb(255,255,255)));
-	-webkit-box-shadow: rgba(0,0,0,0.8) 1px 1px 50px;
-	-moz-box-shadow: rgba(0,0,0,0.8) 1px 1px 50px;
-	box-shadow:  rgba(0,0,0,0.8) 1px 1px 50px;
-	
-
-	
-
-	display:none;
-	
-}
-
-#qi_pane_hover #qi_pane_hover_content .content{
-
-	position:absolute;
-	top:0px;
-	right:0px;
-	left:0px;
-	bottom:37px;
-	overflow:auto;
-	padding:10px;
-
-	
-}
-
-
-#qi_pane_hover #qi_pane_hover_content .actions{
-	position:absolute;
-	bottom:0px;
-	left:0px;
-	right:0px;
-	text-align:right;
-	padding-bottom:5px;
-	padding-top : 5px;
-	border-top :1px solid rgba(127,127,127,0.2);
-	height:26px;
-	
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/jquery.bxslider.css b/app/assets/stylesheets/jquery.bxslider.css
new file mode 100644
index 0000000..868f0de
--- /dev/null
+++ b/app/assets/stylesheets/jquery.bxslider.css
@@ -0,0 +1,213 @@
+/**
+ * BxSlider v4.1.2 - Fully loaded, responsive content slider
+ * http://bxslider.com
+ *
+ * Written by: Steven Wanderski, 2014
+ * http://stevenwanderski.com
+ * (while drinking Belgian ales and listening to jazz)
+ *
+ * CEO and founder of bxCreative, LTD
+ * http://bxcreative.com
+ */
+
+
+/** RESET AND LAYOUT
+===================================*/
+
+.bx-wrapper {
+	position: relative;
+	margin: 0 auto ;
+	padding: 0;
+	*zoom: 1;
+}
+
+.bx-wrapper img {
+	max-width: 100%;
+	display: block;
+}
+
+/** THEME
+===================================*/
+.bxslider li img{
+  min-width:100%;
+  
+}
+.bx-wrapper .bx-viewport {
+  img{
+    margin:0;
+  }
+	ul{
+   margin:0;
+   padding:0; 
+  }
+	background: black;
+  
+	
+	/*fix other elements on the page moving (on Chrome)*/
+	-webkit-transform: translatez(0);
+	-moz-transform: translatez(0);
+    	-ms-transform: translatez(0);
+    	-o-transform: translatez(0);
+    	transform: translatez(0);
+}
+
+.bx-wrapper .bx-pager,
+.bx-wrapper .bx-controls-auto {
+	position: absolute;
+	bottom: -30px;
+	width: 100%;
+}
+
+/* LOADER */
+
+.bx-wrapper .bx-loading {
+	min-height: 50px;
+	background: url(images/bx_loader.gif) center center no-repeat #fff;
+	height: 100%;
+	width: 100%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 2000;
+}
+
+/* PAGER */
+
+.bx-wrapper .bx-pager {
+	text-align: center;
+	font-size: .85em;
+	font-family: Arial;
+	font-weight: bold;
+	color: #666;
+	padding-top: 20px;
+  position:absolute;
+  bottom:5px;
+}
+
+.bx-wrapper .bx-pager .bx-pager-item,
+.bx-wrapper .bx-controls-auto .bx-controls-auto-item {
+	display: inline-block;
+	*zoom: 1;
+	*display: inline;
+}
+
+.bx-wrapper .bx-pager.bx-default-pager a {
+	background: rgba(250,250,250,0.5);
+	text-indent: -9999px;
+	display: block;
+	width: 10px;
+	height: 10px;
+	margin: 0 5px;
+	outline: 0;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+}
+
+.bx-wrapper .bx-pager.bx-default-pager a:hover,
+.bx-wrapper .bx-pager.bx-default-pager a.active {
+	background: rgba(250,250,250,1);
+}
+
+/* DIRECTION CONTROLS (NEXT / PREV) */
+
+.bx-wrapper .bx-prev {
+	left: 10px;
+	background: url(images/controls.png) no-repeat 0 -32px;
+}
+
+.bx-wrapper .bx-next {
+	right: 10px;
+	background: url(images/controls.png) no-repeat -43px -32px;
+}
+
+.bx-wrapper .bx-prev:hover {
+	background-position: 0 0;
+}
+
+.bx-wrapper .bx-next:hover {
+	background-position: -43px 0;
+}
+
+.bx-wrapper .bx-controls-direction a {
+	position: absolute;
+	top: 50%;
+	margin-top: -16px;
+	outline: 0;
+	width: 32px;
+	height: 32px;
+	text-indent: -9999px;
+	z-index: 9999;
+}
+
+.bx-wrapper .bx-controls-direction a.disabled {
+	display: none;
+}
+
+/* AUTO CONTROLS (START / STOP) */
+
+.bx-wrapper .bx-controls-auto {
+	text-align: center;
+  
+}
+
+.bx-wrapper .bx-controls-auto .bx-start {
+	display: block;
+	text-indent: -9999px;
+	width: 10px;
+	height: 11px;
+	outline: 0;
+	background: url(images/controls.png) -86px -11px no-repeat;
+	margin: 0 3px;
+}
+
+.bx-wrapper .bx-controls-auto .bx-start:hover,
+.bx-wrapper .bx-controls-auto .bx-start.active {
+	background-position: -86px 0;
+}
+
+.bx-wrapper .bx-controls-auto .bx-stop {
+	display: block;
+	text-indent: -9999px;
+	width: 9px;
+	height: 11px;
+	outline: 0;
+	background: url(images/controls.png) -86px -44px no-repeat;
+	margin: 0 3px;
+}
+
+.bx-wrapper .bx-controls-auto .bx-stop:hover,
+.bx-wrapper .bx-controls-auto .bx-stop.active {
+	background-position: -86px -33px;
+}
+
+/* PAGER WITH AUTO-CONTROLS HYBRID LAYOUT */
+
+.bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-pager {
+	text-align: left;
+	width: 80%;
+}
+
+.bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-controls-auto {
+	right: 0;
+	width: 35px;
+}
+
+/* IMAGE CAPTIONS */
+
+.bx-wrapper .bx-caption {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	width: 100%;
+}
+
+.bx-wrapper .bx-caption span {
+	color: #fff;
+
+	display: block;
+  text-align:right;
+	padding: 10px;
+}
+
+
diff --git a/app/assets/stylesheets/old.fontawesome/bordered-pulled.less b/app/assets/stylesheets/old.fontawesome/bordered-pulled.less
deleted file mode 100644
index 0c90eb5..0000000
--- a/app/assets/stylesheets/old.fontawesome/bordered-pulled.less
+++ /dev/null
@@ -1,16 +0,0 @@
-// Bordered & Pulled
-// -------------------------
-
-.@{fa-css-prefix}-border {
-  padding: .2em .25em .15em;
-  border: solid .08em @fa-border-color;
-  border-radius: .1em;
-}
-
-.pull-right { float: right; }
-.pull-left { float: left; }
-
-.@{fa-css-prefix} {
-  &.pull-left { margin-right: .3em; }
-  &.pull-right { margin-left: .3em; }
-}
diff --git a/app/assets/stylesheets/old.fontawesome/core.less b/app/assets/stylesheets/old.fontawesome/core.less
deleted file mode 100644
index 6d223bc..0000000
--- a/app/assets/stylesheets/old.fontawesome/core.less
+++ /dev/null
@@ -1,12 +0,0 @@
-// Base Class Definition
-// -------------------------
-
-.@{fa-css-prefix} {
-  display: inline-block;
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
diff --git a/app/assets/stylesheets/old.fontawesome/fixed-width.less b/app/assets/stylesheets/old.fontawesome/fixed-width.less
deleted file mode 100644
index 110289f..0000000
--- a/app/assets/stylesheets/old.fontawesome/fixed-width.less
+++ /dev/null
@@ -1,6 +0,0 @@
-// Fixed Width Icons
-// -------------------------
-.@{fa-css-prefix}-fw {
-  width: (18em / 14);
-  text-align: center;
-}
diff --git a/app/assets/stylesheets/old.fontawesome/font-awesome.less b/app/assets/stylesheets/old.fontawesome/font-awesome.less
deleted file mode 100644
index 96d2f22..0000000
--- a/app/assets/stylesheets/old.fontawesome/font-awesome.less
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
- *  Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
-
-@import "variables";
-@import "mixins";
-@import "path";
-@import "core";
-@import "larger";
-@import "fixed-width";
-@import "list";
-@import "bordered-pulled";
-@import "spinning";
-@import "rotated-flipped";
-@import "stacked";
-@import "icons";
diff --git a/app/assets/stylesheets/old.fontawesome/icons.less b/app/assets/stylesheets/old.fontawesome/icons.less
deleted file mode 100644
index bf0f856..0000000
--- a/app/assets/stylesheets/old.fontawesome/icons.less
+++ /dev/null
@@ -1,412 +0,0 @@
-/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
-   readers do not read off random characters that represent icons */
-
-.@{fa-css-prefix}-glass:before { content: @fa-var-glass; }
-.@{fa-css-prefix}-music:before { content: @fa-var-music; }
-.@{fa-css-prefix}-search:before { content: @fa-var-search; }
-.@{fa-css-prefix}-envelope-o:before { content: @fa-var-envelope-o; }
-.@{fa-css-prefix}-heart:before { content: @fa-var-heart; }
-.@{fa-css-prefix}-star:before { content: @fa-var-star; }
-.@{fa-css-prefix}-star-o:before { content: @fa-var-star-o; }
-.@{fa-css-prefix}-user:before { content: @fa-var-user; }
-.@{fa-css-prefix}-film:before { content: @fa-var-film; }
-.@{fa-css-prefix}-th-large:before { content: @fa-var-th-large; }
-.@{fa-css-prefix}-th:before { content: @fa-var-th; }
-.@{fa-css-prefix}-th-list:before { content: @fa-var-th-list; }
-.@{fa-css-prefix}-check:before { content: @fa-var-check; }
-.@{fa-css-prefix}-times:before { content: @fa-var-times; }
-.@{fa-css-prefix}-search-plus:before { content: @fa-var-search-plus; }
-.@{fa-css-prefix}-search-minus:before { content: @fa-var-search-minus; }
-.@{fa-css-prefix}-power-off:before { content: @fa-var-power-off; }
-.@{fa-css-prefix}-signal:before { content: @fa-var-signal; }
-.@{fa-css-prefix}-gear:before,
-.@{fa-css-prefix}-cog:before { content: @fa-var-cog; }
-.@{fa-css-prefix}-trash-o:before { content: @fa-var-trash-o; }
-.@{fa-css-prefix}-home:before { content: @fa-var-home; }
-.@{fa-css-prefix}-file-o:before { content: @fa-var-file-o; }
-.@{fa-css-prefix}-clock-o:before { content: @fa-var-clock-o; }
-.@{fa-css-prefix}-road:before { content: @fa-var-road; }
-.@{fa-css-prefix}-download:before { content: @fa-var-download; }
-.@{fa-css-prefix}-arrow-circle-o-down:before { content: @fa-var-arrow-circle-o-down; }
-.@{fa-css-prefix}-arrow-circle-o-up:before { content: @fa-var-arrow-circle-o-up; }
-.@{fa-css-prefix}-inbox:before { content: @fa-var-inbox; }
-.@{fa-css-prefix}-play-circle-o:before { content: @fa-var-play-circle-o; }
-.@{fa-css-prefix}-rotate-right:before,
-.@{fa-css-prefix}-repeat:before { content: @fa-var-repeat; }
-.@{fa-css-prefix}-refresh:before { content: @fa-var-refresh; }
-.@{fa-css-prefix}-list-alt:before { content: @fa-var-list-alt; }
-.@{fa-css-prefix}-lock:before { content: @fa-var-lock; }
-.@{fa-css-prefix}-flag:before { content: @fa-var-flag; }
-.@{fa-css-prefix}-headphones:before { content: @fa-var-headphones; }
-.@{fa-css-prefix}-volume-off:before { content: @fa-var-volume-off; }
-.@{fa-css-prefix}-volume-down:before { content: @fa-var-volume-down; }
-.@{fa-css-prefix}-volume-up:before { content: @fa-var-volume-up; }
-.@{fa-css-prefix}-qrcode:before { content: @fa-var-qrcode; }
-.@{fa-css-prefix}-barcode:before { content: @fa-var-barcode; }
-.@{fa-css-prefix}-tag:before { content: @fa-var-tag; }
-.@{fa-css-prefix}-tags:before { content: @fa-var-tags; }
-.@{fa-css-prefix}-book:before { content: @fa-var-book; }
-.@{fa-css-prefix}-bookmark:before { content: @fa-var-bookmark; }
-.@{fa-css-prefix}-print:before { content: @fa-var-print; }
-.@{fa-css-prefix}-camera:before { content: @fa-var-camera; }
-.@{fa-css-prefix}-font:before { content: @fa-var-font; }
-.@{fa-css-prefix}-bold:before { content: @fa-var-bold; }
-.@{fa-css-prefix}-italic:before { content: @fa-var-italic; }
-.@{fa-css-prefix}-text-height:before { content: @fa-var-text-height; }
-.@{fa-css-prefix}-text-width:before { content: @fa-var-text-width; }
-.@{fa-css-prefix}-align-left:before { content: @fa-var-align-left; }
-.@{fa-css-prefix}-align-center:before { content: @fa-var-align-center; }
-.@{fa-css-prefix}-align-right:before { content: @fa-var-align-right; }
-.@{fa-css-prefix}-align-justify:before { content: @fa-var-align-justify; }
-.@{fa-css-prefix}-list:before { content: @fa-var-list; }
-.@{fa-css-prefix}-dedent:before,
-.@{fa-css-prefix}-outdent:before { content: @fa-var-outdent; }
-.@{fa-css-prefix}-indent:before { content: @fa-var-indent; }
-.@{fa-css-prefix}-video-camera:before { content: @fa-var-video-camera; }
-.@{fa-css-prefix}-picture-o:before { content: @fa-var-picture-o; }
-.@{fa-css-prefix}-pencil:before { content: @fa-var-pencil; }
-.@{fa-css-prefix}-map-marker:before { content: @fa-var-map-marker; }
-.@{fa-css-prefix}-adjust:before { content: @fa-var-adjust; }
-.@{fa-css-prefix}-tint:before { content: @fa-var-tint; }
-.@{fa-css-prefix}-edit:before,
-.@{fa-css-prefix}-pencil-square-o:before { content: @fa-var-pencil-square-o; }
-.@{fa-css-prefix}-share-square-o:before { content: @fa-var-share-square-o; }
-.@{fa-css-prefix}-check-square-o:before { content: @fa-var-check-square-o; }
-.@{fa-css-prefix}-arrows:before { content: @fa-var-arrows; }
-.@{fa-css-prefix}-step-backward:before { content: @fa-var-step-backward; }
-.@{fa-css-prefix}-fast-backward:before { content: @fa-var-fast-backward; }
-.@{fa-css-prefix}-backward:before { content: @fa-var-backward; }
-.@{fa-css-prefix}-play:before { content: @fa-var-play; }
-.@{fa-css-prefix}-pause:before { content: @fa-var-pause; }
-.@{fa-css-prefix}-stop:before { content: @fa-var-stop; }
-.@{fa-css-prefix}-forward:before { content: @fa-var-forward; }
-.@{fa-css-prefix}-fast-forward:before { content: @fa-var-fast-forward; }
-.@{fa-css-prefix}-step-forward:before { content: @fa-var-step-forward; }
-.@{fa-css-prefix}-eject:before { content: @fa-var-eject; }
-.@{fa-css-prefix}-chevron-left:before { content: @fa-var-chevron-left; }
-.@{fa-css-prefix}-chevron-right:before { content: @fa-var-chevron-right; }
-.@{fa-css-prefix}-plus-circle:before { content: @fa-var-plus-circle; }
-.@{fa-css-prefix}-minus-circle:before { content: @fa-var-minus-circle; }
-.@{fa-css-prefix}-times-circle:before { content: @fa-var-times-circle; }
-.@{fa-css-prefix}-check-circle:before { content: @fa-var-check-circle; }
-.@{fa-css-prefix}-question-circle:before { content: @fa-var-question-circle; }
-.@{fa-css-prefix}-info-circle:before { content: @fa-var-info-circle; }
-.@{fa-css-prefix}-crosshairs:before { content: @fa-var-crosshairs; }
-.@{fa-css-prefix}-times-circle-o:before { content: @fa-var-times-circle-o; }
-.@{fa-css-prefix}-check-circle-o:before { content: @fa-var-check-circle-o; }
-.@{fa-css-prefix}-ban:before { content: @fa-var-ban; }
-.@{fa-css-prefix}-arrow-left:before { content: @fa-var-arrow-left; }
-.@{fa-css-prefix}-arrow-right:before { content: @fa-var-arrow-right; }
-.@{fa-css-prefix}-arrow-up:before { content: @fa-var-arrow-up; }
-.@{fa-css-prefix}-arrow-down:before { content: @fa-var-arrow-down; }
-.@{fa-css-prefix}-mail-forward:before,
-.@{fa-css-prefix}-share:before { content: @fa-var-share; }
-.@{fa-css-prefix}-expand:before { content: @fa-var-expand; }
-.@{fa-css-prefix}-compress:before { content: @fa-var-compress; }
-.@{fa-css-prefix}-plus:before { content: @fa-var-plus; }
-.@{fa-css-prefix}-minus:before { content: @fa-var-minus; }
-.@{fa-css-prefix}-asterisk:before { content: @fa-var-asterisk; }
-.@{fa-css-prefix}-exclamation-circle:before { content: @fa-var-exclamation-circle; }
-.@{fa-css-prefix}-gift:before { content: @fa-var-gift; }
-.@{fa-css-prefix}-leaf:before { content: @fa-var-leaf; }
-.@{fa-css-prefix}-fire:before { content: @fa-var-fire; }
-.@{fa-css-prefix}-eye:before { content: @fa-var-eye; }
-.@{fa-css-prefix}-eye-slash:before { content: @fa-var-eye-slash; }
-.@{fa-css-prefix}-warning:before,
-.@{fa-css-prefix}-exclamation-triangle:before { content: @fa-var-exclamation-triangle; }
-.@{fa-css-prefix}-plane:before { content: @fa-var-plane; }
-.@{fa-css-prefix}-calendar:before { content: @fa-var-calendar; }
-.@{fa-css-prefix}-random:before { content: @fa-var-random; }
-.@{fa-css-prefix}-comment:before { content: @fa-var-comment; }
-.@{fa-css-prefix}-magnet:before { content: @fa-var-magnet; }
-.@{fa-css-prefix}-chevron-up:before { content: @fa-var-chevron-up; }
-.@{fa-css-prefix}-chevron-down:before { content: @fa-var-chevron-down; }
-.@{fa-css-prefix}-retweet:before { content: @fa-var-retweet; }
-.@{fa-css-prefix}-shopping-cart:before { content: @fa-var-shopping-cart; }
-.@{fa-css-prefix}-folder:before { content: @fa-var-folder; }
-.@{fa-css-prefix}-folder-open:before { content: @fa-var-folder-open; }
-.@{fa-css-prefix}-arrows-v:before { content: @fa-var-arrows-v; }
-.@{fa-css-prefix}-arrows-h:before { content: @fa-var-arrows-h; }
-.@{fa-css-prefix}-bar-chart-o:before { content: @fa-var-bar-chart-o; }
-.@{fa-css-prefix}-twitter-square:before { content: @fa-var-twitter-square; }
-.@{fa-css-prefix}-facebook-square:before { content: @fa-var-facebook-square; }
-.@{fa-css-prefix}-camera-retro:before { content: @fa-var-camera-retro; }
-.@{fa-css-prefix}-key:before { content: @fa-var-key; }
-.@{fa-css-prefix}-gears:before,
-.@{fa-css-prefix}-cogs:before { content: @fa-var-cogs; }
-.@{fa-css-prefix}-comments:before { content: @fa-var-comments; }
-.@{fa-css-prefix}-thumbs-o-up:before { content: @fa-var-thumbs-o-up; }
-.@{fa-css-prefix}-thumbs-o-down:before { content: @fa-var-thumbs-o-down; }
-.@{fa-css-prefix}-star-half:before { content: @fa-var-star-half; }
-.@{fa-css-prefix}-heart-o:before { content: @fa-var-heart-o; }
-.@{fa-css-prefix}-sign-out:before { content: @fa-var-sign-out; }
-.@{fa-css-prefix}-linkedin-square:before { content: @fa-var-linkedin-square; }
-.@{fa-css-prefix}-thumb-tack:before { content: @fa-var-thumb-tack; }
-.@{fa-css-prefix}-external-link:before { content: @fa-var-external-link; }
-.@{fa-css-prefix}-sign-in:before { content: @fa-var-sign-in; }
-.@{fa-css-prefix}-trophy:before { content: @fa-var-trophy; }
-.@{fa-css-prefix}-github-square:before { content: @fa-var-github-square; }
-.@{fa-css-prefix}-upload:before { content: @fa-var-upload; }
-.@{fa-css-prefix}-lemon-o:before { content: @fa-var-lemon-o; }
-.@{fa-css-prefix}-phone:before { content: @fa-var-phone; }
-.@{fa-css-prefix}-square-o:before { content: @fa-var-square-o; }
-.@{fa-css-prefix}-bookmark-o:before { content: @fa-var-bookmark-o; }
-.@{fa-css-prefix}-phone-square:before { content: @fa-var-phone-square; }
-.@{fa-css-prefix}-twitter:before { content: @fa-var-twitter; }
-.@{fa-css-prefix}-facebook:before { content: @fa-var-facebook; }
-.@{fa-css-prefix}-github:before { content: @fa-var-github; }
-.@{fa-css-prefix}-unlock:before { content: @fa-var-unlock; }
-.@{fa-css-prefix}-credit-card:before { content: @fa-var-credit-card; }
-.@{fa-css-prefix}-rss:before { content: @fa-var-rss; }
-.@{fa-css-prefix}-hdd-o:before { content: @fa-var-hdd-o; }
-.@{fa-css-prefix}-bullhorn:before { content: @fa-var-bullhorn; }
-.@{fa-css-prefix}-bell:before { content: @fa-var-bell; }
-.@{fa-css-prefix}-certificate:before { content: @fa-var-certificate; }
-.@{fa-css-prefix}-hand-o-right:before { content: @fa-var-hand-o-right; }
-.@{fa-css-prefix}-hand-o-left:before { content: @fa-var-hand-o-left; }
-.@{fa-css-prefix}-hand-o-up:before { content: @fa-var-hand-o-up; }
-.@{fa-css-prefix}-hand-o-down:before { content: @fa-var-hand-o-down; }
-.@{fa-css-prefix}-arrow-circle-left:before { content: @fa-var-arrow-circle-left; }
-.@{fa-css-prefix}-arrow-circle-right:before { content: @fa-var-arrow-circle-right; }
-.@{fa-css-prefix}-arrow-circle-up:before { content: @fa-var-arrow-circle-up; }
-.@{fa-css-prefix}-arrow-circle-down:before { content: @fa-var-arrow-circle-down; }
-.@{fa-css-prefix}-globe:before { content: @fa-var-globe; }
-.@{fa-css-prefix}-wrench:before { content: @fa-var-wrench; }
-.@{fa-css-prefix}-tasks:before { content: @fa-var-tasks; }
-.@{fa-css-prefix}-filter:before { content: @fa-var-filter; }
-.@{fa-css-prefix}-briefcase:before { content: @fa-var-briefcase; }
-.@{fa-css-prefix}-arrows-alt:before { content: @fa-var-arrows-alt; }
-.@{fa-css-prefix}-group:before,
-.@{fa-css-prefix}-users:before { content: @fa-var-users; }
-.@{fa-css-prefix}-chain:before,
-.@{fa-css-prefix}-link:before { content: @fa-var-link; }
-.@{fa-css-prefix}-cloud:before { content: @fa-var-cloud; }
-.@{fa-css-prefix}-flask:before { content: @fa-var-flask; }
-.@{fa-css-prefix}-cut:before,
-.@{fa-css-prefix}-scissors:before { content: @fa-var-scissors; }
-.@{fa-css-prefix}-copy:before,
-.@{fa-css-prefix}-files-o:before { content: @fa-var-files-o; }
-.@{fa-css-prefix}-paperclip:before { content: @fa-var-paperclip; }
-.@{fa-css-prefix}-save:before,
-.@{fa-css-prefix}-floppy-o:before { content: @fa-var-floppy-o; }
-.@{fa-css-prefix}-square:before { content: @fa-var-square; }
-.@{fa-css-prefix}-bars:before { content: @fa-var-bars; }
-.@{fa-css-prefix}-list-ul:before { content: @fa-var-list-ul; }
-.@{fa-css-prefix}-list-ol:before { content: @fa-var-list-ol; }
-.@{fa-css-prefix}-strikethrough:before { content: @fa-var-strikethrough; }
-.@{fa-css-prefix}-underline:before { content: @fa-var-underline; }
-.@{fa-css-prefix}-table:before { content: @fa-var-table; }
-.@{fa-css-prefix}-magic:before { content: @fa-var-magic; }
-.@{fa-css-prefix}-truck:before { content: @fa-var-truck; }
-.@{fa-css-prefix}-pinterest:before { content: @fa-var-pinterest; }
-.@{fa-css-prefix}-pinterest-square:before { content: @fa-var-pinterest-square; }
-.@{fa-css-prefix}-google-plus-square:before { content: @fa-var-google-plus-square; }
-.@{fa-css-prefix}-google-plus:before { content: @fa-var-google-plus; }
-.@{fa-css-prefix}-money:before { content: @fa-var-money; }
-.@{fa-css-prefix}-caret-down:before { content: @fa-var-caret-down; }
-.@{fa-css-prefix}-caret-up:before { content: @fa-var-caret-up; }
-.@{fa-css-prefix}-caret-left:before { content: @fa-var-caret-left; }
-.@{fa-css-prefix}-caret-right:before { content: @fa-var-caret-right; }
-.@{fa-css-prefix}-columns:before { content: @fa-var-columns; }
-.@{fa-css-prefix}-unsorted:before,
-.@{fa-css-prefix}-sort:before { content: @fa-var-sort; }
-.@{fa-css-prefix}-sort-down:before,
-.@{fa-css-prefix}-sort-asc:before { content: @fa-var-sort-asc; }
-.@{fa-css-prefix}-sort-up:before,
-.@{fa-css-prefix}-sort-desc:before { content: @fa-var-sort-desc; }
-.@{fa-css-prefix}-envelope:before { content: @fa-var-envelope; }
-.@{fa-css-prefix}-linkedin:before { content: @fa-var-linkedin; }
-.@{fa-css-prefix}-rotate-left:before,
-.@{fa-css-prefix}-undo:before { content: @fa-var-undo; }
-.@{fa-css-prefix}-legal:before,
-.@{fa-css-prefix}-gavel:before { content: @fa-var-gavel; }
-.@{fa-css-prefix}-dashboard:before,
-.@{fa-css-prefix}-tachometer:before { content: @fa-var-tachometer; }
-.@{fa-css-prefix}-comment-o:before { content: @fa-var-comment-o; }
-.@{fa-css-prefix}-comments-o:before { content: @fa-var-comments-o; }
-.@{fa-css-prefix}-flash:before,
-.@{fa-css-prefix}-bolt:before { content: @fa-var-bolt; }
-.@{fa-css-prefix}-sitemap:before { content: @fa-var-sitemap; }
-.@{fa-css-prefix}-umbrella:before { content: @fa-var-umbrella; }
-.@{fa-css-prefix}-paste:before,
-.@{fa-css-prefix}-clipboard:before { content: @fa-var-clipboard; }
-.@{fa-css-prefix}-lightbulb-o:before { content: @fa-var-lightbulb-o; }
-.@{fa-css-prefix}-exchange:before { content: @fa-var-exchange; }
-.@{fa-css-prefix}-cloud-download:before { content: @fa-var-cloud-download; }
-.@{fa-css-prefix}-cloud-upload:before { content: @fa-var-cloud-upload; }
-.@{fa-css-prefix}-user-md:before { content: @fa-var-user-md; }
-.@{fa-css-prefix}-stethoscope:before { content: @fa-var-stethoscope; }
-.@{fa-css-prefix}-suitcase:before { content: @fa-var-suitcase; }
-.@{fa-css-prefix}-bell-o:before { content: @fa-var-bell-o; }
-.@{fa-css-prefix}-coffee:before { content: @fa-var-coffee; }
-.@{fa-css-prefix}-cutlery:before { content: @fa-var-cutlery; }
-.@{fa-css-prefix}-file-text-o:before { content: @fa-var-file-text-o; }
-.@{fa-css-prefix}-building-o:before { content: @fa-var-building-o; }
-.@{fa-css-prefix}-hospital-o:before { content: @fa-var-hospital-o; }
-.@{fa-css-prefix}-ambulance:before { content: @fa-var-ambulance; }
-.@{fa-css-prefix}-medkit:before { content: @fa-var-medkit; }
-.@{fa-css-prefix}-fighter-jet:before { content: @fa-var-fighter-jet; }
-.@{fa-css-prefix}-beer:before { content: @fa-var-beer; }
-.@{fa-css-prefix}-h-square:before { content: @fa-var-h-square; }
-.@{fa-css-prefix}-plus-square:before { content: @fa-var-plus-square; }
-.@{fa-css-prefix}-angle-double-left:before { content: @fa-var-angle-double-left; }
-.@{fa-css-prefix}-angle-double-right:before { content: @fa-var-angle-double-right; }
-.@{fa-css-prefix}-angle-double-up:before { content: @fa-var-angle-double-up; }
-.@{fa-css-prefix}-angle-double-down:before { content: @fa-var-angle-double-down; }
-.@{fa-css-prefix}-angle-left:before { content: @fa-var-angle-left; }
-.@{fa-css-prefix}-angle-right:before { content: @fa-var-angle-right; }
-.@{fa-css-prefix}-angle-up:before { content: @fa-var-angle-up; }
-.@{fa-css-prefix}-angle-down:before { content: @fa-var-angle-down; }
-.@{fa-css-prefix}-desktop:before { content: @fa-var-desktop; }
-.@{fa-css-prefix}-laptop:before { content: @fa-var-laptop; }
-.@{fa-css-prefix}-tablet:before { content: @fa-var-tablet; }
-.@{fa-css-prefix}-mobile-phone:before,
-.@{fa-css-prefix}-mobile:before { content: @fa-var-mobile; }
-.@{fa-css-prefix}-circle-o:before { content: @fa-var-circle-o; }
-.@{fa-css-prefix}-quote-left:before { content: @fa-var-quote-left; }
-.@{fa-css-prefix}-quote-right:before { content: @fa-var-quote-right; }
-.@{fa-css-prefix}-spinner:before { content: @fa-var-spinner; }
-.@{fa-css-prefix}-circle:before { content: @fa-var-circle; }
-.@{fa-css-prefix}-mail-reply:before,
-.@{fa-css-prefix}-reply:before { content: @fa-var-reply; }
-.@{fa-css-prefix}-github-alt:before { content: @fa-var-github-alt; }
-.@{fa-css-prefix}-folder-o:before { content: @fa-var-folder-o; }
-.@{fa-css-prefix}-folder-open-o:before { content: @fa-var-folder-open-o; }
-.@{fa-css-prefix}-smile-o:before { content: @fa-var-smile-o; }
-.@{fa-css-prefix}-frown-o:before { content: @fa-var-frown-o; }
-.@{fa-css-prefix}-meh-o:before { content: @fa-var-meh-o; }
-.@{fa-css-prefix}-gamepad:before { content: @fa-var-gamepad; }
-.@{fa-css-prefix}-keyboard-o:before { content: @fa-var-keyboard-o; }
-.@{fa-css-prefix}-flag-o:before { content: @fa-var-flag-o; }
-.@{fa-css-prefix}-flag-checkered:before { content: @fa-var-flag-checkered; }
-.@{fa-css-prefix}-terminal:before { content: @fa-var-terminal; }
-.@{fa-css-prefix}-code:before { content: @fa-var-code; }
-.@{fa-css-prefix}-reply-all:before { content: @fa-var-reply-all; }
-.@{fa-css-prefix}-mail-reply-all:before { content: @fa-var-mail-reply-all; }
-.@{fa-css-prefix}-star-half-empty:before,
-.@{fa-css-prefix}-star-half-full:before,
-.@{fa-css-prefix}-star-half-o:before { content: @fa-var-star-half-o; }
-.@{fa-css-prefix}-location-arrow:before { content: @fa-var-location-arrow; }
-.@{fa-css-prefix}-crop:before { content: @fa-var-crop; }
-.@{fa-css-prefix}-code-fork:before { content: @fa-var-code-fork; }
-.@{fa-css-prefix}-unlink:before,
-.@{fa-css-prefix}-chain-broken:before { content: @fa-var-chain-broken; }
-.@{fa-css-prefix}-question:before { content: @fa-var-question; }
-.@{fa-css-prefix}-info:before { content: @fa-var-info; }
-.@{fa-css-prefix}-exclamation:before { content: @fa-var-exclamation; }
-.@{fa-css-prefix}-superscript:before { content: @fa-var-superscript; }
-.@{fa-css-prefix}-subscript:before { content: @fa-var-subscript; }
-.@{fa-css-prefix}-eraser:before { content: @fa-var-eraser; }
-.@{fa-css-prefix}-puzzle-piece:before { content: @fa-var-puzzle-piece; }
-.@{fa-css-prefix}-microphone:before { content: @fa-var-microphone; }
-.@{fa-css-prefix}-microphone-slash:before { content: @fa-var-microphone-slash; }
-.@{fa-css-prefix}-shield:before { content: @fa-var-shield; }
-.@{fa-css-prefix}-calendar-o:before { content: @fa-var-calendar-o; }
-.@{fa-css-prefix}-fire-extinguisher:before { content: @fa-var-fire-extinguisher; }
-.@{fa-css-prefix}-rocket:before { content: @fa-var-rocket; }
-.@{fa-css-prefix}-maxcdn:before { content: @fa-var-maxcdn; }
-.@{fa-css-prefix}-chevron-circle-left:before { content: @fa-var-chevron-circle-left; }
-.@{fa-css-prefix}-chevron-circle-right:before { content: @fa-var-chevron-circle-right; }
-.@{fa-css-prefix}-chevron-circle-up:before { content: @fa-var-chevron-circle-up; }
-.@{fa-css-prefix}-chevron-circle-down:before { content: @fa-var-chevron-circle-down; }
-.@{fa-css-prefix}-html5:before { content: @fa-var-html5; }
-.@{fa-css-prefix}-css3:before { content: @fa-var-css3; }
-.@{fa-css-prefix}-anchor:before { content: @fa-var-anchor; }
-.@{fa-css-prefix}-unlock-alt:before { content: @fa-var-unlock-alt; }
-.@{fa-css-prefix}-bullseye:before { content: @fa-var-bullseye; }
-.@{fa-css-prefix}-ellipsis-h:before { content: @fa-var-ellipsis-h; }
-.@{fa-css-prefix}-ellipsis-v:before { content: @fa-var-ellipsis-v; }
-.@{fa-css-prefix}-rss-square:before { content: @fa-var-rss-square; }
-.@{fa-css-prefix}-play-circle:before { content: @fa-var-play-circle; }
-.@{fa-css-prefix}-ticket:before { content: @fa-var-ticket; }
-.@{fa-css-prefix}-minus-square:before { content: @fa-var-minus-square; }
-.@{fa-css-prefix}-minus-square-o:before { content: @fa-var-minus-square-o; }
-.@{fa-css-prefix}-level-up:before { content: @fa-var-level-up; }
-.@{fa-css-prefix}-level-down:before { content: @fa-var-level-down; }
-.@{fa-css-prefix}-check-square:before { content: @fa-var-check-square; }
-.@{fa-css-prefix}-pencil-square:before { content: @fa-var-pencil-square; }
-.@{fa-css-prefix}-external-link-square:before { content: @fa-var-external-link-square; }
-.@{fa-css-prefix}-share-square:before { content: @fa-var-share-square; }
-.@{fa-css-prefix}-compass:before { content: @fa-var-compass; }
-.@{fa-css-prefix}-toggle-down:before,
-.@{fa-css-prefix}-caret-square-o-down:before { content: @fa-var-caret-square-o-down; }
-.@{fa-css-prefix}-toggle-up:before,
-.@{fa-css-prefix}-caret-square-o-up:before { content: @fa-var-caret-square-o-up; }
-.@{fa-css-prefix}-toggle-right:before,
-.@{fa-css-prefix}-caret-square-o-right:before { content: @fa-var-caret-square-o-right; }
-.@{fa-css-prefix}-euro:before,
-.@{fa-css-prefix}-eur:before { content: @fa-var-eur; }
-.@{fa-css-prefix}-gbp:before { content: @fa-var-gbp; }
-.@{fa-css-prefix}-dollar:before,
-.@{fa-css-prefix}-usd:before { content: @fa-var-usd; }
-.@{fa-css-prefix}-rupee:before,
-.@{fa-css-prefix}-inr:before { content: @fa-var-inr; }
-.@{fa-css-prefix}-cny:before,
-.@{fa-css-prefix}-rmb:before,
-.@{fa-css-prefix}-yen:before,
-.@{fa-css-prefix}-jpy:before { content: @fa-var-jpy; }
-.@{fa-css-prefix}-ruble:before,
-.@{fa-css-prefix}-rouble:before,
-.@{fa-css-prefix}-rub:before { content: @fa-var-rub; }
-.@{fa-css-prefix}-won:before,
-.@{fa-css-prefix}-krw:before { content: @fa-var-krw; }
-.@{fa-css-prefix}-bitcoin:before,
-.@{fa-css-prefix}-btc:before { content: @fa-var-btc; }
-.@{fa-css-prefix}-file:before { content: @fa-var-file; }
-.@{fa-css-prefix}-file-text:before { content: @fa-var-file-text; }
-.@{fa-css-prefix}-sort-alpha-asc:before { content: @fa-var-sort-alpha-asc; }
-.@{fa-css-prefix}-sort-alpha-desc:before { content: @fa-var-sort-alpha-desc; }
-.@{fa-css-prefix}-sort-amount-asc:before { content: @fa-var-sort-amount-asc; }
-.@{fa-css-prefix}-sort-amount-desc:before { content: @fa-var-sort-amount-desc; }
-.@{fa-css-prefix}-sort-numeric-asc:before { content: @fa-var-sort-numeric-asc; }
-.@{fa-css-prefix}-sort-numeric-desc:before { content: @fa-var-sort-numeric-desc; }
-.@{fa-css-prefix}-thumbs-up:before { content: @fa-var-thumbs-up; }
-.@{fa-css-prefix}-thumbs-down:before { content: @fa-var-thumbs-down; }
-.@{fa-css-prefix}-youtube-square:before { content: @fa-var-youtube-square; }
-.@{fa-css-prefix}-youtube:before { content: @fa-var-youtube; }
-.@{fa-css-prefix}-xing:before { content: @fa-var-xing; }
-.@{fa-css-prefix}-xing-square:before { content: @fa-var-xing-square; }
-.@{fa-css-prefix}-youtube-play:before { content: @fa-var-youtube-play; }
-.@{fa-css-prefix}-dropbox:before { content: @fa-var-dropbox; }
-.@{fa-css-prefix}-stack-overflow:before { content: @fa-var-stack-overflow; }
-.@{fa-css-prefix}-instagram:before { content: @fa-var-instagram; }
-.@{fa-css-prefix}-flickr:before { content: @fa-var-flickr; }
-.@{fa-css-prefix}-adn:before { content: @fa-var-adn; }
-.@{fa-css-prefix}-bitbucket:before { content: @fa-var-bitbucket; }
-.@{fa-css-prefix}-bitbucket-square:before { content: @fa-var-bitbucket-square; }
-.@{fa-css-prefix}-tumblr:before { content: @fa-var-tumblr; }
-.@{fa-css-prefix}-tumblr-square:before { content: @fa-var-tumblr-square; }
-.@{fa-css-prefix}-long-arrow-down:before { content: @fa-var-long-arrow-down; }
-.@{fa-css-prefix}-long-arrow-up:before { content: @fa-var-long-arrow-up; }
-.@{fa-css-prefix}-long-arrow-left:before { content: @fa-var-long-arrow-left; }
-.@{fa-css-prefix}-long-arrow-right:before { content: @fa-var-long-arrow-right; }
-.@{fa-css-prefix}-apple:before { content: @fa-var-apple; }
-.@{fa-css-prefix}-windows:before { content: @fa-var-windows; }
-.@{fa-css-prefix}-android:before { content: @fa-var-android; }
-.@{fa-css-prefix}-linux:before { content: @fa-var-linux; }
-.@{fa-css-prefix}-dribbble:before { content: @fa-var-dribbble; }
-.@{fa-css-prefix}-skype:before { content: @fa-var-skype; }
-.@{fa-css-prefix}-foursquare:before { content: @fa-var-foursquare; }
-.@{fa-css-prefix}-trello:before { content: @fa-var-trello; }
-.@{fa-css-prefix}-female:before { content: @fa-var-female; }
-.@{fa-css-prefix}-male:before { content: @fa-var-male; }
-.@{fa-css-prefix}-gittip:before { content: @fa-var-gittip; }
-.@{fa-css-prefix}-sun-o:before { content: @fa-var-sun-o; }
-.@{fa-css-prefix}-moon-o:before { content: @fa-var-moon-o; }
-.@{fa-css-prefix}-archive:before { content: @fa-var-archive; }
-.@{fa-css-prefix}-bug:before { content: @fa-var-bug; }
-.@{fa-css-prefix}-vk:before { content: @fa-var-vk; }
-.@{fa-css-prefix}-weibo:before { content: @fa-var-weibo; }
-.@{fa-css-prefix}-renren:before { content: @fa-var-renren; }
-.@{fa-css-prefix}-pagelines:before { content: @fa-var-pagelines; }
-.@{fa-css-prefix}-stack-exchange:before { content: @fa-var-stack-exchange; }
-.@{fa-css-prefix}-arrow-circle-o-right:before { content: @fa-var-arrow-circle-o-right; }
-.@{fa-css-prefix}-arrow-circle-o-left:before { content: @fa-var-arrow-circle-o-left; }
-.@{fa-css-prefix}-toggle-left:before,
-.@{fa-css-prefix}-caret-square-o-left:before { content: @fa-var-caret-square-o-left; }
-.@{fa-css-prefix}-dot-circle-o:before { content: @fa-var-dot-circle-o; }
-.@{fa-css-prefix}-wheelchair:before { content: @fa-var-wheelchair; }
-.@{fa-css-prefix}-vimeo-square:before { content: @fa-var-vimeo-square; }
-.@{fa-css-prefix}-turkish-lira:before,
-.@{fa-css-prefix}-try:before { content: @fa-var-try; }
-.@{fa-css-prefix}-plus-square-o:before { content: @fa-var-plus-square-o; }
diff --git a/app/assets/stylesheets/old.fontawesome/larger.less b/app/assets/stylesheets/old.fontawesome/larger.less
deleted file mode 100644
index c9d6467..0000000
--- a/app/assets/stylesheets/old.fontawesome/larger.less
+++ /dev/null
@@ -1,13 +0,0 @@
-// Icon Sizes
-// -------------------------
-
-/* makes the font 33% larger relative to the icon container */
-.@{fa-css-prefix}-lg {
-  font-size: (4em / 3);
-  line-height: (3em / 4);
-  vertical-align: -15%;
-}
-.@{fa-css-prefix}-2x { font-size: 2em; }
-.@{fa-css-prefix}-3x { font-size: 3em; }
-.@{fa-css-prefix}-4x { font-size: 4em; }
-.@{fa-css-prefix}-5x { font-size: 5em; }
diff --git a/app/assets/stylesheets/old.fontawesome/list.less b/app/assets/stylesheets/old.fontawesome/list.less
deleted file mode 100644
index eed9340..0000000
--- a/app/assets/stylesheets/old.fontawesome/list.less
+++ /dev/null
@@ -1,19 +0,0 @@
-// List Icons
-// -------------------------
-
-.@{fa-css-prefix}-ul {
-  padding-left: 0;
-  margin-left: @fa-li-width;
-  list-style-type: none;
-  > li { position: relative; }
-}
-.@{fa-css-prefix}-li {
-  position: absolute;
-  left: -@fa-li-width;
-  width: @fa-li-width;
-  top: (2em / 14);
-  text-align: center;
-  &.@{fa-css-prefix}-lg {
-    left: -@fa-li-width + (4em / 14);
-  }
-}
diff --git a/app/assets/stylesheets/old.fontawesome/mixins.less b/app/assets/stylesheets/old.fontawesome/mixins.less
deleted file mode 100644
index 19e5a64..0000000
--- a/app/assets/stylesheets/old.fontawesome/mixins.less
+++ /dev/null
@@ -1,20 +0,0 @@
-// Mixins
-// --------------------------
-
-.fa-icon-rotate(@degrees, @rotation) {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation);
-  -webkit-transform: rotate(@degrees);
-     -moz-transform: rotate(@degrees);
-      -ms-transform: rotate(@degrees);
-       -o-transform: rotate(@degrees);
-          transform: rotate(@degrees);
-}
-
-.fa-icon-flip(@horiz, @vert, @rotation) {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1);
-  -webkit-transform: scale(@horiz, @vert);
-     -moz-transform: scale(@horiz, @vert);
-      -ms-transform: scale(@horiz, @vert);
-       -o-transform: scale(@horiz, @vert);
-          transform: scale(@horiz, @vert);
-}
diff --git a/app/assets/stylesheets/old.fontawesome/path.less b/app/assets/stylesheets/old.fontawesome/path.less
deleted file mode 100644
index c1b1dfe..0000000
--- a/app/assets/stylesheets/old.fontawesome/path.less
+++ /dev/null
@@ -1,14 +0,0 @@
-/* FONT PATH
- * -------------------------- */
-
-@font-face {
-  font-family: 'FontAwesome';
-  src: url('/fonts/fontawesome-webfont.eot?v=@{fa-version}');
-  src: url('/fonts/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
-    url('/fonts/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
-    url('/fonts/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
-    url('/fonts/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
-//  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
-  font-weight: normal;
-  font-style: normal;
-}
diff --git a/app/assets/stylesheets/old.fontawesome/rotated-flipped.less b/app/assets/stylesheets/old.fontawesome/rotated-flipped.less
deleted file mode 100644
index 8fff3a6..0000000
--- a/app/assets/stylesheets/old.fontawesome/rotated-flipped.less
+++ /dev/null
@@ -1,9 +0,0 @@
-// Rotated & Flipped Icons
-// -------------------------
-
-.@{fa-css-prefix}-rotate-90  { .fa-icon-rotate(90deg, 1);  }
-.@{fa-css-prefix}-rotate-180 { .fa-icon-rotate(180deg, 2); }
-.@{fa-css-prefix}-rotate-270 { .fa-icon-rotate(270deg, 3); }
-
-.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); }
-.@{fa-css-prefix}-flip-vertical   { .fa-icon-flip(1, -1, 2); }
diff --git a/app/assets/stylesheets/old.fontawesome/spinning.less b/app/assets/stylesheets/old.fontawesome/spinning.less
deleted file mode 100644
index 60828fe..0000000
--- a/app/assets/stylesheets/old.fontawesome/spinning.less
+++ /dev/null
@@ -1,30 +0,0 @@
-// Spinning Icons
-// --------------------------
-
-.@{fa-css-prefix}-spin {
-  -webkit-animation: spin 2s infinite linear;
-  -moz-animation: spin 2s infinite linear;
-  -o-animation: spin 2s infinite linear;
-  animation: spin 2s infinite linear;
-}
-
-@-moz-keyframes spin {
-  0% { -moz-transform: rotate(0deg); }
-  100% { -moz-transform: rotate(359deg); }
-}
-@-webkit-keyframes spin {
-  0% { -webkit-transform: rotate(0deg); }
-  100% { -webkit-transform: rotate(359deg); }
-}
-@-o-keyframes spin {
-  0% { -o-transform: rotate(0deg); }
-  100% { -o-transform: rotate(359deg); }
-}
-@-ms-keyframes spin {
-  0% { -ms-transform: rotate(0deg); }
-  100% { -ms-transform: rotate(359deg); }
-}
-@keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(359deg); }
-}
diff --git a/app/assets/stylesheets/old.fontawesome/stacked.less b/app/assets/stylesheets/old.fontawesome/stacked.less
deleted file mode 100644
index fc53fb0..0000000
--- a/app/assets/stylesheets/old.fontawesome/stacked.less
+++ /dev/null
@@ -1,20 +0,0 @@
-// Stacked Icons
-// -------------------------
-
-.@{fa-css-prefix}-stack {
-  position: relative;
-  display: inline-block;
-  width: 2em;
-  height: 2em;
-  line-height: 2em;
-  vertical-align: middle;
-}
-.@{fa-css-prefix}-stack-1x, .@{fa-css-prefix}-stack-2x {
-  position: absolute;
-  left: 0;
-  width: 100%;
-  text-align: center;
-}
-.@{fa-css-prefix}-stack-1x { line-height: inherit; }
-.@{fa-css-prefix}-stack-2x { font-size: 2em; }
-.@{fa-css-prefix}-inverse { color: @fa-inverse; }
diff --git a/app/assets/stylesheets/old.fontawesome/variables.less b/app/assets/stylesheets/old.fontawesome/variables.less
deleted file mode 100644
index f40a555..0000000
--- a/app/assets/stylesheets/old.fontawesome/variables.less
+++ /dev/null
@@ -1,381 +0,0 @@
-// Variables
-// --------------------------
-
-@fa-font-path:        "../fonts";
-//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.0.3/fonts"; // for referencing Bootstrap CDN font files directly
-@fa-css-prefix:       fa;
-@fa-version:          "4.0.3";
-@fa-border-color:     #eee;
-@fa-inverse:          #fff;
-@fa-li-width:         (30em / 14);
-
-@fa-var-glass: "\f000";
-@fa-var-music: "\f001";
-@fa-var-search: "\f002";
-@fa-var-envelope-o: "\f003";
-@fa-var-heart: "\f004";
-@fa-var-star: "\f005";
-@fa-var-star-o: "\f006";
-@fa-var-user: "\f007";
-@fa-var-film: "\f008";
-@fa-var-th-large: "\f009";
-@fa-var-th: "\f00a";
-@fa-var-th-list: "\f00b";
-@fa-var-check: "\f00c";
-@fa-var-times: "\f00d";
-@fa-var-search-plus: "\f00e";
-@fa-var-search-minus: "\f010";
-@fa-var-power-off: "\f011";
-@fa-var-signal: "\f012";
-@fa-var-cog: "\f013";
-@fa-var-trash-o: "\f014";
-@fa-var-home: "\f015";
-@fa-var-file-o: "\f016";
-@fa-var-clock-o: "\f017";
-@fa-var-road: "\f018";
-@fa-var-download: "\f019";
-@fa-var-arrow-circle-o-down: "\f01a";
-@fa-var-arrow-circle-o-up: "\f01b";
-@fa-var-inbox: "\f01c";
-@fa-var-play-circle-o: "\f01d";
-@fa-var-repeat: "\f01e";
-@fa-var-refresh: "\f021";
-@fa-var-list-alt: "\f022";
-@fa-var-lock: "\f023";
-@fa-var-flag: "\f024";
-@fa-var-headphones: "\f025";
-@fa-var-volume-off: "\f026";
-@fa-var-volume-down: "\f027";
-@fa-var-volume-up: "\f028";
-@fa-var-qrcode: "\f029";
-@fa-var-barcode: "\f02a";
-@fa-var-tag: "\f02b";
-@fa-var-tags: "\f02c";
-@fa-var-book: "\f02d";
-@fa-var-bookmark: "\f02e";
-@fa-var-print: "\f02f";
-@fa-var-camera: "\f030";
-@fa-var-font: "\f031";
-@fa-var-bold: "\f032";
-@fa-var-italic: "\f033";
-@fa-var-text-height: "\f034";
-@fa-var-text-width: "\f035";
-@fa-var-align-left: "\f036";
-@fa-var-align-center: "\f037";
-@fa-var-align-right: "\f038";
-@fa-var-align-justify: "\f039";
-@fa-var-list: "\f03a";
-@fa-var-outdent: "\f03b";
-@fa-var-indent: "\f03c";
-@fa-var-video-camera: "\f03d";
-@fa-var-picture-o: "\f03e";
-@fa-var-pencil: "\f040";
-@fa-var-map-marker: "\f041";
-@fa-var-adjust: "\f042";
-@fa-var-tint: "\f043";
-@fa-var-pencil-square-o: "\f044";
-@fa-var-share-square-o: "\f045";
-@fa-var-check-square-o: "\f046";
-@fa-var-arrows: "\f047";
-@fa-var-step-backward: "\f048";
-@fa-var-fast-backward: "\f049";
-@fa-var-backward: "\f04a";
-@fa-var-play: "\f04b";
-@fa-var-pause: "\f04c";
-@fa-var-stop: "\f04d";
-@fa-var-forward: "\f04e";
-@fa-var-fast-forward: "\f050";
-@fa-var-step-forward: "\f051";
-@fa-var-eject: "\f052";
-@fa-var-chevron-left: "\f053";
-@fa-var-chevron-right: "\f054";
-@fa-var-plus-circle: "\f055";
-@fa-var-minus-circle: "\f056";
-@fa-var-times-circle: "\f057";
-@fa-var-check-circle: "\f058";
-@fa-var-question-circle: "\f059";
-@fa-var-info-circle: "\f05a";
-@fa-var-crosshairs: "\f05b";
-@fa-var-times-circle-o: "\f05c";
-@fa-var-check-circle-o: "\f05d";
-@fa-var-ban: "\f05e";
-@fa-var-arrow-left: "\f060";
-@fa-var-arrow-right: "\f061";
-@fa-var-arrow-up: "\f062";
-@fa-var-arrow-down: "\f063";
-@fa-var-share: "\f064";
-@fa-var-expand: "\f065";
-@fa-var-compress: "\f066";
-@fa-var-plus: "\f067";
-@fa-var-minus: "\f068";
-@fa-var-asterisk: "\f069";
-@fa-var-exclamation-circle: "\f06a";
-@fa-var-gift: "\f06b";
-@fa-var-leaf: "\f06c";
-@fa-var-fire: "\f06d";
-@fa-var-eye: "\f06e";
-@fa-var-eye-slash: "\f070";
-@fa-var-exclamation-triangle: "\f071";
-@fa-var-plane: "\f072";
-@fa-var-calendar: "\f073";
-@fa-var-random: "\f074";
-@fa-var-comment: "\f075";
-@fa-var-magnet: "\f076";
-@fa-var-chevron-up: "\f077";
-@fa-var-chevron-down: "\f078";
-@fa-var-retweet: "\f079";
-@fa-var-shopping-cart: "\f07a";
-@fa-var-folder: "\f07b";
-@fa-var-folder-open: "\f07c";
-@fa-var-arrows-v: "\f07d";
-@fa-var-arrows-h: "\f07e";
-@fa-var-bar-chart-o: "\f080";
-@fa-var-twitter-square: "\f081";
-@fa-var-facebook-square: "\f082";
-@fa-var-camera-retro: "\f083";
-@fa-var-key: "\f084";
-@fa-var-cogs: "\f085";
-@fa-var-comments: "\f086";
-@fa-var-thumbs-o-up: "\f087";
-@fa-var-thumbs-o-down: "\f088";
-@fa-var-star-half: "\f089";
-@fa-var-heart-o: "\f08a";
-@fa-var-sign-out: "\f08b";
-@fa-var-linkedin-square: "\f08c";
-@fa-var-thumb-tack: "\f08d";
-@fa-var-external-link: "\f08e";
-@fa-var-sign-in: "\f090";
-@fa-var-trophy: "\f091";
-@fa-var-github-square: "\f092";
-@fa-var-upload: "\f093";
-@fa-var-lemon-o: "\f094";
-@fa-var-phone: "\f095";
-@fa-var-square-o: "\f096";
-@fa-var-bookmark-o: "\f097";
-@fa-var-phone-square: "\f098";
-@fa-var-twitter: "\f099";
-@fa-var-facebook: "\f09a";
-@fa-var-github: "\f09b";
-@fa-var-unlock: "\f09c";
-@fa-var-credit-card: "\f09d";
-@fa-var-rss: "\f09e";
-@fa-var-hdd-o: "\f0a0";
-@fa-var-bullhorn: "\f0a1";
-@fa-var-bell: "\f0f3";
-@fa-var-certificate: "\f0a3";
-@fa-var-hand-o-right: "\f0a4";
-@fa-var-hand-o-left: "\f0a5";
-@fa-var-hand-o-up: "\f0a6";
-@fa-var-hand-o-down: "\f0a7";
-@fa-var-arrow-circle-left: "\f0a8";
-@fa-var-arrow-circle-right: "\f0a9";
-@fa-var-arrow-circle-up: "\f0aa";
-@fa-var-arrow-circle-down: "\f0ab";
-@fa-var-globe: "\f0ac";
-@fa-var-wrench: "\f0ad";
-@fa-var-tasks: "\f0ae";
-@fa-var-filter: "\f0b0";
-@fa-var-briefcase: "\f0b1";
-@fa-var-arrows-alt: "\f0b2";
-@fa-var-users: "\f0c0";
-@fa-var-link: "\f0c1";
-@fa-var-cloud: "\f0c2";
-@fa-var-flask: "\f0c3";
-@fa-var-scissors: "\f0c4";
-@fa-var-files-o: "\f0c5";
-@fa-var-paperclip: "\f0c6";
-@fa-var-floppy-o: "\f0c7";
-@fa-var-square: "\f0c8";
-@fa-var-bars: "\f0c9";
-@fa-var-list-ul: "\f0ca";
-@fa-var-list-ol: "\f0cb";
-@fa-var-strikethrough: "\f0cc";
-@fa-var-underline: "\f0cd";
-@fa-var-table: "\f0ce";
-@fa-var-magic: "\f0d0";
-@fa-var-truck: "\f0d1";
-@fa-var-pinterest: "\f0d2";
-@fa-var-pinterest-square: "\f0d3";
-@fa-var-google-plus-square: "\f0d4";
-@fa-var-google-plus: "\f0d5";
-@fa-var-money: "\f0d6";
-@fa-var-caret-down: "\f0d7";
-@fa-var-caret-up: "\f0d8";
-@fa-var-caret-left: "\f0d9";
-@fa-var-caret-right: "\f0da";
-@fa-var-columns: "\f0db";
-@fa-var-sort: "\f0dc";
-@fa-var-sort-asc: "\f0dd";
-@fa-var-sort-desc: "\f0de";
-@fa-var-envelope: "\f0e0";
-@fa-var-linkedin: "\f0e1";
-@fa-var-undo: "\f0e2";
-@fa-var-gavel: "\f0e3";
-@fa-var-tachometer: "\f0e4";
-@fa-var-comment-o: "\f0e5";
-@fa-var-comments-o: "\f0e6";
-@fa-var-bolt: "\f0e7";
-@fa-var-sitemap: "\f0e8";
-@fa-var-umbrella: "\f0e9";
-@fa-var-clipboard: "\f0ea";
-@fa-var-lightbulb-o: "\f0eb";
-@fa-var-exchange: "\f0ec";
-@fa-var-cloud-download: "\f0ed";
-@fa-var-cloud-upload: "\f0ee";
-@fa-var-user-md: "\f0f0";
-@fa-var-stethoscope: "\f0f1";
-@fa-var-suitcase: "\f0f2";
-@fa-var-bell-o: "\f0a2";
-@fa-var-coffee: "\f0f4";
-@fa-var-cutlery: "\f0f5";
-@fa-var-file-text-o: "\f0f6";
-@fa-var-building-o: "\f0f7";
-@fa-var-hospital-o: "\f0f8";
-@fa-var-ambulance: "\f0f9";
-@fa-var-medkit: "\f0fa";
-@fa-var-fighter-jet: "\f0fb";
-@fa-var-beer: "\f0fc";
-@fa-var-h-square: "\f0fd";
-@fa-var-plus-square: "\f0fe";
-@fa-var-angle-double-left: "\f100";
-@fa-var-angle-double-right: "\f101";
-@fa-var-angle-double-up: "\f102";
-@fa-var-angle-double-down: "\f103";
-@fa-var-angle-left: "\f104";
-@fa-var-angle-right: "\f105";
-@fa-var-angle-up: "\f106";
-@fa-var-angle-down: "\f107";
-@fa-var-desktop: "\f108";
-@fa-var-laptop: "\f109";
-@fa-var-tablet: "\f10a";
-@fa-var-mobile: "\f10b";
-@fa-var-circle-o: "\f10c";
-@fa-var-quote-left: "\f10d";
-@fa-var-quote-right: "\f10e";
-@fa-var-spinner: "\f110";
-@fa-var-circle: "\f111";
-@fa-var-reply: "\f112";
-@fa-var-github-alt: "\f113";
-@fa-var-folder-o: "\f114";
-@fa-var-folder-open-o: "\f115";
-@fa-var-smile-o: "\f118";
-@fa-var-frown-o: "\f119";
-@fa-var-meh-o: "\f11a";
-@fa-var-gamepad: "\f11b";
-@fa-var-keyboard-o: "\f11c";
-@fa-var-flag-o: "\f11d";
-@fa-var-flag-checkered: "\f11e";
-@fa-var-terminal: "\f120";
-@fa-var-code: "\f121";
-@fa-var-reply-all: "\f122";
-@fa-var-mail-reply-all: "\f122";
-@fa-var-star-half-o: "\f123";
-@fa-var-location-arrow: "\f124";
-@fa-var-crop: "\f125";
-@fa-var-code-fork: "\f126";
-@fa-var-chain-broken: "\f127";
-@fa-var-question: "\f128";
-@fa-var-info: "\f129";
-@fa-var-exclamation: "\f12a";
-@fa-var-superscript: "\f12b";
-@fa-var-subscript: "\f12c";
-@fa-var-eraser: "\f12d";
-@fa-var-puzzle-piece: "\f12e";
-@fa-var-microphone: "\f130";
-@fa-var-microphone-slash: "\f131";
-@fa-var-shield: "\f132";
-@fa-var-calendar-o: "\f133";
-@fa-var-fire-extinguisher: "\f134";
-@fa-var-rocket: "\f135";
-@fa-var-maxcdn: "\f136";
-@fa-var-chevron-circle-left: "\f137";
-@fa-var-chevron-circle-right: "\f138";
-@fa-var-chevron-circle-up: "\f139";
-@fa-var-chevron-circle-down: "\f13a";
-@fa-var-html5: "\f13b";
-@fa-var-css3: "\f13c";
-@fa-var-anchor: "\f13d";
-@fa-var-unlock-alt: "\f13e";
-@fa-var-bullseye: "\f140";
-@fa-var-ellipsis-h: "\f141";
-@fa-var-ellipsis-v: "\f142";
-@fa-var-rss-square: "\f143";
-@fa-var-play-circle: "\f144";
-@fa-var-ticket: "\f145";
-@fa-var-minus-square: "\f146";
-@fa-var-minus-square-o: "\f147";
-@fa-var-level-up: "\f148";
-@fa-var-level-down: "\f149";
-@fa-var-check-square: "\f14a";
-@fa-var-pencil-square: "\f14b";
-@fa-var-external-link-square: "\f14c";
-@fa-var-share-square: "\f14d";
-@fa-var-compass: "\f14e";
-@fa-var-caret-square-o-down: "\f150";
-@fa-var-caret-square-o-up: "\f151";
-@fa-var-caret-square-o-right: "\f152";
-@fa-var-eur: "\f153";
-@fa-var-gbp: "\f154";
-@fa-var-usd: "\f155";
-@fa-var-inr: "\f156";
-@fa-var-jpy: "\f157";
-@fa-var-rub: "\f158";
-@fa-var-krw: "\f159";
-@fa-var-btc: "\f15a";
-@fa-var-file: "\f15b";
-@fa-var-file-text: "\f15c";
-@fa-var-sort-alpha-asc: "\f15d";
-@fa-var-sort-alpha-desc: "\f15e";
-@fa-var-sort-amount-asc: "\f160";
-@fa-var-sort-amount-desc: "\f161";
-@fa-var-sort-numeric-asc: "\f162";
-@fa-var-sort-numeric-desc: "\f163";
-@fa-var-thumbs-up: "\f164";
-@fa-var-thumbs-down: "\f165";
-@fa-var-youtube-square: "\f166";
-@fa-var-youtube: "\f167";
-@fa-var-xing: "\f168";
-@fa-var-xing-square: "\f169";
-@fa-var-youtube-play: "\f16a";
-@fa-var-dropbox: "\f16b";
-@fa-var-stack-overflow: "\f16c";
-@fa-var-instagram: "\f16d";
-@fa-var-flickr: "\f16e";
-@fa-var-adn: "\f170";
-@fa-var-bitbucket: "\f171";
-@fa-var-bitbucket-square: "\f172";
-@fa-var-tumblr: "\f173";
-@fa-var-tumblr-square: "\f174";
-@fa-var-long-arrow-down: "\f175";
-@fa-var-long-arrow-up: "\f176";
-@fa-var-long-arrow-left: "\f177";
-@fa-var-long-arrow-right: "\f178";
-@fa-var-apple: "\f179";
-@fa-var-windows: "\f17a";
-@fa-var-android: "\f17b";
-@fa-var-linux: "\f17c";
-@fa-var-dribbble: "\f17d";
-@fa-var-skype: "\f17e";
-@fa-var-foursquare: "\f180";
-@fa-var-trello: "\f181";
-@fa-var-female: "\f182";
-@fa-var-male: "\f183";
-@fa-var-gittip: "\f184";
-@fa-var-sun-o: "\f185";
-@fa-var-moon-o: "\f186";
-@fa-var-archive: "\f187";
-@fa-var-bug: "\f188";
-@fa-var-vk: "\f189";
-@fa-var-weibo: "\f18a";
-@fa-var-renren: "\f18b";
-@fa-var-pagelines: "\f18c";
-@fa-var-stack-exchange: "\f18d";
-@fa-var-arrow-circle-o-right: "\f18e";
-@fa-var-arrow-circle-o-left: "\f190";
-@fa-var-caret-square-o-left: "\f191";
-@fa-var-dot-circle-o: "\f192";
-@fa-var-wheelchair: "\f193";
-@fa-var-vimeo-square: "\f194";
-@fa-var-try: "\f195";
-@fa-var-plus-square-o: "\f196";
-
diff --git a/app/assets/stylesheets/pane_hover.scss b/app/assets/stylesheets/pane_hover.scss
index 3c09c50..8498384 100644
--- a/app/assets/stylesheets/pane_hover.scss
+++ b/app/assets/stylesheets/pane_hover.scss
@@ -17,7 +17,7 @@
     text-align:right;
     padding:5px;
     border-top :1px solid rgba(127,127,127,0.2);
-    
+    background: #f8f8f8;
   
   }
   
diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss
new file mode 100644
index 0000000..2806351
--- /dev/null
+++ b/app/assets/stylesheets/public.scss
@@ -0,0 +1,559 @@
+
+@import "jquery.bxslider";
+
+@import "fontawesome/font-awesome";
+
+iframe{
+  margin:auto;
+  width:100%;
+  
+}
+
+a{
+  img{
+    
+    border:0;
+  }
+  
+}
+
+body{
+  font-family:Lato;
+  font-weight:300;
+  line-height:1.4em;
+  text-align:justify;
+  
+  padding:0;
+  margin:0;
+  font-size:14px;
+  color:#333333;
+  
+  
+}
+
+img{
+  max-width:100%;
+  
+}
+ 
+a{
+  color:rgba(66,139,202,1);
+  text-decoration:none;
+  
+  &:hover{
+  color:#68b9ff;
+
+  }
+ 
+}
+
+.clear{
+  clear:both;
+}
+ 
+#large{
+  display:none;
+  position:fixed;
+  top:0;
+  left:0;
+  width:100%;
+  height:100%;
+  background:rgba(0,0,0,0.8);
+  z-index:10;
+
+   h3{
+     color:white;
+     text-align:center;
+     margin-top:5px;
+     margin-bottom:0;
+     font-weight:300;
+     font-size:0.95em;
+ 
+   }
+  .next, .prev{
+    width:20px;
+    position:absolute;
+    top:50%;
+    transform:translateY(-50%);
+    cursor:pointer;
+
+  }
+  .prev{
+    left:15px;
+  }
+  .next{
+    right:15px;
+  }
+ 
+  .img_container{
+    height:100%;
+    width:100%;
+    box-sizing: border-box;
+
+   .large-img{
+      cursor:pointer;
+      padding:10px;
+      background:rgba(250, 250, 250, 0.9);
+      display:block;
+      margin:auto;
+    }
+  }
+}
+
+
+
+.rea-gal{
+  padding-left:0px;
+
+  margin-right:-5px;
+  margin-bottom:-5px;
+  img{
+  padding-right:5px;
+  padding-bottom:5px;
+    width:200px;
+    float:left;
+    box-sizing: border-box;
+    &:hover{
+      opacity:0.8;
+      
+    }
+  }
+}
+
+
+ 
+
+
+
+
+
+.row{
+
+margin:auto;
+//max-width:1100px;
+display:block;
+
+
+&:after{
+content: "";
+  display: table;
+  clear: both;
+
+}
+
+.columns{
+
+
+display:block;
+
+box-sizing: border-box;
+float:left;
+display:inline-block;
+padding:0 5px;
+
+&:first-child{
+padding-left:0px;
+
+}
+&:last-child{
+padding-right:0px;
+
+}
+
+&.span_12{
+width:100%;
+
+}
+
+&.span_11{
+width:100/12*11;
+
+}
+&.span_10{
+width:percentage(1/12*10);
+
+}
+&.span_9{
+width:percentage(1/12*9);
+
+}
+&.span_8{
+width:percentage(1/12*8);
+
+}
+&.span_7{
+width:percentage(1/12*7);
+
+}
+
+&.span_6{
+width:percentage(1/12*6);
+
+}
+&.span_5{
+width:percentage(1/12*5);
+
+}
+&.span_4{
+width:percentage(1/12*4);
+
+}
+&.span_3{
+width:percentage(1/12*3);
+
+}
+&.span_2{
+width:percentage(1/12*2);
+
+}
+
+&.span_1{
+width:percentage(1/12*1);
+
+}
+
+
+}
+}
+.main{
+width:100%;
+max-width:1020px;
+position:relative;
+margin:auto;
+
+}
+
+
+
+#slider_content{
+  position:relative;
+  min-height:50px;
+  
+}
+.top{
+  #logo{
+  width:185px;
+  position:absolute;
+  bottom:0;
+  left:40px;
+  
+  
+
+  }
+  
+  height:50px;
+  width:100%;
+
+  margin:auto;
+
+  
+  position:absolute;
+  bottom:0px;
+  right:0;
+  left:0;
+  background:rgba(250,250,250,0.8);
+  z-index:3;
+  box-shadow:0 0 5px rgba(0,0,0,0.5);
+
+  #menu{
+    margin-right:40px;
+    margin-top:14px;
+    font-size:14px;
+  text-align:right;
+  text-transform:uppercase;
+
+  a{
+  
+    margin:0;
+  
+  display: inline-block;
+  color:#4d4d4d;
+  text-decoration: none;
+
+
+  padding: 2px 10px;
+
+  margin-right:5px;
+
+
+
+  &:hover, &.active{
+
+    color:black;
+  }
+
+  &:last-child{
+    margin-right:0;
+  
+  }
+
+
+  }
+  }
+  
+  
+}
+
+#main{
+  width:100%;
+  max-width:1200px;
+  margin:auto;
+  
+  #corps{
+    width:68%;
+    float:left;
+    
+    
+    
+  }
+  #sidebar{
+    width:30%;
+    float:right;
+    
+    
+  }
+  
+}
+$header_font : "Source sans pro";
+
+.top_background{
+  
+  
+  min-height:150px;
+  ;
+  
+}
+.dark_background{
+background:rgba(40,40,40,1);
+padding-top:3em;
+color:#F2F2F2;
+}
+
+.gray_light_background{
+background:rgba(91,92,94,1);
+}
+
+
+.blue_background{
+background:rgba(0,162,216,1);
+}
+
+.yellow_background{
+background:rgba(248,164,40,1);
+}
+
+.green_background{
+background:rgba(176,201,49,1);
+}
+
+.rose_background{
+background:rgba(230,0,125,1);
+}
+.content_center{
+text-align:center;
+}
+
+
+
+
+h1,h2,h3,h4{
+  text-align:left;
+font-weight: 400;
+font-family:$header_font;
+a{
+  color:black;
+  
+}
+
+}
+.date{
+  margin-top:10px;
+  margin-bottom:-20px;
+  font-size:18px;
+  font-family:$header_font;
+}
+h1{
+  font-size:30px;
+  
+}
+.share{
+  
+  font-size:16px;
+  a{
+    padding:0 10px;
+    
+  }
+}
+
+.bottom{
+
+
+  background:white;
+  background:rgba(250,250,250,0.8);
+  font-size:0.8em;
+  padding:0.7em 1em;
+  margin-top:120px;
+  
+  img{
+
+    
+    float:right;
+    height:19px;
+    margin:0;
+
+    
+  }
+}
+
+.close_link{
+  position:fixed;
+  top:10px;
+  right:10px;
+  width:40px;
+  cursor:pointer;
+  
+}
+
+a{
+
+    .event{
+      color:black;
+      padding:10px;
+      margin-top:10px;
+      .date{
+        margin-top:0px;
+      
+      }
+      p{
+        margin-top:0px;
+      
+      }
+      background:white;
+      background:rgba(250,250,250,0.8);
+    
+      &:hover{
+        background:white;
+        
+      }
+    }
+
+}
+#corps{
+  .event{
+    
+    img{
+      
+      float:left;
+      margin-right:10px;
+    }
+  }
+  
+}
+h3{
+  
+  font-size:1.5em;
+  margin-bottom:5px;
+  padding-bottom:0px;
+  
+}
+article{
+  margin-bottom:6em;
+  
+}
+
+.articles_button, .share a{
+  color:black;
+  float:right;
+  padding:0.7em 1em;
+  display:block;
+  background:white;
+  background:rgba(250,250,250,0.8);
+  margin-left:10px;
+  &:hover{
+    
+    background:white;
+    color:black;
+    
+  }
+  
+}
+
+.main_section_title{
+  
+  border-bottom:#C4C4C4 1px solid;
+  padding:5px 0;
+  padding-top:10px;
+  margin-bottom:10px;
+  a{
+    text-decoration:none;
+    color:#1a1a1a;
+    font-size:15px;
+    
+  }
+  
+}
+
+
+.first_article{
+  
+  .image{
+    float:left;
+    width:65%;
+    img{
+      
+      display:block;
+    }
+    margin-bottom:5px;
+    
+  }
+  .description{
+    width:34%;
+    float:left;
+    font-family:arial;
+    p{
+      margin-left:10px;
+      
+    }
+    h1{
+      margin:0;
+      padding:0;
+      margin-left:10px;
+      margin-bottom:10px;
+      margin-top:20px;
+      color:#69952f;
+      text-transform:uppercase;
+      font-weight:bold;
+      font-size:22px;
+      line-height:24px;
+      font-family:$header_font;
+    }
+    
+  }
+  
+}
+
+.articles{
+  .image{
+    width:15%;
+    float:left;
+    background:#69952f;
+    height:80px;
+    overflow:hidden;
+    margin-bottom:5px;
+  }
+  .description{
+    width:35%;
+    float:left;
+    height:80px;
+    margin-bottom:5px;
+  }
+  h2{
+    
+    color:#333333;
+    font-weight:bold;
+    font-size:16px;
+    padding-left:10px;
+    font-family:$header_font;
+  }
+  
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/redactor.css b/app/assets/stylesheets/redactor.css
index 6dcd138..9f2da53 100755
--- a/app/assets/stylesheets/redactor.css
+++ b/app/assets/stylesheets/redactor.css
@@ -17,6 +17,7 @@
 .redactor-box {
   position: relative;
   overflow: visible;
+  background: #fff;
   margin-bottom: 24px;
 }
 .redactor-box iframe,
@@ -48,10 +49,6 @@
 	Z-index setup
 */
 .redactor-editor,
-.redactor-box {
-  background: #fff;
-}
-.redactor-editor,
 .redactor-box,
 .redactor-box textarea {
   z-index: auto !important;
@@ -61,12 +58,12 @@
 }
 .redactor-toolbar,
 .redactor-dropdown {
-  z-index: 1053 !important;
+  z-index: 1050 !important;
 }
 #redactor-modal-overlay,
 #redactor-modal-box,
 #redactor-modal {
-  z-index: 1054 !important;
+  z-index: 1051 !important;
 }
 /*
 	Resize
@@ -93,26 +90,14 @@ body .redactor-box-fullscreen {
   left: 0;
   width: 100%;
 }
-/*
-	Utils
-*/
-.body-hidden {
-  overflow: hidden;
-}
 /*
 	Editor
 */
 .redactor-editor {
   position: relative;
-  overflow: auto;
   margin: 0 !important;
-  padding: 20px;
-  outline: none;
-  white-space: normal;
-  border: 1px solid #eee;
-  font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif;
-  font-size: 14px;
-  line-height: 1.6em;
+  
+  
 }
 .redactor-editor:focus {
   outline: none;
@@ -348,7 +333,7 @@ body .redactor-box-fullscreen {
 */
 .redactor-toolbar-tooltip {
   position: absolute;
-  z-index: 1054;
+  z-index: 100;
   text-align: center;
   top: 0;
   left: 0;
@@ -770,161 +755,3 @@ body .redactor-box-fullscreen {
   line-height: 23px;
   font-weight: bold;
 }
-/*
-	##############################################
-
-	 CONTENT STYLES
-
-	##############################################
-*/
-.redactor-editor code,
-.redactor-editor pre {
-  font-family: Menlo, Monaco, monospace, sans-serif;
-}
-.redactor-editor div,
-.redactor-editor p,
-.redactor-editor ul,
-.redactor-editor ol,
-.redactor-editor table,
-.redactor-editor dl,
-.redactor-editor blockquote,
-.redactor-editor pre {
-  font-size: 14px;
-  line-height: 1.6em;
-}
-.redactor-editor a {
-  color: #15c;
-  text-decoration: underline;
-}
-.redactor-editor object,
-.redactor-editor embed,
-.redactor-editor video,
-.redactor-editor img {
-  max-width: 100%;
-  width: auto;
-}
-.redactor-editor video,
-.redactor-editor img {
-  height: auto;
-}
-.redactor-editor div,
-.redactor-editor p,
-.redactor-editor ul,
-.redactor-editor ol,
-.redactor-editor table,
-.redactor-editor dl,
-.redactor-editor figure,
-.redactor-editor blockquote,
-.redactor-editor pre {
-  margin: 0;
-  margin-bottom: 15px;
-  border: none;
-  background: none;
-  box-shadow: none;
-}
-.redactor-editor iframe,
-.redactor-editor object,
-.redactor-editor hr {
-  margin-bottom: 15px;
-}
-.redactor-editor iframe {
-  width: auto;
-}
-.redactor-editor blockquote {
-  margin-left: 1.6em !important;
-  padding-left: 0;
-  color: #777;
-  font-style: italic;
-}
-.redactor-editor ul,
-.redactor-editor ol {
-  padding-left: 2em;
-}
-.redactor-editor ul ul,
-.redactor-editor ol ol,
-.redactor-editor ul ol,
-.redactor-editor ol ul {
-  margin: 2px;
-  padding: 0;
-  padding-left: 2em;
-  border: none;
-}
-.redactor-editor dl dt {
-  font-weight: bold;
-}
-.redactor-editor dd {
-  margin-left: 1em;
-}
-.redactor-editor table {
-  border-collapse: collapse;
-  font-size: 1em;
-  width: 100%;
-}
-.redactor-editor table td,
-.redactor-editor table th {
-  padding: 5px;
-  border: 1px solid #ddd;
-  vertical-align: top;
-}
-.redactor-editor table thead td,
-.redactor-editor table th {
-  font-weight: bold;
-  border-bottom-color: #888;
-}
-.redactor-editor code {
-  background-color: #d8d7d7;
-}
-.redactor-editor pre {
-  overflow: auto;
-  padding: 1em;
-  border: 1px solid #ddd;
-  border-radius: 3px;
-  background: #f8f8f8;
-  white-space: pre;
-  font-size: 90%;
-}
-.redactor-editor hr {
-  display: block;
-  height: 1px;
-  border: 0;
-  border-top: 1px solid #ccc;
-}
-.redactor-editor h1,
-.redactor-editor h2,
-.redactor-editor h3,
-.redactor-editor h4,
-.redactor-editor h5,
-.redactor-editor h6 {
-  font-weight: bold;
-  color: #000;
-  padding: 0;
-  background: none;
-  text-rendering: optimizeLegibility;
-  margin: 0 0 .5em 0;
-}
-.redactor-editor h1,
-.redactor-editor h2,
-.redactor-editor h3,
-.redactor-editor h4 {
-  line-height: 1.3;
-}
-.redactor-editor h1 {
-  font-size: 36px;
-}
-.redactor-editor h2 {
-  font-size: 24px;
-  margin-bottom: .7em;
-}
-.redactor-editor h3 {
-  font-size: 21px;
-}
-.redactor-editor h4 {
-  font-size: 18px;
-}
-.redactor-editor h5 {
-  font-size: 16px;
-}
-.redactor-editor h6 {
-  font-size: 12px;
-  text-transform: uppercase;
-}
diff --git a/app/controllers/admin/admin_auths_controller.rb b/app/controllers/admin/admin_auths_controller.rb
new file mode 100644
index 0000000..fbac5a1
--- /dev/null
+++ b/app/controllers/admin/admin_auths_controller.rb
@@ -0,0 +1,38 @@
+# -*- encoding : utf-8 -*-
+class Admin::AdminAuthsController < ApplicationController
+  layout "connexion"
+  before_filter :auth_admin, :only => :index
+  
+  def index
+    render :layout => "admin"
+  end
+  
+  def new
+  end
+
+  def create
+    user = Admin.find_by_login(params[:login])
+    
+    
+    if user && user.authenticate(params[:password])
+      
+      if params[:remember_me]
+        cookies.permanent[:admin_remember_token] = user.remember_token
+      else
+        cookies[:admin_remember_token] = user.remember_token
+      end
+      
+  
+      redirect_to "/admin", notice: "Vous êtes connecté !"
+    else
+      flash.now.alert = "Email ou mot de passe incorect"
+      render "new"
+    end
+  end
+
+  def logout
+    cookies.delete(:admin_remember_token)
+
+    redirect_to "/", notice: "Vous êtes déconnecté."
+  end
+end
diff --git a/app/controllers/admin/admins_controller.rb b/app/controllers/admin/admins_controller.rb
index ce4a946..96d9191 100644
--- a/app/controllers/admin/admins_controller.rb
+++ b/app/controllers/admin/admins_controller.rb
@@ -1,109 +1,67 @@
-# -*- encoding : utf-8 -*-
-
 class Admin::AdminsController < ApplicationController
-	
-	
-	before_filter :authenticate_admin!
-	layout "admin"
-	
-#	navigation :admins
-
+  layout "admin"
   
-	def index
+  before_filter :auth_admin
+  
+  def index
+    
+    @admins = Admin.all
+  end
 
-		
-		@breadcrumb = ["liste des administrateurs"]
-		
-		#@order = magick_order("email", "DESC")
 
-		@admins = Admin.all
+  def show
+    @admin = Admin.find(params[:id])
+
+  end
+
+
+  def new
+    @admin = Admin.new
+  
+  end
+
+  def edit
+    @admin = Admin.find(params[:id])
+  
+  end
+
+  def create
+    @admin = Admin.new(admin_params)
+    
+    if @admin.save
+      @admins = Admin.all
+          
+    else
+      render :action => "new" 
+    end
+  end
+
+  def update
+    @admin = Admin.find(params[:id])
+    
+    if @admin.update_attributes(admin_params)
+
+          
+    else
+      render :action => "edit" 
+    end
+    
+  end
+      
+
+
+  def destroy
+    @admin = Admin.find(params[:id])
+    
+    @admin.destroy if @admin != @current_admin
+  
+  end
+  
+  private
+      def admin_params
+        params.require(:admin).permit(:name, :firstname, :username, :password, :password_confirmation, :email, :avatar)
+      end
 
-	
-	end
 
-def show
-@admin = Admin.find(params[:id])
 
-respond_to do |format|
-format.html 
-end
-end
-
-
-	def new
-		@breadcrumb = [["liste des administrateurs", admin_admins_path],"Ajouter un administrateur"]
-		@admin = Admin.new
-
-		respond_to do |format|
-	
-			format.js
-		end
-	end
-
-	def edit
-		@breadcrumb = [["liste des administrateurs", admin_admins_path],"Modifier un administrateur"]
-		@admin = Admin.find(params[:id])
-	end
-
-
-	def create
-		@admin = Admin.new(params.require(:admin).permit!)
-
-		respond_to do |format|
-			if @admin.save
-				flash[:notice] = "L'administrateur "+@admin.email.to_s+" à été ajouté avec succès."
-				format.html { redirect_to(admin_admins_path) }
-				format.js
-			else
-				format.html { render :action => "new" }
-				format.js { render :action => "new" }
-			end
-		end
-	end
-
-	def update
-		@breadcrumb = [["liste des administrateurs", admin_admins_path],"Modifier un administrateur"]
-		
-		@admin = Admin.find(params[:id])
-		
-		if params[:admin][:password] == ""
-			params[:admin].delete(:password)
-			params[:admin].delete(:password_confirmation)
-		end
-		
-		respond_to do |format|
-			if @admin.update_attributes(params.require(:admin).permit!)
-				
-				flash[:notice] = "L'administrateur "+@admin.email.to_s+" à été modifié avec succès."
-				format.html { redirect_to(admin_admins_path) }
-				format.js
-			else
-				format.html { render :action => "edit" }
-				format.js { render :action => "edit" }
-			end
-		end
-	end
-
-
-	def destroy
-		@admin = Admin.find(params[:id])
-	
-		if @admin == current_admin
-			respond_to do |format|
-				format.html {
-					redirect_to(admin_admins_url, :alert  => "Vous ne pouvez pas supprimer l'administrateur actuellement connecté.")
-				}
-			end
-		else
-			@admin.destroy
-
-			respond_to do |format|
-				format.html { 
-					redirect_to(admin_admins_url, :notice  => "L'utilisateur "+@admin.email.to_s+" à bien été supprimé.") 
-				}
-			end 
-
-		end
-
-	end
 end
diff --git a/app/controllers/admin/albums_controller.rb b/app/controllers/admin/albums_controller.rb
new file mode 100644
index 0000000..eaa0b8c
--- /dev/null
+++ b/app/controllers/admin/albums_controller.rb
@@ -0,0 +1,43 @@
+# -*- encoding : utf-8 -*-
+class Admin::AlbumsController < ApplicationController
+
+  def new
+    @album = Album.new()
+  end
+
+  def create
+    @album = Album.new(params.require(:album).permit!)
+    @album_create = true
+    
+    if @album.save
+      @albums = Album.all.order(:name)
+    else
+      render :action => :new
+    
+    end
+  end
+
+  def edit
+    @album = Album.find(params[:id])  
+  end
+
+  def update
+    @album = Album.find(params[:id])
+    @album_update = true
+    
+    if @album.update_attributes(params.require(:album).permit!)
+      @albums = Album.all(:order => :name)
+    else
+      render :action => :edit
+    
+    end
+  end
+
+  def destroy
+    @album = Album.find(params[:id])
+    if @album.id != 1
+      @album.delete
+    end
+  end
+
+end
diff --git a/app/controllers/admin/articles_controller.rb b/app/controllers/admin/articles_controller.rb
new file mode 100644
index 0000000..1c57b9f
--- /dev/null
+++ b/app/controllers/admin/articles_controller.rb
@@ -0,0 +1,124 @@
+# -*- encoding : utf-8 -*-
+
+class Admin::ArticlesController < ApplicationController
+
+	before_filter :auth_admin
+	
+	layout "admin"
+	
+
+
+	before_filter :find_articles
+
+	def index 
+
+	end
+
+
+	def cible
+		
+		render :layout => false
+		
+	end
+	
+	
+	def new
+	
+		@article = Article.new(:published_at => Time.now)
+
+	end
+
+
+	def edit
+	
+		@article = Article.find(params[:id])
+    
+		
+	end
+
+
+	def create
+		
+		@article = Article.new(article_params)
+
+		
+		if @article.save
+			flash[:notice] = "L'article à été ajouté avec succès."
+			self.find_articles
+		
+		else
+			render :action => "new" 
+
+		end
+
+	end
+
+
+	def update
+	
+		@article = Article.find(params[:id])
+	
+  
+    if params[:article]
+  		if @article.update_attributes(article_params)
+  			flash[:notice] = "L'article à été modifié avec succès."
+  		else
+  			render :action => "edit"
+  		end
+      
+      
+    elsif params[:tag_id]
+      @article.tag_by_tag_ids(params[:tag_id])
+    end
+    
+  
+  
+		
+	end
+
+
+	def destroy
+	
+		@article = Article.find(params[:id])
+		@article.destroy
+
+	end
+	
+	protected
+	
+	def find_articles
+		date_regex = /^(0[1-9]|[12][0-9]|3[01])[\/](0[1-9]|1[012])[\/](19|20)\d\d$/i 
+		if params[:start] and params[:start] =~ date_regex
+			start = Date.parse(params[:start]).beginning_of_day 
+			params[:start]= start.strftime('%d/%m/%Y')
+		else
+			params[:start] = ""
+		end
+		if params[:stop] and params[:stop] =~ date_regex
+			stop = Date.parse(params[:stop]).end_of_day 
+			params[:stop]= stop.strftime('%d/%m/%Y')
+		 else
+		 	params[:stop] = ""
+		end
+		
+		@articles = Article.order('published_at DESC')
+		@articles = @articles.after(start) if start
+		@articles = @articles.before(stop) if stop
+		per_page = (params[:per_page] and params[:per_page] != "") ? params[:per_page] : 5000
+		page = (params[:page] and params[:page] != "") ? params[:page] : 1 
+		@articles = @articles.page(page).per(per_page)
+
+		#@articles = Event.order('start_at, stop_at').after(start).before(stop)
+	end
+	
+  private
+    def article_params
+      params.require(:article).permit(:category_id, :enabled, :published_at, :title, :slug, :tags_cache, :description, :image_file_id, :title_cached)
+      
+  
+      
+      
+    end
+
+  
+end
diff --git a/app/controllers/admin/blocks_controller.rb b/app/controllers/admin/blocks_controller.rb
new file mode 100644
index 0000000..93b46a8
--- /dev/null
+++ b/app/controllers/admin/blocks_controller.rb
@@ -0,0 +1,28 @@
+# -*- encoding : utf-8 -*-
+class Admin::BlocksController < ApplicationController
+    before_filter :auth_admin
+
+  
+  layout "admin"
+  
+  def edit
+    @block = Block.find(params[:id])
+  if request.xhr?
+    render :layout => false
+  end
+
+  end
+
+  def show
+    @block = Block.find(params[:id])
+  
+  if request.xhr?
+    render :layout => false
+  end
+
+  end
+  
+  
+  
+  
+end
diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb
new file mode 100644
index 0000000..0b9276b
--- /dev/null
+++ b/app/controllers/admin/categories_controller.rb
@@ -0,0 +1,170 @@
+# -*- encoding : utf-8 -*-
+
+class Admin::CategoriesController < ApplicationController
+	before_filter :auth_admin
+
+	layout "admin"
+
+
+	before_filter :find_categories
+
+
+	def index 
+
+	end
+
+
+  def reorder
+
+    i = 1
+    
+    
+    params[:categories_ids].each do |id|
+      
+
+      category = Category.find(id)
+      category.position = i
+      puts i
+      category.update_attributes :position => i
+      
+      i = i + 1
+      
+      
+    end
+    
+		if params[:menu_id] and params[:menu_id] != "" and @menu = Menu.find(params[:menu_id])
+			
+      find_categories
+    end
+    
+    flash[:success] = "Menus réorganisés avec succcès."
+    
+   
+    
+  end
+
+
+	def cible
+		@categories = Category.all
+
+		render :layout => false
+	end
+
+	
+	def new
+		@category = Category.new(:parent_id => params[:parent_id])
+
+	end
+
+	def edit
+		@category = Category.find(params[:id])
+	end
+
+
+	def create
+		@category = Category.new(params.require(:category).permit!)
+
+
+		if @category.save
+      params[:parent_id] =@category.parent_id
+      
+			self.find_categories
+			flash[:notice] = "La catégorie à été ajouté avec succès."
+		
+
+		else
+			render :action => "new" 
+		
+		end
+	
+	end
+	
+
+	def update
+		@category = Category.find(params[:id])
+
+		
+		
+		
+		if request.xhr?
+			@category_parent = @category.parent if @category.parent
+			@categories = Category.where(:parent_id => @category.parent_id).order(:position)
+		end
+	
+		if params[:category][:parent_id] and params[:category][:parent_id] == "no-menu-selected"
+			params[:category][:parent_id] = nil
+		end
+		
+		@reorder = true if params[:reorder]
+		
+
+		
+		
+	
+		
+		
+		respond_to do |format|
+			if @category.update_attributes(params.require(:category).permit!)
+				
+				#Category.all.each do |mi|
+				#	mi.set_permalink
+				
+				#end
+			
+				flash[:notice] = "Le menu à été modifié avec succès."
+				format.html { redirect_to(admin_categories_path(:parent_id => @category.parent_id)) }
+				if @reorder
+					format.js { 
+						
+						render :action => "update" }
+				else
+					format.js { 
+					   @category = Category.find(@category.id)
+						render :action => "update_row" }
+				end
+			else
+				
+				flash[:error] = "Cet élément de menu n'a pas pu être déplacé. Vérifiez que son lien permanent n'éxiste pas déjà dans l'élément cible."
+				if @reorder
+					format.js { render :action => "update_reorder_failled" }
+				else
+					format.html { render :action => "edit" }
+					format.js { render :action => "edit" }
+				end
+				
+				
+			end
+		end
+    
+    
+    
+    
+
+	end
+
+
+	def destroy
+		@category = Category.find(params[:id])
+    params[:parent_id] = @category.parent_id
+		@category.destroy
+    find_categories
+  
+    flash[:notice] = "La catégorie à bien été supprimée."
+	end
+	
+	
+	protected
+	
+	def find_categories    
+    params[:parent_id] = nil if !params[:parent_id] or params[:parent_id] == ""
+			
+		@category_parent = Category.find(params[:parent_id]) if params[:parent_id]
+    
+    
+    @categories = Category.where(:parent_id => params[:parent_id]).order("position ASC")
+		
+
+	
+  end
+  
+end
diff --git a/app/controllers/admin/cibles_controller.rb b/app/controllers/admin/cibles_controller.rb
new file mode 100644
index 0000000..0e9b918
--- /dev/null
+++ b/app/controllers/admin/cibles_controller.rb
@@ -0,0 +1,24 @@
+# -*- encoding : utf-8 -*-
+class Admin::CiblesController < ApplicationController
+  before_filter :auth_admin
+  layout false
+
+  def index
+    @cible_type = params[:cible_type] || "MenuItem"
+    @cible_id = params[:cible_id] || nil
+  end
+  
+  def new
+  @resource = params[:resource_type].to_s.constantize.new()
+  
+  @resource.cible = params[:cible_type].to_s.constantize.new()
+  
+  if params[:resource_type] == "LinkContent"
+    @namespace = :portlet
+  else
+    @namespace = :admin
+  end
+  
+  end
+
+end
diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb
new file mode 100644
index 0000000..43ed5f2
--- /dev/null
+++ b/app/controllers/admin/comments_controller.rb
@@ -0,0 +1,52 @@
+# -*- encoding : utf-8 -*-
+
+class Admin::CommentsController < ApplicationController
+
+	before_filter :auth_admin
+
+	layout "admin"
+	
+
+
+	before_filter :find_comments
+
+
+	def index 
+
+	end
+
+
+	def edit
+	
+		@comment = Comment.find(params[:id])
+	end
+
+
+	def update
+	
+		@comment = Comment.find(params[:id])
+	
+		if @comment.update_attributes(params.require(:comment).permit!)
+		
+
+		else
+		
+			render :action => "edit" 
+		
+		end
+	end
+
+
+	def destroy
+	
+		@comment = Comment.find(params[:id])
+		@comment.destroy
+
+	end
+	
+	
+	def find_comments
+		@comments = Comment.order("created_at DESC").all
+	end
+	
+end
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index dd03034..3f9f5d7 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Admin::DashboardController < ApplicationController
 	#navigation :dahsboard
-	before_filter :authenticate_admin!
+	before_filter :auth_admin
 
 
 	layout "admin"
diff --git a/app/controllers/admin/data_files_controller.rb b/app/controllers/admin/data_files_controller.rb
new file mode 100644
index 0000000..6fab90a
--- /dev/null
+++ b/app/controllers/admin/data_files_controller.rb
@@ -0,0 +1,60 @@
+# -*- encoding : utf-8 -*-
+  class Admin::DataFilesController < ApplicationController
+    before_filter :auth_admin
+
+  
+  layout "admin"
+
+  def index
+    params[:file_folder_id] = params[:file_folder_id] || 1
+
+    @file_folder = FileFolder.find(params[:file_folder_id])
+    @file_folders = FileFolder.all.order(:name)
+    @data_files = DataFile.where(:file_folder_id => @file_folder.id).order("created_at DESC")
+    @data_file = DataFile.new(:file_folder_id => @file_folder.id)
+    if request.xhr?
+    render :layout => false
+    end
+  end
+
+  def new
+  end
+
+  def edit
+  end
+
+  def create
+    @data_file_create = true
+    @data_file = DataFile.new(:name => params[:files].original_filename, :file_folder_id => params[:file_folder_id], :file =>params[:files])
+    
+    if @data_file.save
+
+    else
+
+    end
+
+
+  end
+
+  def update
+    @data_file = DataFile.find(params[:id])
+    if @data_file.update_attributes(params.require(:data_file).permit!)
+
+    else
+  
+    end
+  end
+
+  def destroy
+    @data_file = DataFile.find(params[:id])
+    @data_file.destroy
+
+    flash[:notice] = "Le fichier à bien été supprimée."
+  end
+
+  def show
+    @data_file = DataFile.find(params[:id])
+
+  end
+
+end
diff --git a/app/controllers/admin/external_links_controller.rb b/app/controllers/admin/external_links_controller.rb
new file mode 100644
index 0000000..a168fd9
--- /dev/null
+++ b/app/controllers/admin/external_links_controller.rb
@@ -0,0 +1,72 @@
+# -*- encoding : utf-8 -*-
+class Admin::ExternalLinksController < ApplicationController
+  before_filter :auth_admin
+  layout "admin"
+
+
+  def cible
+    @external_links = ExternalLink.all
+    @external_link = ExternalLink.new
+    render :layout => false
+  
+  
+  end
+  
+  def new
+    @external_link = ExternalLink.new
+
+    respond_to do |format|
+  
+      format.js
+    end
+  end
+
+  def edit
+  
+    @external_link = ExternalLink.find(params[:id])
+  end
+
+
+  def create
+    @external_link = ExternalLink.new(params.require(:external_link).permit!)
+
+    respond_to do |format|
+      if @external_link.save
+        flash[:notice] = "Le lien à été ajouté avec succès."
+      
+        format.js
+      else
+        format.html { render :action => "new" }
+        format.js { render :action => "new" }
+      end
+    end
+  end
+
+  def update
+  
+    @external_link = ExternalLink.find(params[:id])
+  
+    respond_to do |format|
+      if @external_link.update_attributes(params.require(:external_link).permit!)
+      
+      
+        format.js
+      else
+      
+        format.js { render :action => "edit" }
+      end
+    end
+  end
+
+
+  def destroy
+    @external_link = ExternalLink.find(params[:id])
+    @external_link.destroy
+
+    respond_to do |format|
+      format.js
+    end 
+
+
+  end
+end
diff --git a/app/controllers/admin/file_folders_controller.rb b/app/controllers/admin/file_folders_controller.rb
new file mode 100644
index 0000000..bdf3327
--- /dev/null
+++ b/app/controllers/admin/file_folders_controller.rb
@@ -0,0 +1,50 @@
+# -*- encoding : utf-8 -*-
+class Admin::FileFoldersController < ApplicationController
+  before_filter :auth_admin
+
+
+  def index
+    @file_folders = FileFolder.all(:order => :name)
+  end
+
+  def new
+    @file_folder = FileFolder.new()
+  end
+
+  def create
+    @file_folder = FileFolder.new(params.require(:file_folder).permit!)
+    @file_folder_create = true
+    
+    if @file_folder.save
+      @file_folders = FileFolder.order(:name).all
+    else
+      render :action => :new
+    
+    end
+  end
+
+  def edit
+    @file_folder = FileFolder.find(params[:id])  
+  end
+
+  def update
+    @file_folder = FileFolder.find(params[:id])
+    @file_folder_update = true
+    
+    if @file_folder.update_attributes(params.require(:file_folder).permit!)
+      @file_folders = FileFolder.order(:name).all
+    else
+      render :action => :edit
+    
+    end
+  end
+
+  def destroy
+    @file_folder = FileFolder.find(params[:id])
+    if @file_folder.id != 1
+      @file_folder.delete
+      @file_folders = FileFolder.order(:name).all
+    end
+  end
+
+end
diff --git a/app/controllers/admin/image_files_controller.rb b/app/controllers/admin/image_files_controller.rb
new file mode 100644
index 0000000..64ae493
--- /dev/null
+++ b/app/controllers/admin/image_files_controller.rb
@@ -0,0 +1,66 @@
+# -*- encoding : utf-8 -*-
+  class Admin::ImageFilesController < ApplicationController
+  before_filter :auth_admin
+  layout "admin"
+
+
+  def index
+    params[:album_id] = params[:album_id] || 1
+
+    @album = Album.find(params[:album_id])
+    @albums = Album.all.order(:name)
+    @image_files = ImageFile.where(:album_id => @album.id).order("created_at DESC")
+    @image_file = ImageFile.new(:album_id => @album.id)
+    if request.xhr?
+    render :layout => false
+    end
+  end
+
+  def new
+  end
+
+  def edit
+  end
+
+  def create
+    @image_file_create = true
+    @image_file = ImageFile.new(:album_id => params[:album_id], :file =>params[:files])
+    
+    if @image_file.save
+
+    else
+
+    end
+
+
+  end
+
+  def update
+    @image_file = ImageFile.find(params[:id])
+    if @image_file.update_attributes(params[:image_file])
+
+    else
+  
+    end
+  end
+
+  def destroy
+    @image_file = ImageFile.find(params[:id])
+    @image_file.destroy
+
+    flash[:notice] = "L'image à bien été supprimée."
+  end
+
+  def show
+    @image_file = ImageFile.find(params[:id])
+
+  end
+  
+  def rotate
+    deg = params[:direction] == "right" ? -90 : 90
+    
+    @image_file = ImageFile.find(params[:id])
+    @image_file.rotate(deg)
+  end
+
+end
diff --git a/app/controllers/admin/menu_aliases_controller.rb b/app/controllers/admin/menu_aliases_controller.rb
new file mode 100644
index 0000000..d5f6b13
--- /dev/null
+++ b/app/controllers/admin/menu_aliases_controller.rb
@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+class Admin::MenuAliasesController < ApplicationController
+
+    before_filter :auth_admin
+
+
+
+def edit
+  
+  end
+
+  def update
+  end
+
+end
diff --git a/app/controllers/admin/menu_items_controller.rb b/app/controllers/admin/menu_items_controller.rb
new file mode 100644
index 0000000..71375e5
--- /dev/null
+++ b/app/controllers/admin/menu_items_controller.rb
@@ -0,0 +1,432 @@
+# -*- encoding : utf-8 -*-
+class Admin::MenuItemsController < ApplicationController
+   before_filter :auth_admin
+
+  
+  layout "admin"
+
+  
+  
+  def import
+
+  
+
+      
+    
+    @bugs = []
+    
+    
+    
+    xml = Nokogiri::XML(File.open(Rails.root.join("db", "data","agendas.xml")))
+    
+    
+    
+
+    
+    
+    @agendas = xml.search('row').map do |game|
+      %w[
+        id title description content frontpage start_at finished_at whole_day created_at updated_at
+      ].each_with_object({}) do |n, o|
+        o[n] = game.at(n).text if game.at(n)
+      end
+    end
+    
+
+
+    xml = Nokogiri::XML(File.open(Rails.root.join("db", "data","actualitees.xml")))
+    
+    
+    @actualitees = xml.search('row').map do |game|
+      %w[
+        id title description content frontpage start_at end_at image_file_name created_at updated_at
+      ].each_with_object({}) do |n, o|
+        o[n] = game.at(n).text if game.at(n)
+      end
+    end
+    
+    
+    
+
+    
+    
+    
+    
+    
+    xml = Nokogiri::XML(File.open(Rails.root.join("db", "data","pages.xml")))
+    
+    
+    pages = xml.search('row').map do |game|
+      %w[
+        id enabled visible archived super_admin parent_id position archived_at created_at updated_at archive_id comments_allowed ins
+      ].each_with_object({}) do |n, o|
+        o[n] = game.at(n).text if game.at(n)
+      end
+    end
+    
+    @pages = []
+    pages.each do |p|
+      @pages[p["id"].to_i] = p
+    end
+    
+    
+    xml = Nokogiri::XML(File.open(Rails.root.join("db", "data","lang_pages.xml")))
+    
+    
+    lang_pages = xml.search('row').map do |game|
+      %w[
+        id page_id title slug menu_title description keywords
+      ].each_with_object({}) do |n, o|
+        o[n] = game.at(n).text if game.at(n)
+      end
+    end
+    
+    @lang_pages = []
+    lang_pages.each do |p|
+      @lang_pages[p["id"].to_i] = p
+    end
+    
+    
+
+    
+    
+    
+    xml = Nokogiri::XML(File.open(Rails.root.join("db", "data","blocks.xml")))
+    
+    
+    @blocks = xml.search('row').map do |game|
+      %w[
+        id lang_page_id content block_name_id
+      ].each_with_object({}) do |n, o|
+        o[n] = game.at(n).text if game.at(n)
+      end
+    end
+    
+    
+    
+    
+    xml = Nokogiri::XML(File.open(Rails.root.join("archives.xml")))
+    
+    
+    @dates_brutes = xml.search('article').map do |game|
+      %w[
+        repertoire name created_at
+      ].each_with_object({}) do |n, o|
+        o[n] = game.at(n).text if game.at(n)
+      end
+    end
+    
+    @dates = {}
+    
+    @dates_brutes.each do |date|
+      reper = date["repertoire"] 
+      reper += "/" if reper
+      @dates[reper.to_s+date["name"]] = date["created_at"]
+      
+    end
+    
+    
+    
+ 
+    
+  end
+  
+  def find_menu_items
+
+    
+    params[:parent_id] = nil if !params[:parent_id] or params[:parent_id] == ""
+      
+    @menu_parent = MenuItem.find(params[:parent_id]) if params[:parent_id]
+    
+    
+    @menu_items = @menu.menu_items.unarchived.where(:parent_id => params[:parent_id]).order("position ASC")
+    
+
+  
+  end
+  
+  
+  def reorder
+
+    i = 1
+    
+    
+    params[:menu_items_ids].each do |id|
+      
+
+      menu_item = MenuItem.find(id)
+      menu_item.position = i
+      puts i
+      menu_item.update_attributes :position => i
+      
+      i = i + 1
+      
+      
+    end
+    
+    if params[:menu_id] and params[:menu_id] != "" and @menu = Menu.find(params[:menu_id])
+      
+      find_menu_items
+    end
+    
+    flash[:success] = "Menus réorganisés avec succès."
+    
+   
+    
+  end
+  
+  def index
+  
+
+
+    @title = "Eléments de menu"
+    
+    if params[:menu_id] and params[:menu_id] != "" and @menu = Menu.find(params[:menu_id])
+      
+      find_menu_items
+      
+      
+    
+  
+       
+
+    
+    
+    else
+      redirect_to admin_root_path, :alert => "Un menu doit être séléctionné."
+    end
+    
+    
+    
+  end
+
+  def new
+
+    
+    
+    @menu_item = MenuItem.new(:menu_id => params[:menu_id],:parent_id => params[:parent_id], :visible => true, :enabled => true)
+    
+    params[:menu_item_content_type] = "Page" if !params[:menu_item_content_type]
+    
+    @content = params[:menu_item_content_type].constantize.new()
+    @menu_item.menu_content = @content
+    
+    
+    
+    
+  end
+
+  def create
+  
+    params_content = params[:menu_item].delete(:menu_content_attributes)
+    content_type = params[:menu_item][:menu_content_type]
+
+    
+    @menu_item= MenuItem.new(params.require(:menu_item).permit(:parent_id, :menu_id, :enabled, :visible, :slug, :name, :menu_content_type))
+    content = content_type.constantize.new(params_content)
+    
+    @menu_item.menu_content = content
+  
+
+    
+    respond_to do |format|
+      if @menu_item.save
+        MenuItem.all.each do |mi|
+          mi.set_permalink
+        end
+        
+        @menu = Menu.find( @menu_item.menu_id)
+        params[:parent_id] = @menu_item.parent_id
+        find_menu_items
+        
+        
+        flash[:notice] = "Le menu à été ajouté avec succès."
+        format.html { 
+          redirect_to(admin_menu_items_path(:menu_id => @menu_item.menu_id, :parent_id => @menu_item.parent_id)) 
+          }
+        format.js
+        
+      else
+        
+        format.html { render :action => "new" }
+        format.js { render :action => "new" }
+      end
+    end
+  
+  end
+
+  def edit
+
+    @menu_item= MenuItem.find(params[:id])
+
+  end
+
+  def update
+
+    @menu_item= MenuItem.find(params[:id])
+    
+    @menu = @menu_item.menu
+    
+    if request.xhr?
+      @menu_parent = @menu_item.parent if @menu_item.parent
+      @menu_items = MenuItem.where(:parent_id => @menu_item.parent_id, :menu_id => @menu_item.menu_id).order(:position)
+    end
+  
+    if params[:menu_item][:parent_id] and params[:menu_item][:parent_id] == "no-menu-selected"
+      @menu_item.parent_id = nil
+      @menu_item.save
+      params[:menu_item].delete(:parent_id)
+      
+    end
+    
+    @reorder = true if params[:reorder]
+    
+    
+    
+    
+  
+    
+    
+    respond_to do |format|
+      if @menu_item.update_attributes(params.require(:menu_item).permit!)
+        
+        MenuItem.all.each do |mi|
+          mi.set_permalink
+        
+        end
+      
+        flash[:notice] = "Le menu à été modifié avec succès."
+        format.html { redirect_to(admin_menu_items_path(:parent_id => @menu_item.parent_id, :menu_id => @menu_item.menu_id)) }
+        if @reorder
+          format.js { 
+            
+            render :action => "update" }
+        else
+          format.js { 
+             @menu_item = MenuItem.find(@menu_item.id)
+            render :action => "show" }
+        end
+      else
+        
+        flash[:error] = "Cet élément de menu n'a pas pu être déplacé. Vérifiez que son lien permanent n'éxiste pas déjà dans l'élément cible."
+        if @reorder
+          format.js { render :action => "update_reorder_failled" }
+        else
+          format.html { render :action => "edit" }
+          format.js { render :action => "edit" }
+        end
+        
+        
+      end
+    end
+    
+  end
+
+  def destroy
+    @menu_item = MenuItem.find(params[:id])
+    @menu_item.destroy
+    flash[:notice] = "L'élément de menu a été supprimé avec succès."
+    respond_to do |format|
+    
+        
+        format.html { redirect_to(admin_menu_items_path(:menu_id => @menu_item.menu_id, :parent_id => @menu_item.parent_id)) }
+        format.js
+    
+  
+    end
+  end
+
+  def show
+    @menu_item= MenuItem.unarchived.find(params[:id])
+  end
+  
+  
+  
+  def cible
+    
+    params[:menu_id] = params[:menu_id] || 1
+
+      if params[:menu_id] and params[:menu_id] != "" and @menu = Menu.find(params[:menu_id])
+
+
+        params[:parent_id] = nil if !params[:parent_id]
+
+        @menu_parent = MenuItem.find(params[:parent_id]) if params[:parent_id]
+
+
+
+        @order = "position ASC"
+
+        @menu_items = @menu.menu_items.where(:parent_id => params[:parent_id]).order(@order)
+
+
+
+      else
+        redirect_to admin_root_path, :alert => "Un menu doit être séléctionné."
+      end
+    
+    render :layout => false
+  
+  end
+  
+  def clone
+    @menu_item= MenuItem.find(params[:id])
+    
+    @new = @menu_item.dup
+    @new.name = @new.name+" copie"
+    @slug = @new.slug+"-copie"
+    @new.slug = @slug
+    i = 0
+    while MenuItem.where(:slug => @new.slug, :menu_id => @new.menu_id, :parent_id => @new.parent_id).exists?
+      i= i+1
+      @new.slug = @slug+"-#{i}"
+    end
+    @new.name = @new.name+" (#{i})" if i >0
+    @new.id
+    @new.menu_content = @menu_item.menu_content.dup
+    @new.save
+    MenuItem.all.each do |mi|
+      mi.set_permalink
+    
+    end
+    redirect_to :back
+  end
+  
+  def archives
+     @menu_items = MenuItem.archived.order("archived_at DESC")
+  end
+  
+  
+  def archive
+    @menu_item= MenuItem.find(params[:id])
+    
+    @new = @menu_item.dup
+    @date = Time.now
+    @new.name = @new.name+" archive "+ @date.strftime("%m-%d-%Y %H:%M:%S")
+    @slug = @new.slug+"-archive-"+ @date.strftime("%m-%d-%Y-%H-%M-%S")
+    @new.slug = @slug
+    i = 0
+    while MenuItem.where(:slug => @new.slug, :menu_id => @new.menu_id, :parent_id => @new.parent_id).exists?
+      i= i+1
+      @new.slug = @slug+"-#{i}"
+    end
+    @new.name = @new.name+" (#{i})" if i >0
+    @new.id
+    @new.menu_content = @menu_item.menu_content.dup
+    
+    @new.archived_at = Time.now
+    @new.parent_id = nil
+    @new.archived = true
+    @new.archive_id = @menu_item.id
+    
+    
+    @new.save
+    MenuItem.all.each do |mi|
+      mi.set_permalink
+    
+    end
+    redirect_to :back
+  end
+  
+
+end
diff --git a/app/controllers/admin/menu_urls_controller.rb b/app/controllers/admin/menu_urls_controller.rb
new file mode 100644
index 0000000..318c986
--- /dev/null
+++ b/app/controllers/admin/menu_urls_controller.rb
@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+class Admin::MenuUrlsController < ApplicationController
+    before_filter :auth_admin
+
+
+def edit
+  
+  
+  end
+
+  def update
+  end
+
+end
diff --git a/app/controllers/admin/menus_controller.rb b/app/controllers/admin/menus_controller.rb
new file mode 100644
index 0000000..dcb8541
--- /dev/null
+++ b/app/controllers/admin/menus_controller.rb
@@ -0,0 +1,79 @@
+# -*- encoding : utf-8 -*-
+class Admin::MenusController < ApplicationController
+  before_filter :auth_admin
+  layout "admin"
+
+
+  
+
+  def index
+    @breadcrumb = ["liste des menus"]
+    
+    @order = magick_order("name", "ASC")
+
+    @menus = Menu.order(@order).page(magick_page()).per(magick_per_page())
+  
+    if @menus.num_pages.to_i < magick_page().to_i
+      params[:page] = @menus.num_pages
+      @menus = Menu.order(@order).page(magick_page()).per(magick_per_page())
+    end
+    
+  end
+
+  def show
+  end
+
+  def new
+    @breadcrumb = [["liste des menus", admin_menus_path],"Ajouter un menu"]
+    @menu = Menu.new
+    
+  end
+
+  def create
+    @breadcrumb = [["liste des menus", admin_menus_path],"Ajouter un menu"]
+    @menu = Menu.new(params[:menu])
+
+    respond_to do |format|
+      if @menu.save
+        flash[:notice] = "Le menu à été ajouté avec succès."
+        format.html { redirect_to(admin_menus_path) }
+      else
+        format.html { render :action => "new" }
+      end
+    end
+  end
+
+  def edit
+    @breadcrumb = [["liste des menus", admin_menus_path],"Modifier un menu"]
+    @menu = Menu.find(params[:id])
+
+    
+  end
+
+  def update
+    @breadcrumb = [["liste des menus", admin_menus_path],"Modifier un menu"]
+    @menu = Menu.find(params[:id])
+    respond_to do |format|
+      if @menu.update_attributes(params[:menu])
+        
+        flash[:notice] = "Le menu à été modifié avec succès."
+        format.html { redirect_to(admin_menus_path) }
+      else
+        format.html { render :action => "edit" }
+      end
+    end
+  end
+
+  def destroy
+    @menu = Menu.find(params[:id])
+    @menu.destroy
+
+    respond_to do |format|
+      format.html { 
+        redirect_to(admin_menus_url, :notice  => "Le menu a bien été supprimé.") 
+      }
+    end
+    
+  end
+
+end
diff --git a/app/controllers/admin/newsletters_controller.rb b/app/controllers/admin/newsletters_controller.rb
index d1e8792..1cf3f1a 100755
--- a/app/controllers/admin/newsletters_controller.rb
+++ b/app/controllers/admin/newsletters_controller.rb
@@ -4,7 +4,7 @@ class Admin::NewslettersController < ApplicationController
   layout "admin"
   
 
-  before_filter :authenticate_admin!
+  before_filter :auth_admin
   
 #  require_permission 'newsletter.show'
 #  require_permission 'newsletter.add', :only => [:newsletter_new, :newsletter_create]
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
new file mode 100644
index 0000000..d7e2639
--- /dev/null
+++ b/app/controllers/admin/pages_controller.rb
@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+class Admin::PagesController < ApplicationController
+    before_filter :auth_admin
+
+  layout false
+def edit
+  @page = Page.find(params[:id])
+  
+  end
+
+  def update
+  end
+
+end
diff --git a/app/controllers/admin/people_controller.rb b/app/controllers/admin/people_controller.rb
index d2c08f7..ca7f929 100644
--- a/app/controllers/admin/people_controller.rb
+++ b/app/controllers/admin/people_controller.rb
@@ -5,7 +5,7 @@ class PeopleController < ApplicationController
   # GET /people
   # GET /people.xml
   
-  before_filter :authenticate_admin!, except: [:show]
+  before_filter :auth_admin, except: [:show]
  
   def index
     @people = Person.all
diff --git a/app/controllers/admin/petitions_controller.rb b/app/controllers/admin/petitions_controller.rb
index 44b92f4..1aa575a 100644
--- a/app/controllers/admin/petitions_controller.rb
+++ b/app/controllers/admin/petitions_controller.rb
@@ -2,7 +2,7 @@
 
 class Admin::PetitionsController < ApplicationController
   layout "admin"
-  before_filter :authenticate_admin!
+  before_filter :auth_admin
 
   def index
     @petitions = Petition.all
diff --git a/app/controllers/admin/sheet_years_controller.rb b/app/controllers/admin/sheet_years_controller.rb
index f5ff40b..530ad6b 100644
--- a/app/controllers/admin/sheet_years_controller.rb
+++ b/app/controllers/admin/sheet_years_controller.rb
@@ -4,7 +4,7 @@
  
 class SheetYearsController < ApplicationController
   
-  before_filter :authenticate_admin!, except: [:show]
+  before_filter :auth_admin, except: [:show]
   # GET /sheet_years
   # GET /sheet_years.xml
   def index
diff --git a/app/controllers/admin/sheets_controller.rb b/app/controllers/admin/sheets_controller.rb
index d5e915a..64a5046 100644
--- a/app/controllers/admin/sheets_controller.rb
+++ b/app/controllers/admin/sheets_controller.rb
@@ -2,7 +2,7 @@
 
 class Admin::SheetsController < ApplicationController
   
-  before_filter :authenticate_admin!
+  before_filter :auth_admin
  
   layout "admin"
 
diff --git a/app/controllers/admin/survey_types_controller.rb b/app/controllers/admin/survey_types_controller.rb
index 49728eb..9235ede 100644
--- a/app/controllers/admin/survey_types_controller.rb
+++ b/app/controllers/admin/survey_types_controller.rb
@@ -2,7 +2,7 @@
 
 class Admin::SurveyTypesController < ApplicationController
   layout "admin"
-  before_filter :authenticate_admin!
+  before_filter :auth_admin
   
   def index
     @surveys = SurveyType.all
diff --git a/app/controllers/admin/tiny_urls_controller.rb b/app/controllers/admin/tiny_urls_controller.rb
index 239012a..6a04d70 100644
--- a/app/controllers/admin/tiny_urls_controller.rb
+++ b/app/controllers/admin/tiny_urls_controller.rb
@@ -2,7 +2,7 @@
 
 class Admin::TinyUrlsController < ApplicationController
   layout "admin"
-  before_filter :authenticate_admin!
+  before_filter :auth_admin
   
   def index
     @tiny_urls = TinyUrl.all
diff --git a/app/controllers/admin/topics_controller.rb b/app/controllers/admin/topics_controller.rb
index e447d91..df7229a 100644
--- a/app/controllers/admin/topics_controller.rb
+++ b/app/controllers/admin/topics_controller.rb
@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class Admin::TopicsController < ApplicationController
-  before_filter :authenticate_admin!
+  before_filter :auth_admin
   layout "admin"
 
   def index
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3e934fa..0c68ea7 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,7 +1,8 @@
-# -*- encoding : utf-8 -*-
-
 class ApplicationController < ActionController::Base
-  protect_from_forgery
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+  
   
   helper_method :has_permission?
   
@@ -21,9 +22,37 @@ class ApplicationController < ActionController::Base
     
   end
   
+
+
+
+  
+  def auth_admin
+    if !current_admin
+      redirect_to new_admin_admin_auth_path
+    end
+      
+    
+  end
+  
   
   private
 
+    def current_admin
+      
+      if cookies[:admin_remember_token]
+        if @current_admin = Admin.find_by_remember_token(cookies[:admin_remember_token]) 
+          @current_admin = Admin.find_by_remember_token(cookies[:admin_remember_token]) 
+        else
+            cookies[:admin_remember_token] =nil
+        end
+        
+      end
+      
+      
+     
+    end
+    
+    
     def current_fuser
       
       @current_fuser ||= ForumUser.find_by_auth_token!(cookies[:forum_auth_token]) if cookies[:forum_auth_token]
@@ -42,5 +71,11 @@ class ApplicationController < ActionController::Base
     end
     
     
-    helper_method :current_fuser, :moderator?
+    helper_method :current_fuser, :moderator?, :current_admin
+  
+    
+   
 end
+
+
+
diff --git a/app/controllers/portlet/block_contents_controller.rb b/app/controllers/portlet/block_contents_controller.rb
new file mode 100644
index 0000000..c6da693
--- /dev/null
+++ b/app/controllers/portlet/block_contents_controller.rb
@@ -0,0 +1,111 @@
+# -*- encoding : utf-8 -*-
+class Portlet::BlockContentsController < ApplicationController
+  layout "admin"
+
+  def new
+    @block_content = BlockContent.new(:nbr_columns => 2)
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+  def create
+    @block_content = BlockContent.new(params.require(:block_content).permit!)
+
+    respond_to do |format|
+      if @block_content.save
+        @block_content.nbr_columns.times do 
+          @block = Block.new(:block_name => "")
+          @block.blockable = @block_content
+          @block.save
+        end
+        
+        @portlet = Portlet.create(:position => params[:position], :block_id => params[:block_id], :content => @block_content)
+        
+        
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          
+        end
+        
+        
+        
+        format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js { render :template => "portlet/shared/create" }
+      else
+        format.html { render :action => "new" }
+        format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @block_content = BlockContent.find(params[:id])
+    @portlet = Portlet.find(params[:portlet_id])
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @block_content = BlockContent.find(params[:id])
+    @portlet = @block_content.portlet
+    
+    respond_to do |format|
+          if @block_content.update_attributes(params.require(:block_content).permit!)
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+        
+        end
+    
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:portlet_id])
+    @block_content = BlockContent.find(params[:id])
+    @block_content.destroy
+    
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+    
+    end
+    
+    respond_to do |format|
+      format.html {}
+      format.js { render :template => "portlet/shared/destroy" }
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/break_contents_controller.rb b/app/controllers/portlet/break_contents_controller.rb
new file mode 100644
index 0000000..5e56a2e
--- /dev/null
+++ b/app/controllers/portlet/break_contents_controller.rb
@@ -0,0 +1,116 @@
+# -*- encoding : utf-8 -*-
+class Portlet::BreakContentsController < ApplicationController
+  layout "admin"
+
+  def new
+    @break_content = BreakContent.new(:line => true)
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+  def create
+    @break_content = BreakContent.new(params.require(:break_content).permit)
+
+    respond_to do |format|
+      if @break_content.save
+        
+        
+        @portlet = Portlet.create(:position => params[:position], :block_id => params[:block_id], :content => @break_content)
+        
+        
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (ajout d'un portlet)")
+          end
+        end
+        
+        
+        
+        format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js { render :template => "portlet/shared/create" }
+      else
+        format.html { render :action => "new" }
+        format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @break_content = BreakContent.find(params[:id])
+    @portlet = Portlet.find(params[:portlet_id])
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @break_content = BreakContent.find(params[:id])
+    @portlet = @break_content.portlet
+    
+    respond_to do |format|
+          if @break_content.update_attributes(params.require(:break_content).permit!)
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (modification d'un portlet)")
+          end
+        end
+    
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:portlet_id])
+    @break_content = BreakContent.find(params[:id])
+    @break_content.destroy
+    
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+      if @portlet.block.blockable_type == "Page"
+
+        ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (suppression d'un portlet)")
+      end
+    end
+    
+    respond_to do |format|
+      format.html {}
+      format.js { render :template => "portlet/shared/destroy" }
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/download_contents_controller.rb b/app/controllers/portlet/download_contents_controller.rb
new file mode 100644
index 0000000..ff1c897
--- /dev/null
+++ b/app/controllers/portlet/download_contents_controller.rb
@@ -0,0 +1,109 @@
+# -*- encoding : utf-8 -*-
+class Portlet::DownloadContentsController < ApplicationController
+  layout "admin"
+
+  def new
+    @download_content = DownloadContent.new
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+  def create
+    @download_content = DownloadContent.new(params.require(:download_content).permit!)
+
+    respond_to do |format|
+      if @download_content.save
+        
+        
+        @portlet = Portlet.create(:position => params[:position], :block_id => params[:block_id], :content => @download_content)
+        
+        
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (ajout d'un portlet)")
+          end
+        end
+        
+        
+        
+        format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js { render :template => "portlet/shared/create" }
+      else
+        format.html { render :action => "new" }
+        format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @download_content = DownloadContent.find(params[:id])
+    @portlet = Portlet.find(params[:portlet_id])
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @download_content = DownloadContent.find(params[:id])
+    @portlet = @download_content.portlet
+    
+    respond_to do |format|
+          if @download_content.update_attributes(params.require(:download_content).permit!)
+
+    
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:portlet_id])
+    @download_content = DownloadContent.find(params[:id])
+    @download_content.destroy
+    
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+      if @portlet.block.blockable_type == "Page"
+
+        ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (suppression d'un portlet)")
+      end
+    end
+    
+    respond_to do |format|
+      format.html {}
+      format.js { render :template => "portlet/shared/destroy" }
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/dynamic_contents_controller.rb b/app/controllers/portlet/dynamic_contents_controller.rb
new file mode 100644
index 0000000..421a5d1
--- /dev/null
+++ b/app/controllers/portlet/dynamic_contents_controller.rb
@@ -0,0 +1,116 @@
+# -*- encoding : utf-8 -*-
+class Portlet::DynamicContentsController < ApplicationController
+  layout "admin"
+
+  def new
+    @dynamic_content = DynamicContent.new
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+  def create
+    @dynamic_content = DynamicContent.new(params.require(:dynamic_content).permit!)
+
+    respond_to do |format|
+      if @dynamic_content.save
+        
+        
+        @portlet = Portlet.create(:position => params[:position], :block_id => params[:block_id], :content => @dynamic_content)
+        
+        
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (ajout d'un portlet)")
+          end
+        end
+        
+        
+        
+        format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js { render :template => "portlet/shared/create" }
+      else
+        format.html { render :action => "new" }
+        format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @dynamic_content = DynamicContent.find(params[:id])
+    @portlet = Portlet.find(params[:portlet_id])
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @dynamic_content = DynamicContent.find(params[:id])
+    @portlet = @dynamic_content.portlet
+    
+    respond_to do |format|
+          if @dynamic_content.update_attributes(paramsparams.require(:dynamic_content).permit!)
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (modification d'un portlet)")
+          end
+        end
+    
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:portlet_id])
+    @dynamic_content = DynamicContent.find(params[:id])
+    @dynamic_content.destroy
+    
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+      if @portlet.block.blockable_type == "Page"
+
+        ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (suppression d'un portlet)")
+      end
+    end
+    
+    respond_to do |format|
+      format.html {}
+      format.js { render :template => "portlet/shared/destroy" }
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/gallery_contents_controller.rb b/app/controllers/portlet/gallery_contents_controller.rb
new file mode 100644
index 0000000..51112d6
--- /dev/null
+++ b/app/controllers/portlet/gallery_contents_controller.rb
@@ -0,0 +1,109 @@
+# -*- encoding : utf-8 -*-
+class Portlet::GalleryContentsController < ApplicationController
+  layout "admin"
+
+  def new
+    @gallery_content = GalleryContent.new
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+
+  def create
+    @gallery_content = GalleryContent.new(params.require(:gallery_content).permit!)
+
+    respond_to do |format|
+      if @gallery_content.save
+        
+        
+        @portlet = Portlet.create(:position => params[:position], :block_id => params[:block_id], :content => @gallery_content)
+        
+        
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (ajout d'un portlet)")
+          end
+        end
+        
+        
+        
+        format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js { render :template => "portlet/shared/create" }
+      else
+        format.html { render :action => "new" }
+        format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @gallery_content = GalleryContent.find(params[:id])
+    @portlet = @gallery_content.portlet
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @gallery_content = GalleryContent.find(params[:id])
+    @portlet = @gallery_content.portlet
+    
+    respond_to do |format|
+          if @gallery_content.update_attributes(params.require(:gallery_content).permit!)
+        
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:portlet_id])
+    @gallery_content = GalleryContent.find(params[:id])
+    @gallery_content.destroy
+    
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+      if @portlet.block.blockable_type == "Page"
+
+        ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (suppression d'un portlet)")
+      end
+    end
+    
+    respond_to do |format|
+      format.html {}
+      format.js { render :template => "portlet/shared/destroy" }
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/gallery_images_controller.rb b/app/controllers/portlet/gallery_images_controller.rb
new file mode 100644
index 0000000..5164c78
--- /dev/null
+++ b/app/controllers/portlet/gallery_images_controller.rb
@@ -0,0 +1,82 @@
+# -*- encoding : utf-8 -*-
+class Portlet::GalleryImagesController < ApplicationController
+  layout "admin"
+  
+
+  def reorder
+    i = 0
+    params[:order].each do |gallery_image_id|
+      i += 1
+      gallery_image = GalleryImage.find(gallery_image_id)
+      gallery_image.position = i
+      gallery_image.save
+    end
+    
+  end
+
+  def create
+    
+    @gallery_content = GalleryContent.find(params[:gallery_content_id])
+    @gallery_images = []
+    if params[:image_file_ids].kind_of?(Array)
+      params[:image_file_ids].each do |image_file_id|
+        image_file = ImageFile.find(image_file_id)
+        gallery_image = GalleryImage.create(:image_file_id => image_file.id, :title => image_file.name, :description  => image_file.description, :gallery_content_id => @gallery_content.id )
+        
+        @gallery_images << gallery_image
+      end
+    end
+    
+  
+
+    respond_to do |format|
+    
+        format.js
+    
+    end
+  end
+  
+  
+
+  def edit
+    @gallery_image = GalleryImage.find(params[:id])
+
+    if request.xhr?
+      render :layout => false
+    end
+    
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @gallery_image = GalleryImage.find(params[:id])
+    respond_to do |format|
+          if @gallery_image.update_attributes(params.require(:gallery_image).permit!)
+        
+            format.js 
+          else
+            format.html { render :action => "edit", :layout => false} 
+        format.js { render :action => "edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    
+    @gallery_image = GalleryImage.find(params[:id])
+    @gallery_image.destroy
+    
+  
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/html_contents_controller.rb b/app/controllers/portlet/html_contents_controller.rb
new file mode 100644
index 0000000..616734e
--- /dev/null
+++ b/app/controllers/portlet/html_contents_controller.rb
@@ -0,0 +1,116 @@
+# -*- encoding : utf-8 -*-
+class Portlet::HtmlContentsController < ApplicationController
+  layout "admin"
+
+  def new
+    @html_content = HtmlContent.new
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+  def create
+    @html_content = HtmlContent.new(params.require(:html_content).permit!)
+
+    respond_to do |format|
+      if @html_content.save
+        
+        
+        @portlet = Portlet.create(:position => params[:position], :block_id => params[:block_id], :content => @html_content)
+        
+        
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (ajout d'un portlet)")
+          end
+        end
+        
+        
+        
+        format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js { render :template => "portlet/shared/create" }
+      else
+        format.html { render :action => "new" }
+        format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @html_content = HtmlContent.find(params[:id])
+    @portlet = Portlet.find(params[:portlet_id])
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @html_content = HtmlContent.find(params[:id])
+    @portlet = @html_content.portlet
+    
+    respond_to do |format|
+          if @html_content.update_attributes(params.require(:html_content).permit!)
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (modification d'un portlet)")
+          end
+        end
+    
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:portlet_id])
+    @html_content = HtmlContent.find(params[:id])
+    @html_content.destroy
+    
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+      if @portlet.block.blockable_type == "Page"
+
+      #  #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (suppression d'un portlet)")
+      end
+    end
+    
+    respond_to do |format|
+      format.html {}
+      format.js { render :template => "portlet/shared/destroy" }
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/image_contents_controller.rb b/app/controllers/portlet/image_contents_controller.rb
new file mode 100644
index 0000000..7d54f7f
--- /dev/null
+++ b/app/controllers/portlet/image_contents_controller.rb
@@ -0,0 +1,100 @@
+# -*- encoding : utf-8 -*-
+class Portlet::ImageContentsController < ApplicationController
+  layout "admin"
+
+  def new
+    @image_content = ImageContent.new(:expandable => true)
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+  def create
+    @image_content = ImageContent.new(params.require(:image_content).permit!)
+
+    respond_to do |format|
+      if @image_content.save
+        
+        
+        @portlet = Portlet.create(:content => @image_content)
+        
+        
+        
+        
+        format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js { render :template => "portlet/shared/create" }
+      else
+        format.html { render :action => "new" }
+        format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @image_content = ImageContent.find(params[:id])
+    @portlet = Portlet.find(params[:portlet_id])
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @image_content = ImageContent.find(params[:id])
+    @portlet = @image_content.portlet
+    
+    respond_to do |format|
+          if @image_content.update_attributes(params.require(:image_content).permit!)
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (modification d'un portlet)")
+          end
+        end
+    
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:portlet_id])
+    @image_content = ImageContent.find(params[:id])
+    @image_content.destroy
+    
+  
+    
+    respond_to do |format|
+      format.html {}
+      format.js { render :template => "portlet/shared/destroy" }
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/link_contents_controller.rb b/app/controllers/portlet/link_contents_controller.rb
new file mode 100644
index 0000000..4c35187
--- /dev/null
+++ b/app/controllers/portlet/link_contents_controller.rb
@@ -0,0 +1,110 @@
+# -*- encoding : utf-8 -*-
+class Portlet::LinkContentsController < ApplicationController
+  layout "admin"
+
+  def new
+    @link_content = LinkContent.new
+    
+
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+  def create
+    
+    
+
+    
+    @link_content = LinkContent.new(params.require(:link_content).permit!)
+    
+  
+
+    respond_to do |format|
+      if @link_content.save
+        
+        
+        @portlet = Portlet.create(:content => @link_content)
+        
+        
+        format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js { render :template => "portlet/shared/create" }
+      else
+        format.html { render :action => "new" }
+        format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @link_content = LinkContent.find(params[:id])
+    @portlet = @link_content.portlet
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @link_content = LinkContent.find(params[:id])
+    @portlet = @link_content.portlet
+    
+
+    
+    
+    
+    respond_to do |format|
+          if @link_content.update_attributes(params.require(:link_content).permit!)
+      
+    
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:portlet_id])
+    @link_content = LinkContent.find(params[:id])
+    @link_content.destroy
+    
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+      if @portlet.block.blockable_type == "Page"
+
+        ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (suppression d'un portlet)")
+      end
+    end
+    
+    respond_to do |format|
+      format.html {}
+      format.js { render :template => "portlet/shared/destroy" }
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/map_contents_controller.rb b/app/controllers/portlet/map_contents_controller.rb
new file mode 100644
index 0000000..828f52b
--- /dev/null
+++ b/app/controllers/portlet/map_contents_controller.rb
@@ -0,0 +1,116 @@
+# -*- encoding : utf-8 -*-
+class Portlet::MapContentsController < ApplicationController
+  layout "admin"
+
+  def new
+    @map_content = MapContent.new(:zoom => 12, :view => 1)
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+  def create
+    @map_content = MapContent.new(params.require(:map_content).permit!)
+
+    respond_to do |format|
+      if @map_content.save
+        
+        
+        @portlet = Portlet.create(:position => params[:position], :block_id => params[:block_id], :content => @map_content)
+        
+        
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (ajout d'un portlet)")
+          end
+        end
+        
+        
+        
+        format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js { render :template => "portlet/shared/create" }
+      else
+        format.html { render :action => "new" }
+        format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @map_content = MapContent.find(params[:id])
+    @portlet = @map_content.portlet
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @map_content = MapContent.find(params[:id])
+    @portlet = @map_content.portlet
+    
+    respond_to do |format|
+          if @map_content.update_attributes(params.require(:map_content).permit!)
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (modification d'un portlet)")
+          end
+        end
+    
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:portlet_id])
+    @map_content = MapContent.find(params[:id])
+    @map_content.destroy
+    
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+      if @portlet.block.blockable_type == "Page"
+
+      #  #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (suppression d'un portlet)")
+      end
+    end
+    
+    respond_to do |format|
+      format.html {}
+      format.js { render :template => "portlet/shared/destroy" }
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/portlets_controller.rb b/app/controllers/portlet/portlets_controller.rb
new file mode 100644
index 0000000..7c0c981
--- /dev/null
+++ b/app/controllers/portlet/portlets_controller.rb
@@ -0,0 +1,124 @@
+# -*- encoding : utf-8 -*-
+class Portlet::PortletsController < ApplicationController
+  layout "admin"
+
+
+
+  def new
+    @portlet = Portlet.new(:block_id => params[:block_id])
+    
+    
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js
+    end
+
+  end
+
+
+  def show
+    @portlet = Portlet.find(params[:id])
+    
+    render :template => "portlet/shared/update"
+  end
+
+  
+
+  def edit
+    @portlet = Portlet.find(params[:id])
+  if request.xhr?
+    render :layout => false
+  end
+  end
+
+
+
+  def update
+    @portlet = Portlet.find(params[:id])
+
+    flash[:notice] = "Le contenu à été mis à jour avec succès."
+    if @portlet.update_attributes(params[:portlet])
+      
+      if @portlet.block and @portlet.block.blockable
+        @portlet.block.blockable.updated_at = Time.now
+        @portlet.block.blockable.save
+    if @portlet.block.blockable_type == "Page"
+      
+      #to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s)
+    end
+      end
+      render :action => "update"
+  
+    else
+      render :action => "edit" 
+    end
+    
+      
+
+    
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:id])
+    @portlet.destroy
+    flash[:notice] = "Le contenu à été supprimé avec succès."
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+    end
+  end
+  
+  def ajax_create
+    @t = params[:type]
+    if @t == "Title"
+      @content = TitleContent.new()
+    elsif @t == "Text"
+      @content = TextContent.new()
+    elsif @t == "Image"
+      @content = ImageContent.new()
+    elsif @t == "Gallery"
+      @content = GalleryContent.new()
+    elsif @t == "Link"
+      @content = LinkContent.new()
+    elsif @t == "Break"
+      @content = BreakContent.new()
+    elsif @t == "Html"
+      @content = HtmlContent.new()
+    elsif @t == "Download"
+      @content = DownloadContent.new()
+    elsif @t == "DynamicContent"
+      @content = DynamicContent.new()
+    end
+    @portlet = Portlet.new(:block_id => params[:block_id])
+    @content.portlets << @portlet
+    @content.save!
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+    end
+    flash[:notice] = "Le contenu à été créé avec succès."
+  end
+
+  def reorder
+    
+  params[:blocks].each do |index, block|
+
+    block_id = block["block_id"].to_i
+    i = 0
+    if block["block_portlet_ids"].kind_of?(Array)
+      block["block_portlet_ids"].each do |portlet_id|
+        i += 1
+        Portlet.find(portlet_id.to_i).update_attributes(:position => i, :block_id => block_id)
+      end
+    end
+    
+  end
+
+  render :inline => "ok"
+    
+  end
+end
diff --git a/app/controllers/portlet/table_cols_controller.rb b/app/controllers/portlet/table_cols_controller.rb
new file mode 100644
index 0000000..a1633cd
--- /dev/null
+++ b/app/controllers/portlet/table_cols_controller.rb
@@ -0,0 +1,35 @@
+# -*- encoding : utf-8 -*-
+class Portlet::TableColsController < ApplicationController
+  def create
+  
+  @table_content = TableContent.find(params[:table_content_id])
+  
+  @table_content.table_rows.each do |table_row|
+    CelTable.create( :position => params[:position], :table_row_id => table_row.id)
+    
+  
+  end
+  @table_content.nbr_cols = @table_content.nbr_cols + 1
+  @table_content.save
+  end
+
+  def update
+  end
+
+  def destroy
+  @table_content = TableContent.find(params[:table_content_id])
+  
+  
+  
+  
+  
+  CelTable.where(:table_row_id => @table_content.table_row_ids,:position => params[:id] ).each do |cel_table|
+    cel_table.destroy
+    
+  end
+  
+  @table_content.nbr_cols = @table_content.nbr_cols - 1
+  @table_content.save
+  end
+
+end
diff --git a/app/controllers/portlet/table_contents_controller.rb b/app/controllers/portlet/table_contents_controller.rb
new file mode 100644
index 0000000..f8d84cb
--- /dev/null
+++ b/app/controllers/portlet/table_contents_controller.rb
@@ -0,0 +1,108 @@
+# -*- encoding : utf-8 -*-
+class Portlet::TableContentsController < ApplicationController
+  layout "admin"
+
+  def new
+    @table_content = TableContent.new
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+  def create
+    @table_content = TableContent.new(params.require(:table_content).permit!)
+
+    respond_to do |format|
+      if @table_content.save
+        
+        
+        @portlet = Portlet.create(:position => params[:position], :block_id => params[:block_id], :content => @table_content)
+        
+      
+        
+        
+        
+        format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js { render :template => "portlet/shared/create" }
+      else
+        format.html { render :action => "new" }
+        format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @table_content = TableContent.find(params[:id])
+    @portlet = Portlet.find(params[:portlet_id])
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @table_content = TableContent.find(params[:id])
+    @portlet = @table_content.portlet
+    
+    respond_to do |format|
+          if @table_content.update_attributes(params.require(:table_content).permit!)
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (modification d'un portlet)")
+          end
+        end
+    
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:portlet_id])
+    @table_content = TableContent.find(params[:id])
+    @table_content.destroy
+    
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+      if @portlet.block.blockable_type == "Page"
+
+        ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (suppression d'un portlet)")
+      end
+    end
+    
+    respond_to do |format|
+      format.html {}
+      format.js { render :template => "portlet/shared/destroy" }
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/table_rows_controller.rb b/app/controllers/portlet/table_rows_controller.rb
new file mode 100644
index 0000000..4092239
--- /dev/null
+++ b/app/controllers/portlet/table_rows_controller.rb
@@ -0,0 +1,106 @@
+# -*- encoding : utf-8 -*-
+class Portlet::TableRowsController < ApplicationController
+  layout "admin"
+
+  def new
+    @title_content = TitleContent.new
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+  def create
+    @table_row = TableRow.new(params.require(:table_row).permit!)
+    
+    respond_to do |format|
+      if @table_row.save
+
+        @table = @table_row.table_content
+        @table.nbr_cols.times do
+          cel_table = CelTable.new
+          @table_row.cel_tables << cel_table
+        end
+        nbr_past = @table.nbr_rows
+        @table.nbr_rows = nbr_past +1
+        @table.save
+        
+        
+        @portlet = Portlet.find(@table.portlet.id)
+
+      #format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js
+      else
+      #format.html { render :action => "new" }
+      #format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @title_content = TitleContent.find(params[:id])
+    @portlet = Portlet.find(params[:portlet_id])
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @title_content = TitleContent.find(params[:id])
+    @portlet = Portlet.find(params[:portlet_id])
+    
+    respond_to do |format|
+          if @title_content.update_attributes(params.require(:table_row).permit!)
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (modification d'un portlet)")
+          end
+        end
+    
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    
+    @table_row = TableRow.find(params[:id])
+    @table_content = @table_row.table_content
+    @table_row.destroy
+    
+    
+    respond_to do |format|
+      format.html {}
+      format.js 
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/text_contents_controller.rb b/app/controllers/portlet/text_contents_controller.rb
new file mode 100644
index 0000000..6e7fdf9
--- /dev/null
+++ b/app/controllers/portlet/text_contents_controller.rb
@@ -0,0 +1,116 @@
+# -*- encoding : utf-8 -*-
+class Portlet::TextContentsController < ApplicationController
+  layout "admin"
+
+  def new
+    @text_content = TextContent.new
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+  def create
+    @text_content = TextContent.new(params.require(:text_content).permit!)
+
+    respond_to do |format|
+      if @text_content.save
+        
+        
+        @portlet = Portlet.create(:position => params[:position], :block_id => params[:block_id], :content => @text_content)
+        
+        
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (ajout d'un portlet)")
+          end
+        end
+        
+        
+        
+        format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js { render :template => "portlet/shared/create" }
+      else
+        format.html { render :action => "new" }
+        format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @text_content = TextContent.find(params[:id])
+    @portlet = Portlet.find(params[:portlet_id])
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @text_content = TextContent.find(params[:id])
+    @portlet = @text_content.portlet
+    params[:text_content][:content] = params[:text_content][:content]
+    respond_to do |format|
+          if @text_content.update_attributes(params.require(:text_content).permit!)
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (modification d'un portlet)")
+          end
+        end
+    
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:portlet_id])
+    @text_content = TextContent.find(params[:id])
+    @text_content.destroy
+    
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+      if @portlet.block.blockable_type == "Page"
+
+        ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (suppression d'un portlet)")
+      end
+    end
+    
+    respond_to do |format|
+      format.html {}
+      format.js { render :template => "portlet/shared/destroy" }
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/portlet/title_contents_controller.rb b/app/controllers/portlet/title_contents_controller.rb
new file mode 100644
index 0000000..4b0b4c7
--- /dev/null
+++ b/app/controllers/portlet/title_contents_controller.rb
@@ -0,0 +1,116 @@
+# -*- encoding : utf-8 -*-
+class Portlet::TitleContentsController < ApplicationController
+  layout "admin"
+
+  def new
+    @title_content = TitleContent.new
+
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/new" }
+    end
+  end
+
+  def create
+    @title_content = TitleContent.new(params.require(:title_content).permit!)
+
+    respond_to do |format|
+      if @title_content.save
+        
+        
+        @portlet = Portlet.create(:position => params[:position], :block_id => params[:block_id], :content => @title_content)
+        
+        
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+            ##to_my_log("[Page_"+@portlet.block.blockable.id.to_s+"] "+"Modification de la page "+@portlet.block.blockable.title.to_s+" (ajout d'un portlet)")
+          end
+        end
+        
+        
+        
+        format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Elément ajouté avec succès.') }
+        format.js { render :template => "portlet/shared/create" }
+      else
+        format.html { render :action => "new" }
+        format.js { render :template => "portlet/shared/new" }
+      end
+    end
+  end
+
+  def edit
+    @title_content = TitleContent.find(params[:id])
+    @portlet = @title_content.portlet
+    respond_to do |format|
+      format.html {
+        if request.xhr?
+          render :template => "portlet/shared/edit", :layout => false
+        end
+      }
+      format.js { render :template => "portlet/shared/edit" }
+    end
+  end
+  
+  
+
+
+
+  def show
+
+
+  end
+
+  def update
+    @title_content = TitleContent.find(params[:id])
+    @portlet = @title_content.portlet
+    
+    respond_to do |format|
+          if @title_content.update_attributes(params.require(:title_content).permit!)
+        if @portlet.block and @portlet.block.blockable
+          @portlet.block.blockable.updated_at = Time.now
+          @portlet.block.blockable.save
+          if @portlet.block.blockable_type == "Page"
+
+          
+          end
+        end
+    
+            format.html { redirect_to([:admin, @portlet.block.blockable], :notice => 'Titre mis à jour.') }
+        format.js { render :template => "portlet/shared/update" }
+          else
+            format.html { render :action => "portlet/shared/edit" } 
+        format.js { render :template => "portlet/shared/edit" }
+          end
+
+    end
+  end
+
+  def destroy
+    @portlet = Portlet.find(params[:portlet_id])
+    @title_content = TitleContent.find(params[:id])
+    @title_content.destroy
+    
+    if @portlet.block and @portlet.block.blockable
+      @portlet.block.blockable.updated_at = Time.now
+      @portlet.block.blockable.save
+      if @portlet.block.blockable_type == "Page"
+
+        flash[:notice] = "Portlet supprimé."
+      end
+    end
+    
+    respond_to do |format|
+      format.html {}
+      format.js { render :template => "portlet/shared/destroy" }
+    end
+  end
+
+ 
+end
diff --git a/app/controllers/public/articles_controller.rb b/app/controllers/public/articles_controller.rb
new file mode 100644
index 0000000..2f74ef2
--- /dev/null
+++ b/app/controllers/public/articles_controller.rb
@@ -0,0 +1,100 @@
+# -*- encoding : utf-8 -*-
+
+class Public::ArticlesController < ApplicationController
+	
+	layout "public"
+	
+  def archive
+    
+  end
+  
+	def index
+		
+		@articles = Article.before(Date.today).recents
+
+		@articles = @articles.page(params[:page]).per(3)
+		
+		
+		@title = "Articles du blog"
+	end
+
+	def feed
+		# this will be the name of the feed displayed on the feed reader
+		@title = "La cabane du lutin"
+
+		# the news items
+		@articles = Article.before(Date.today).recents
+
+		# this will be our Feed's update timestamp
+		@updated = @articles.first.updated_at unless @articles.empty?
+
+		
+	end
+
+
+	
+  	def tags
+  		@tag = Tag.find_by_slug(params[:id])
+	
+		
+	
+  		if @tag		
+  			@title = "tag : "+@tag.name.to_s
+  			@articles =  Kaminari.paginate_array(@tag.recents_articles).page(params[:page]).per(3)
+  			
+        
+  			render :template => "public/articles/index"
+  		else
+  			redirect_to "/", :notice => "La page que vous demandez n'a pas pu être trouvée.<br /><br />Vous avez donc été redirigé sur notre page d'accueil"
+			
+  		end
+    	end
+
+	
+
+	
+	def category
+	
+		
+	
+		
+		@category = Category.find_by_slug(params[:slug])
+		@articles = @category.articles.before(Date.today).recents
+		@articles = @articles.page(params[:page]).per(3)
+		@title = "Articles du blog"
+		@index_title = 'Articles de la catégorie "'+@category.name+'"'
+		render :action => :index
+		
+	end
+	
+	def archives
+		@month = Date.parse("#{params[:year]}/#{params[:month]}").beginning_of_month 
+		@articles = Article.recents.where("enabled = ? and published_at > ? and published_at < ?", true, @month, @month.end_of_month ).before(Date.today)
+		@articles = @articles.page(params[:page]).per(3)
+		@title = "Articles du blog"
+		if [4,8].include?(@month.month)
+			@index_title = 'Articles du mois d\''+l(@month, :format => "%B %Y")+''
+		else
+			@index_title = 'Articles du mois de '+l(@month, :format => "%B %Y")+''
+		end
+		
+		render :action => :index
+	end
+	
+	
+	def show
+		@article = Article.find_by_slug(params[:id])
+	
+		if @article	and @article.enabled	
+			
+			@title = @article.title
+			@thumbnail_image = @article.image_file.file.large.medium.small.thumb.url if @article.image_file
+			
+		else
+			redirect_to "/", :notice => "La page que vous demandez n'a pas pu être trouvée.<br /><br />Vous avez donc été redirigé sur notre page d'accueil"
+			
+		end
+  	end
+
+	
+end
diff --git a/app/controllers/public/comments_controller.rb b/app/controllers/public/comments_controller.rb
new file mode 100644
index 0000000..54745d5
--- /dev/null
+++ b/app/controllers/public/comments_controller.rb
@@ -0,0 +1,19 @@
+class Public::CommentsController < ApplicationController  
+
+	def create
+		@comment = Comment.new(params.require(:comment).permit(:website, :pseudo, :email, :comment, :commentable_id, :commentable_type))
+	
+		
+
+	
+		if @comment.save
+			commentable = @comment.commentable
+			@comment_id = @comment.id
+			@comment = Comment.new
+			@comment.commentable = commentable
+
+		end
+
+	end
+
+end
diff --git a/app/controllers/public/events_controller.rb b/app/controllers/public/events_controller.rb
new file mode 100644
index 0000000..09e75dc
--- /dev/null
+++ b/app/controllers/public/events_controller.rb
@@ -0,0 +1,38 @@
+# -*- encoding : utf-8 -*-
+
+class Public::EventsController < ApplicationController
+	
+	layout "public"
+	
+  def archive
+    
+  end
+  
+	def index
+		
+		@events = Event.before(Date.today).recents
+
+		@events = @events.page(params[:page]).per(3)
+		
+		
+		@title = "Events du blog"
+	end
+
+	
+	
+	def show
+		@event = Event.find_by_slug(params[:id])
+	
+		if @event#	and @event.enabled	
+			
+			@title = @event.title
+			@thumbnail_image = @event.image_file.file.large.medium.small.thumb.url if @event.image_file
+			
+		else
+			redirect_to "/", :notice => "La page que vous demandez n'a pas pu être trouvée.<br /><br />Vous avez donc été redirigé sur notre page d'accueil"
+			
+		end
+  	end
+
+	
+end
diff --git a/app/controllers/public/menu_items_controller.rb b/app/controllers/public/menu_items_controller.rb
new file mode 100644
index 0000000..f26ce15
--- /dev/null
+++ b/app/controllers/public/menu_items_controller.rb
@@ -0,0 +1,79 @@
+# -*- encoding : utf-8 -*-
+class Public::MenuItemsController < ApplicationController
+  
+  layout "public"
+  
+  def redirect
+    redirect_to menu_item_path(:url => params[:url]), status: 301
+  end
+  
+  def archive
+    @menu_item= MenuItem.archived.find(params[:id])
+  end
+  
+  
+  def show
+    
+    
+    if params[:url]
+      
+      url = params[:url].split("/")
+      url = url.map do |u|
+        u.to_slug
+      end
+      url = url.join("/")
+        
+      @menu_item = MenuItem.find_by_permalink(url)
+    else
+    
+      @menu_item = MenuItem.find_by_slug("index")
+    
+    
+    end
+    
+    
+    
+    if @menu_item
+    
+      if !@menu_item.enabled
+        redirect_to "/404.html"
+    
+      elsif @menu_item.menu_content_type == "MenuAlias"
+        if @menu_item.menu_content.menu_item
+          redirect_to menu_item_path(:url => @menu_item.menu_content.menu_item_alias.permalink)
+        else
+          redirect_to "/404.html"
+        end
+  
+    
+      elsif @menu_item.menu_content_type == "Page"
+        
+        
+        if @menu_item.password and !session[:auth]
+          session[:prev_page] = request.url
+          redirect_to new_public_entreprise_path
+        else
+          @page = @menu_item.menu_content
+      
+          @title = @page.title
+          @description = @page.description
+          @keywords = @page.keywords
+          
+        end
+      
+          
+      
+      
+      end
+    else
+      slug = params[:url].split("/")[-1] if params[:url]
+      if slug and Article.exists?(:slug => slug)
+        
+        redirect_to article_path(:id => slug), status: 301
+      else
+      redirect_to "/404.html"
+      end
+    end
+    end
+
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 24a9642..5ad503a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,3 +1,15 @@
 # -*- encoding : utf-8 -*-
 module ApplicationHelper
+  
+  
+  
+  def flash_js
+    r = raw ("$('#flashs').append('"+ escape_javascript(bootstrap_flash) +"');flash_delay();")
+    flash[:notice] = nil
+    flash[:error] = nil
+    flash[:success] = nil
+    
+    r
+  end
+  
 end
diff --git a/app/models/admin.rb b/app/models/admin.rb
index 59dc51a..422e7ac 100644
--- a/app/models/admin.rb
+++ b/app/models/admin.rb
@@ -1,16 +1,47 @@
-# -*- encoding : utf-8 -*-
 class Admin < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable,
-  # :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
-
+  
+  #attr_accessible :login, :email, :firstname, :name, :password, :password_confirmation, :avatar, :moderator, :as => :admin
+  
+  has_secure_password
+ 
   attr_accessor :login
+ 
+  validates :password, :presence => true,
+                         :confirmation => true,
+                         :length => {:within => 6..40},
+                         :on => :create
+                         
+  validates :password, :confirmation => true,
+                         :length => {:within => 6..40},
+                         :allow_blank => true,
+                         :on => :update
+ validates :password_confirmation, :presence => true,
+    :unless => Proc.new { |a| a.password.blank? }
+ 
+ 
+  validates :email, :presence => true, :uniqueness => true
+  validates :username, :presence => true, :uniqueness => true
   
-  # Setup accessible (or protected) attributes for your model
-  #attr_accessible :email, :password, :password_confirmation, :remember_me, :username, :name, :firstname, :file
-  # attr_accessible :title, :body
+  mount_uploader :avatar, AvatarUploader
+
+  before_create { generate_token(:remember_token) }
+
+  def send_password_reset
+    generate_token(:reset_password_token)
+    self.reset_password_sent_at = Time.now
+    save!
+    AdminMailer.password_reset(self).deliver
+  end
+
+  def generate_token(column)
+    begin
+      self[column] = SecureRandom.urlsafe_base64
+    end while Admin.exists?(column => self[column])
+  end
   
-  mount_uploader :file, AvatarUploader
+  def self.find_by_login(login)
+    
+    Admin.where("username = ? OR email = ?", login,login).first
+    
+  end 
 end
diff --git a/app/models/album.rb b/app/models/album.rb
new file mode 100644
index 0000000..7c44dbb
--- /dev/null
+++ b/app/models/album.rb
@@ -0,0 +1,5 @@
+# -*- encoding : utf-8 -*-
+class Album < ActiveRecord::Base
+  validates :name, :presence => true, :uniqueness => true
+
+end
diff --git a/app/models/allowed_block_content.rb b/app/models/allowed_block_content.rb
new file mode 100644
index 0000000..d642807
--- /dev/null
+++ b/app/models/allowed_block_content.rb
@@ -0,0 +1,5 @@
+# -*- encoding : utf-8 -*-
+class AllowedBlockContent < ActiveRecord::Base
+  belongs_to :block
+  belongs_to :content_type
+end
diff --git a/app/models/article.rb b/app/models/article.rb
new file mode 100644
index 0000000..918a232
--- /dev/null
+++ b/app/models/article.rb
@@ -0,0 +1,116 @@
+class Article < ActiveRecord::Base
+  
+  has_many :comments, :as => :commentable
+  
+  belongs_to :image_file
+	validates :title, :presence => true
+	validates :slug, :presence => true, :uniqueness => true
+	has_one :block, :as => :blockable
+	
+	belongs_to :category
+	has_many :enabled_comments,-> {where(:enabled => true)}, :source => :comments, :as => :commentable
+	after_create :after_creation
+	
+  
+  HUMAN_NAME =  "lien vers un article."
+  
+	before_validation do
+		self.slug = self.slug.to_slug
+		self.tags_cache = self.tags_cache.gsub(/ +/, ' ').gsub(/, /,',').gsub(/ ,/,',').gsub(/,+/, ',')
+    self.tags_cache = self.tags_cache.to_s.gsub(/ +/, ' ').gsub(/, /,',').gsub(/ ,/,',').gsub(/,+/, ',')
+		
+	end
+	
+	
+
+	def after_creation
+	    @block = Block.new(:block_name => "Contenu")
+		@block.blockable = self
+		@block.save
+		
+		
+	end
+  
+  def alloweds_types
+  self.block.allow_types :TitleContent, :TextContent, :ImageContent, :LinkContent, :GalleryContent, :HtmlContent
+  
+  end
+  
+	
+	scope :recents, -> {where("enabled = ?",true ).order("published_at DESC, created_at DESC")}
+	
+	scope :between, lambda { |start, stop|
+	        after(start).before(stop)
+	    }
+	
+	scope :after, lambda { |date|
+	        where("(published_at >= ?)", date )
+	    }
+	scope :before, lambda { |date|
+	        where("(published_at <= ?)", date )
+	    }
+
+	
+	
+	after_initialize do
+	    if self.published_at			
+			self.published_at = self.published_at.strftime('%d/%m/%Y')
+		end
+	
+	end
+  
+  
+
+	
+	
+	before_save do
+		#self.tags_cache = nil
+		
+		tag_list = self.tags_cache.split(',').uniq
+
+		tag_names = []
+		tag_objects_list = []
+
+		tag_list.each do |tag_name|
+			if tag = Tag.create(:name => tag_name.capitalize) and tag.id
+				self.tags << tag
+			else
+				tag = Tag.find_by_slug(tag_name.to_slug)
+				self.tags << tag if !self.tags.include?(tag)
+			end
+			tag_objects_list << tag
+			tag_names << tag.name
+		end
+    self.tags_cache = tag_names.sort.join(",").to_s
+		tags_to_remove = tags - tag_objects_list
+		tags_id_to_remove = (tags - tag_objects_list).map {|t| t.id}
+		self.tag_taggables.where(:tag_id => tags_id_to_remove).each { |t| t.destroy }
+    
+    
+	end
+	
+	
+	
+	has_many :tag_taggables, :as => :taggable
+	has_many :tags, :through => :tag_taggables 
+  
+  def generate_tags_cache
+    self.tags_cache = self.tags.map{|a| a.name}.join(",").to_s
+  end
+  
+  def tag_by_tag_ids(tags_id)
+    Tag.find(tags_id).each do |tag|
+      self.tags << tag if !self.tags.include?(tag)
+    end
+    self.generate_tags_cache
+    self.save
+    
+  end
+  
+	before_destroy do
+    self.tags_cache = ""
+    self.save
+  end
+
+
+end
diff --git a/app/models/block.rb b/app/models/block.rb
new file mode 100644
index 0000000..8d03a1d
--- /dev/null
+++ b/app/models/block.rb
@@ -0,0 +1,60 @@
+# -*- encoding : utf-8 -*-
+class Block < ActiveRecord::Base
+
+  ContentTypes = {
+    TitleContent: "Titre",
+    TextContent: "Texte",
+    ImageContent: "Image",
+    LinkContent:"Lien",
+    BreakContent: "Séparation",
+    HtmlContent: "Code HTML",
+    DownloadContent: "Téléchargement",
+    GalleryContent: "Galerie",
+    DynamicContent: "Contenu dynamique",
+    TableContent: "Tableau",
+    BlockContent: "Bloc",
+    MapContent: "Plan",
+   }
+  
+
+  belongs_to :blockable, :polymorphic => true
+  
+  #has_many :portlets, :dependent => :destroy, -> {:order => :position}
+  
+  has_many :portlets,-> { order :position }, dependent: :destroy
+  
+  accepts_nested_attributes_for :portlets
+
+
+  def allow_types(*type)
+    if type == [:all]
+      ContentTypes
+    else
+      allow_types = {}
+      type.each do |content|
+    
+        allow_types[content] = ContentTypes[content]
+      end
+      allow_types
+    end
+  end
+
+def alloweds_types
+  allow_types :all #:TitleContent, :ImageContent
+  
+end
+
+  def dup
+    @block = Block.new(self.attributes)
+    @block.id = nil
+    @block.save
+    
+    self.portlets.each do |portlet|
+      new_p = portlet.dup
+      new_p.save
+      @block.portlets << new_p
+    end
+    @block
+  end
+
+end
diff --git a/app/models/block_content.rb b/app/models/block_content.rb
new file mode 100644
index 0000000..65fe4e1
--- /dev/null
+++ b/app/models/block_content.rb
@@ -0,0 +1,60 @@
+# -*- encoding : utf-8 -*-
+class BlockContent < ActiveRecord::Base
+  has_one :portlet, :as => :content, :dependent => :destroy
+  has_many :blocks, :as => :blockable, :dependent => :destroy
+
+  validates :nbr_columns, :presence => true
+
+  STYLES = [["normal",1],["fond gris foncé",2],["fond gris clair",3],["fond bleu",4],["fond jaune",5],["fond vert",6],["fond béton",7],["Contenu centré",8]]
+  
+  
+  
+  before_create do
+    self.row1 = self.row2 = self.row3 = self.row4 = 12/self.nbr_columns.to_i
+    
+  end
+  
+  def row1_value
+    self.row1.to_i
+    
+  end
+  
+  def row2_value
+    self.row1.to_i+self.row2.to_i
+    
+  end
+  
+  def row3_value
+    self.row1.to_i+self.row2.to_i+self.row3.to_i
+    
+  end
+  
+  def row4_value
+    self.row1.to_i+self.row2.to_i+self.row3.to_i+self.row4.to_i
+    
+  end
+  
+  
+  def dup
+    @new = BlockContent.new(self.attributes)
+    @new.id = nil
+    @new.save
+    
+    
+    self.blocks.each do |block|
+      
+      new_b = block.dup
+      new_b.blockable = @new
+      new_b.save
+      
+    end
+    
+    @new
+    
+  end
+  
+  def self.picto
+    "columns"
+  end
+  
+end
diff --git a/app/models/break_content.rb b/app/models/break_content.rb
new file mode 100644
index 0000000..6f2f322
--- /dev/null
+++ b/app/models/break_content.rb
@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+class BreakContent < ActiveRecord::Base
+  
+  has_one :portlet, :as => :content, :dependent => :destroy
+  STYLES = []#[["Style 1",1], ["Style 2",2]]
+  
+  def self.picto
+    "minus"
+  end
+end
diff --git a/app/models/category.rb b/app/models/category.rb
new file mode 100644
index 0000000..e87fd27
--- /dev/null
+++ b/app/models/category.rb
@@ -0,0 +1,127 @@
+class Category < ActiveRecord::Base
+	has_many :articles
+	
+	validates :name, :presence => true, :uniqueness => true
+	validates :slug, :presence => true, :uniqueness => true
+	
+	before_validation do
+		self.slug = self.name.to_slug
+    self.validate_permalink
+		
+	end
+  attr_accessor :skip_before_update, :skip_permalink
+  acts_as_tree
+  
+  
+  
+  
+  
+  
+	def generate_permalink
+		r = ""
+		
+		node, ancestors = self, []
+		ancestors << node = Category.find(node.parent_id) while node.parent_id?
+		      
+		
+		
+		ancestors.reverse.each do |ancestor|
+			r += ancestor.slug.to_s
+			r+= "/"
+		end
+		r+= self.slug.to_s
+	end
+	
+	def set_permalink
+		
+		
+		if !skip_permalink
+			
+			self.permalink = self.generate_permalink
+			self.skip_permalink = true
+			self.skip_before_update = true
+			
+			
+			
+			self.save
+
+		end
+		
+	end
+	
+	
+	
+	def validate_permalink
+		self.parent_id = nil if self.parent_id == 0
+		errors.add(:parent_id, 'doit être différent de la page actuelle') if parent_id == id and id != nil
+		
+		if self.id
+			errors.add(:parent_id, 'attention la page parente à pour page parente celle-ci = boucle') if self.parent_id and self.id == Category.find(self.parent_id).parent_id
+		end
+
+		conditions = ["parent_id "+(self.parent_id ? "=" : "IS")+" ? and slug = ? "+("and id != ?" if self.id).to_s,self.parent_id ,self.slug]
+		conditions << self.id if self.id
+		if Category.where(conditions).first
+			errors.add(:slug, 'est déjà utilisé') 
+			
+		end
+		
+
+	end
+	
+	
+
+
+
+
+	before_create do
+		if !position
+			top = Category.where( :parent_id => self.parent_id).order("position DESC")
+			if top
+				self.position = top.position.to_i + 1
+			else
+				self.position = 1
+			end
+		end
+		
+	end
+
+	before_update do
+	
+			if self.parent_id_changed?
+				
+				Category.where(["position > ? and parent_id "+(self.changes['parent_id'][0] ? "=" : "IS")+" ?",self.position,self.changes['parent_id'][0]]).each do |portlet|
+					portlet.position = portlet.position - 1
+					portlet.save!
+				end
+				
+				self.position = 1
+				
+				Category.where(["parent_id "+(self.parent_id ? "=" : "IS")+" ?",self.parent_id]).each do |portlet|
+					portlet.position = portlet.position + 1
+
+					portlet.save!
+				end
+				
+				
+				
+				
+			
+		end
+	end
+
+	before_destroy do
+		Category.where(["position > ? and parent_id "+(self.parent_id ? "=" : "IS")+" ?",self.position,self.parent_id]).each do |portlet|
+			portlet.position = portlet.position - 1
+			portlet.skip_before_update = true
+			portlet.save!
+		end
+
+	end
+  
+  
+  
+  
+  
+
+end
diff --git a/app/models/cel_table.rb b/app/models/cel_table.rb
new file mode 100644
index 0000000..0e48d87
--- /dev/null
+++ b/app/models/cel_table.rb
@@ -0,0 +1,90 @@
+# -*- encoding : utf-8 -*-
+class CelTable < ActiveRecord::Base
+  belongs_to :table_row
+  #belongs_to :table_content possible
+  
+  has_one :block, :as => :blockable, :dependent => :destroy
+  
+  attr_accessor :skip_before_update
+
+
+
+
+  before_create do
+    if !position
+      self.position = 1
+    end
+    if position
+      CelTable.where(["position >= ? and table_row_id = ?",self.position,self.table_row_id]).each do |cel_table|
+        cel_table.position = cel_table.position + 1
+        cel_table.skip_before_update = true
+        cel_table.save!
+      end
+    end
+    
+    
+    
+  end
+  
+  after_create do 
+    block = Block.create()
+  
+    self.block = block
+  end
+
+  before_update do
+    if !skip_before_update
+      if self.position_changed?
+        #si la position est plus grande que l'ancienne
+        if self.changes['position'][1] > self.changes['position'][0]
+          CelTable.where(["position > ? and position <= ? and table_row_id = ?",self.changes['position'][0],self.changes['position'][1],self.table_row_id]).each do |cel_table|
+            cel_table.position = cel_table.position - 1
+            cel_table.skip_before_update = true
+            cel_table.save!
+          end
+        end
+        #si la position est plus petite que l'ancienne.  
+        if self.changes['position'][1] < self.changes['position'][0]
+          CelTable.where(["position >= ? and position < ? and table_row_id = ?",self.changes['position'][1],self.changes['position'][0],self.table_row_id]).each do |cel_table|
+            cel_table.position = cel_table.position + 1
+            cel_table.skip_before_update = true
+            cel_table.save!
+          end  
+        end 
+      end
+    end
+  end
+
+  before_destroy do
+    CelTable.where(["position > ? and table_row_id = ?",self.position,self.table_row_id]).each do |cel_table|
+      cel_table.position = cel_table.position - 1
+      cel_table.skip_before_update = true
+      cel_table.save!
+    end
+
+  end
+  
+  def dup
+    @new = CelTable.new(self.attributes)
+    @new.id = nil
+    @new.table_row_id = nil
+    @new.save
+    
+    @new.block.destroy
+  
+      
+      new_b = self.block.dup
+      
+    
+
+      new_b.save
+      @new.block = new_b
+      @new.save
+    
+    @new
+    
+  end
+  
+  
+  
+end
diff --git a/app/models/cible_alias.rb b/app/models/cible_alias.rb
new file mode 100644
index 0000000..1f03364
--- /dev/null
+++ b/app/models/cible_alias.rb
@@ -0,0 +1,26 @@
+# -*- encoding : utf-8 -*-
+class CibleAlias < ActiveRecord::Base
+  include Rails.application.routes.url_helpers
+  belongs_to :menu_item
+
+  
+  validates :menu_item_id, :presence => true
+  #has_one :link_content, :as => :cible
+  has_one :cibleable, :as => :cible
+  
+  def cible_name
+    "A changer"
+  end
+  
+  def cible_url 
+    "A changer"
+  end
+  
+  def url
+    if self.menu_item
+      menu_item_path(:url => self.menu_item.permalink)
+    end  
+    
+  end
+
+end
diff --git a/app/models/cible_url.rb b/app/models/cible_url.rb
new file mode 100644
index 0000000..84841ce
--- /dev/null
+++ b/app/models/cible_url.rb
@@ -0,0 +1,11 @@
+# -*- encoding : utf-8 -*-
+class CibleUrl < ActiveRecord::Base
+  validates :url, :presence => true
+  def cible_name
+    "A changer"
+  end
+  
+  def cible_url 
+    "A changer"
+  end
+end
diff --git a/app/models/comment.rb b/app/models/comment.rb
new file mode 100644
index 0000000..c6c8ad3
--- /dev/null
+++ b/app/models/comment.rb
@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+class Comment < ActiveRecord::Base
+
+  include ActsAsCommentable::Comment
+
+  belongs_to :commentable, :polymorphic => true
+
+ 	validates :pseudo, :presence => true
+	validates :comment, :presence => true
+
+	scope :recents, where("enabled = ?",true ).order("created_at ASC")
+
+
+
+
+end
diff --git a/app/models/data_file.rb b/app/models/data_file.rb
new file mode 100644
index 0000000..7f0f39f
--- /dev/null
+++ b/app/models/data_file.rb
@@ -0,0 +1,44 @@
+# -*- encoding : utf-8 -*-
+class DataFile < ActiveRecord::Base
+  belongs_to :file_folder
+
+
+  mount_uploader :file, FileUploader
+
+  before_save do
+    if !self.name?
+      self.name = File.basename(self.file.filename, File.extname(self.file.filename)).to_s if self.file?
+    end
+
+  end
+  
+  before_create { generate_token() }
+
+
+
+  def file_type
+  
+    
+    mime = `file --mime -br "#{self.file.path}"`.strip.split(';')[0]
+    mime
+    
+  end
+
+  def abstract_file_name
+    self.name
+  end
+
+  def abstract_file_name_slug
+    self.name.to_slug
+  end
+
+  
+
+  def generate_token()
+    begin
+      self[:token] = SecureRandom.urlsafe_base64
+    end while DataFile.exists?(:token => self[:token])
+  end
+
+
+end
diff --git a/app/models/download_content.rb b/app/models/download_content.rb
new file mode 100644
index 0000000..6e09194
--- /dev/null
+++ b/app/models/download_content.rb
@@ -0,0 +1,12 @@
+# -*- encoding : utf-8 -*-
+class DownloadContent < ActiveRecord::Base
+  belongs_to :data_file
+  
+  has_one :portlet, :as => :content, :dependent => :destroy
+
+  STYLES = []#[["Medium","1"], ["Small","2"], ["Square","3"], ["Thumb","4"]]
+
+  def self.picto
+    "cloud-download"
+  end
+end
diff --git a/app/models/dynamic_content.rb b/app/models/dynamic_content.rb
new file mode 100644
index 0000000..1af6aa1
--- /dev/null
+++ b/app/models/dynamic_content.rb
@@ -0,0 +1,13 @@
+# -*- encoding : utf-8 -*-
+class DynamicContent < ActiveRecord::Base
+  has_one :portlet, :as => :content, :dependent => :destroy
+  
+  belongs_to :item
+ 
+  NAMES = {}
+  
+  def self.picto
+    "cog"
+  end
+ 
+end
diff --git a/app/models/external_link.rb b/app/models/external_link.rb
new file mode 100644
index 0000000..833711c
--- /dev/null
+++ b/app/models/external_link.rb
@@ -0,0 +1,16 @@
+class ExternalLink < ActiveRecord::Base
+  validates :url, :presence => true
+  
+  
+  def cible_name
+    "Lien externe : #{self.url}"
+  end
+  
+  def cible_url
+
+    self.url
+
+    
+  end
+
+end
diff --git a/app/models/file_folder.rb b/app/models/file_folder.rb
new file mode 100644
index 0000000..9e9b11b
--- /dev/null
+++ b/app/models/file_folder.rb
@@ -0,0 +1,3 @@
+# -*- encoding : utf-8 -*-
+class FileFolder < ActiveRecord::Base
+end
diff --git a/app/models/gallery_content.rb b/app/models/gallery_content.rb
new file mode 100644
index 0000000..7825f54
--- /dev/null
+++ b/app/models/gallery_content.rb
@@ -0,0 +1,49 @@
+# -*- encoding : utf-8 -*-
+class GalleryContent < ActiveRecord::Base
+  has_many :gallery_images, -> {order :position}
+  
+  has_one :portlet, :as => :content, :dependent => :destroy
+  
+  STYLES = [["Petites miniatures",1], ["Diaporama",2], ["Petits carrés",3], ["Réalisations",4]]
+
+  def dup
+    @new = GalleryContent.new(self.attributes)
+    @new.id = nil
+    @new.save
+    
+    
+    self.gallery_images.each do |gallery_image|
+      
+      new_g = gallery_image.dup
+      new_g.gallery_content = @new
+      new_g.save
+      
+    end
+    
+    @new
+    
+  end
+  
+  def tags
+    to_r = []
+    
+    self.gallery_images.each do |gallery_image|
+      gallery_image.tags.to_s.split(",").each do |tag|
+        to_r << tag.strip
+      end
+      
+      
+      
+    end
+    
+    to_r = to_r.sort.uniq
+    
+    return to_r
+    
+  end
+  
+  def self.picto
+    ""
+  end
+
+end
diff --git a/app/models/gallery_image.rb b/app/models/gallery_image.rb
new file mode 100644
index 0000000..72c5b02
--- /dev/null
+++ b/app/models/gallery_image.rb
@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+class GalleryImage < ActiveRecord::Base
+  belongs_to :image_file
+  belongs_to :gallery
+  belongs_to :gallery_content
+
+  validates :title, :presence => true
+  
+  
+  def tags_class
+    to_r = []
+    self.tags.to_s.split(",").each do |tag|
+      to_r << tag.to_slug
+    end
+    to_r = to_r.join(" ")
+  end
+end
diff --git a/app/models/html_content.rb b/app/models/html_content.rb
new file mode 100644
index 0000000..22ed6e7
--- /dev/null
+++ b/app/models/html_content.rb
@@ -0,0 +1,11 @@
+# -*- encoding : utf-8 -*-
+class HtmlContent < ActiveRecord::Base
+  has_one :portlet, :as => :content, :dependent => :destroy
+
+  STYLES = []#[["Style 1",1], ["Style 2",2]]
+  CONTENT_TYPES = ["haml","html"]
+  
+  def self.picto
+    "code"
+  end
+end
diff --git a/app/models/image_content.rb b/app/models/image_content.rb
new file mode 100644
index 0000000..e38df16
--- /dev/null
+++ b/app/models/image_content.rb
@@ -0,0 +1,35 @@
+# -*- encoding : utf-8 -*-
+class ImageContent < ActiveRecord::Base
+  belongs_to :image_file
+
+  has_one :portlet, :as => :content, :dependent => :destroy
+  STYLES = [["Grande","5"],["Taille moyenne","1"], ["Petite taille","2"], ["Petit carré","3"], ["Miniature","4"],["Orginale","6"]]
+  ALIGNS = [["centré","center"], ["gauche","left"],["droite","right"],["Aucun","none"]]
+
+  belongs_to :cible, :polymorphic => true
+  accepts_nested_attributes_for :cible
+  
+  before_validation do
+    if !self.with_cible
+      
+      self.cible_type = nil
+      self.cible_id = nil
+    end
+  end
+
+  
+  
+  def url
+    
+    if self.cible
+      cible.url
+    else
+      ""  
+    end
+    
+  end
+
+  def self.picto
+    "picture-o"
+  end
+end
diff --git a/app/models/image_file.rb b/app/models/image_file.rb
new file mode 100644
index 0000000..d7d9114
--- /dev/null
+++ b/app/models/image_file.rb
@@ -0,0 +1,42 @@
+# -*- encoding : utf-8 -*-
+class ImageFile < ActiveRecord::Base
+  mount_uploader :file, ImageUploader
+
+  before_save do
+    if !self.name?
+      self.name = File.basename(self.file.filename, File.extname(self.file.filename)).to_s if self.file?
+    end
+      
+  end
+  
+  before_validation do 
+     if self.tags?
+      self.tags = self.tags.gsub(/ +?,/, ',')
+      self.tags = self.tags.gsub(/, +?/, ',')
+      self.tags = self.tags.gsub(/,/, ', ')
+    end
+
+  end
+  
+  after_save do 
+    tags_to_save = self.tags.to_s.split(',')
+    tags_to_save.each do |t|
+      name = t.to_s.strip
+      
+      Tag.find_or_create_by_name(t.to_s.strip) if name.size > 0
+    end
+  end
+ 
+  
+  def rotate(degrees=90)
+    versions = [self.file.path, self.file.large.path, self.file.large.medium.path, self.file.large.medium.small.path, self.file.large.medium.small.thumb.path, self.file.square.path]
+    
+    versions.each do |v|
+      image = Magick::ImageList.new(v)
+      image = image.rotate(degrees)
+      image.write(v)
+    end
+    self.updated_at = Time.now
+    self.save
+  end
+end
diff --git a/app/models/img_link_content.rb b/app/models/img_link_content.rb
new file mode 100644
index 0000000..f03f214
--- /dev/null
+++ b/app/models/img_link_content.rb
@@ -0,0 +1,39 @@
+# -*- encoding : utf-8 -*-
+class ImgLinkContent < ActiveRecord::Base
+  belongs_to :image_file
+
+ belongs_to :item
+
+  belongs_to :cible, :polymorphic => true
+
+   has_one :portlet, :as => :content, :dependent => :destroy
+
+  validates :title, :presence => true
+
+  accepts_nested_attributes_for :cible, :reject_if => lambda { |a| 1 == 1 }
+
+  before_validation do
+    if !self.with_cible
+      
+      self.cible_type = nil
+      self.cible_id = nil
+    end
+  end
+
+
+  def url
+
+    if self.cible
+      cible.url
+    else
+      ""  
+    end
+
+  end
+
+  STYLES = [["Style 1",1], ["Style 2",2]]
+  
+  def self.picto
+    "cloud-download"
+  end
+end
diff --git a/app/models/link_content.rb b/app/models/link_content.rb
new file mode 100644
index 0000000..6e5f7d4
--- /dev/null
+++ b/app/models/link_content.rb
@@ -0,0 +1,45 @@
+# -*- encoding : utf-8 -*-
+class LinkContent < ActiveRecord::Base
+  belongs_to :item
+ 
+  belongs_to :cible, :polymorphic => true
+  accepts_nested_attributes_for :cible
+  
+  CIBLE_TYPES = [
+    {:slug => "MenuItems", :name => "Alias"},
+    {:slug => "ExternalLink", :name => "Lien externe"},
+    
+  ]
+  
+  def url
+    
+    if self.cible
+      cible.url
+    else
+      ""  
+    end
+    
+  end
+
+  has_one :portlet, :as => :content, :dependent => :destroy
+
+  validates :name, :presence => true
+  
+  
+  
+  def url
+    
+    if self.cible
+      cible.url
+    else
+      ""  
+    end
+    
+  end
+
+  STYLES = [["Style 1",1], ["Style 2",2]]
+  
+  def self.picto
+    "chain"
+  end
+end
diff --git a/app/models/map_content.rb b/app/models/map_content.rb
new file mode 100644
index 0000000..64e87cc
--- /dev/null
+++ b/app/models/map_content.rb
@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+class MapContent < ActiveRecord::Base
+
+  has_one :portlet, :as => :content, :dependent => :destroy
+
+  validates :address, :presence => true
+
+  VIEWS = [["Plan",1], ["Mixte",2], ["Satelite",3]]
+  
+  ZOOMS = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21]
+  
+  
+  def self.picto
+    "map-marker"
+  end
+end
diff --git a/app/models/menu.rb b/app/models/menu.rb
new file mode 100644
index 0000000..cc91171
--- /dev/null
+++ b/app/models/menu.rb
@@ -0,0 +1,12 @@
+# -*- encoding : utf-8 -*-
+class Menu < ActiveRecord::Base
+
+  has_many :menu_items
+
+
+  validates_presence_of :name, :max_levels
+  validates_uniqueness_of :name
+  
+
+  
+end
diff --git a/app/models/menu_alias.rb b/app/models/menu_alias.rb
new file mode 100644
index 0000000..2faa493
--- /dev/null
+++ b/app/models/menu_alias.rb
@@ -0,0 +1,13 @@
+# -*- encoding : utf-8 -*-
+class MenuAlias < ActiveRecord::Base
+  belongs_to :menu_item_alias, :foreign_key => :menu_item_id, :class_name => "MenuItem"
+
+  has_one :menu_item, :as => :menu_content
+  
+  validates :menu_item_id, :presence => true
+  
+  HUMAN_NAME = "Alias"
+  
+
+    
+end
diff --git a/app/models/menu_folder.rb b/app/models/menu_folder.rb
new file mode 100644
index 0000000..7a35f9d
--- /dev/null
+++ b/app/models/menu_folder.rb
@@ -0,0 +1,8 @@
+# -*- encoding : utf-8 -*-
+class MenuFolder < ActiveRecord::Base
+  belongs_to :folder
+
+  HUMAN_NAME = "Dossier"
+  
+  
+end
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
new file mode 100644
index 0000000..117efb4
--- /dev/null
+++ b/app/models/menu_item.rb
@@ -0,0 +1,165 @@
+# -*- encoding : utf-8 -*-
+class MenuItem < ActiveRecord::Base
+  
+  ContentTypes =[
+    {:slug => "Page", :name => "page"},
+    {:slug => "MenuAlias", :name => "Alias"},
+    {:slug => "MenuUrl", :name => "Lien externe"},
+    {:slug => "Article", :name => "Lien vers un article"},
+  ] 
+  
+  
+  include Rails.application.routes.url_helpers
+  
+  belongs_to :menu_content, :polymorphic => true
+  belongs_to :menu
+  validates :name, :presence => true
+  validates :slug, :presence => true
+
+
+  attr_accessor :skip_before_update, :skip_permalink
+  
+  
+  accepts_nested_attributes_for :menu_content
+
+  acts_as_tree
+
+  def url
+    if menu_content
+      self.permalink
+      
+    else
+      "/404.html"
+    end
+  end
+  
+  def cible_url
+    menu_item_path(:url => self.permalink)
+  end
+
+  before_validation do
+    self.slug = self.slug.to_slug
+    #self.validate_permalink
+  end
+  
+  before_save do 
+
+  end
+
+  def generate_permalink
+    r = ""
+    
+    node, ancestors = self, []
+    ancestors << node = MenuItem.find(node.parent_id) while node.parent_id?
+          
+    
+    
+    ancestors.reverse.each do |ancestor|
+      r += ancestor.slug.to_s
+      r+= "/"
+    end
+    r+= self.slug.to_s
+  end
+  
+  def set_permalink
+    
+    
+    if !skip_permalink
+      
+      self.permalink = self.generate_permalink
+      self.skip_permalink = true
+      self.skip_before_update = true
+      
+      
+      
+      self.save
+    
+    
+    #  self.children.each do |child|        
+    #    child.save
+    #  end
+    end
+    
+  end
+  
+  
+  
+  def validate_permalink
+    self.parent_id = nil if self.parent_id == 0
+    errors.add(:parent_id, 'doit être différent de la page actuelle') if parent_id == id and id != nil
+    
+    if self.id
+      errors.add(:parent_id, 'attention la page parente à pour page parente celle-ci = boucle') if self.parent_id and self.id == MenuItem.find(self.parent_id).parent_id
+    end
+
+    conditions = ["menu_id = ? and parent_id "+(self.parent_id ? "=" : "IS")+" ? and slug = ? "+("and id != ?" if self.id).to_s, self.menu_id,self.parent_id ,self.slug]
+    conditions << self.id if self.id
+    if MenuItem.where(conditions).first
+      errors.add(:slug, 'est déjà utilisé') 
+      
+    end
+    
+
+  end
+  
+  
+  def cible_name
+    "Elément de menu : #{self.name}"
+  end
+
+
+
+  before_create do
+    if !position
+      top = MenuItem.where(:parent_id => self.parent_id, :menu_id => self.menu_id).order("position DESC").first
+      if top
+        self.position = top.position.to_i + 1
+      else
+        self.position = 1
+      end
+    end
+    
+  end
+
+  before_update do
+  
+      if self.parent_id_changed?
+        
+        MenuItem.where(["menu_id = ? and position > ? and parent_id "+(self.changes['parent_id'][0] ? "=" : "IS")+" ?",self.menu_id,self.position,self.changes['parent_id'][0]]).each do |portlet|
+          portlet.position = portlet.position - 1
+          portlet.save!
+        end
+        
+        self.position = 1
+        
+        MenuItem.where(["menu_id = ? and parent_id "+(self.parent_id ? "=" : "IS")+" ?",self.menu_id,self.parent_id]).each do |portlet|
+          portlet.position = portlet.position + 1
+
+          portlet.save!
+        end
+        
+        
+        
+        
+      
+    end
+  end
+
+  before_destroy do
+    MenuItem.where(["menu_id = ? and position > ? and parent_id "+(self.parent_id ? "=" : "IS")+" ?",self.menu_id,self.position,self.parent_id]).each do |portlet|
+      portlet.position = portlet.position - 1
+      portlet.skip_before_update = true
+      portlet.save!
+    end
+
+  end
+  
+  scope :archived, -> {where("archived = ?",true )}
+  scope :unarchived, -> {where(:archived => nil )}
+  
+  
+  
+  
+
+
+end
diff --git a/app/models/menu_url.rb b/app/models/menu_url.rb
new file mode 100644
index 0000000..b99b8e8
--- /dev/null
+++ b/app/models/menu_url.rb
@@ -0,0 +1,9 @@
+# -*- encoding : utf-8 -*-
+class MenuUrl < ActiveRecord::Base
+  has_one :menu_item, :as => :menu_content
+  
+  validates :url, :presence => true
+  
+  HUMAN_NAME = "Lien externe"
+
+end
diff --git a/app/models/page.rb b/app/models/page.rb
new file mode 100644
index 0000000..cea0a05
--- /dev/null
+++ b/app/models/page.rb
@@ -0,0 +1,43 @@
+# -*- encoding : utf-8 -*-
+class Page < ActiveRecord::Base
+
+
+  has_one :menu_item, :as => :menu_content
+  
+  has_many :blocks, :as => :blockable, :dependent => :destroy
+  
+  
+  validates :title, :presence => true
+  
+  HUMAN_NAME = "Page"
+  
+  after_create :after_creation
+  
+  def after_creation
+      @block = Block.new(:block_name => "general")
+    @block.blockable = self
+    @block.save
+  
+  
+  end
+  
+  def dup
+    @new = Page.new(self.attributes)
+    @new.id = nil
+    @new.save
+    @new.blocks.destroy_all
+    
+    self.blocks.each do |block|
+      
+      new_b = block.dup
+      new_b.blockable = @new
+      new_b.save
+      
+      
+    end
+    
+    @new
+    
+  end
+
+end
diff --git a/app/models/portlet.rb b/app/models/portlet.rb
new file mode 100644
index 0000000..2b4b5a3
--- /dev/null
+++ b/app/models/portlet.rb
@@ -0,0 +1,39 @@
+# -*- encoding : utf-8 -*-
+class Portlet < ActiveRecord::Base
+  belongs_to :block
+  belongs_to :content, :polymorphic => true
+  accepts_nested_attributes_for :content
+
+  attr_accessor :skip_before_update
+
+
+
+
+  def dup
+    @portlet = Portlet.new(self.attributes)
+    @portlet.id = nil
+    @portlet.content = self.content.dup
+    
+    
+    @portlet.save
+    @portlet
+  end
+  
+
+
+
+  before_create do
+    
+  end
+
+  before_update do
+  
+  end
+
+  before_destroy do
+    
+
+  end
+
+
+end
diff --git a/app/models/table_content.rb b/app/models/table_content.rb
new file mode 100644
index 0000000..d6fbf46
--- /dev/null
+++ b/app/models/table_content.rb
@@ -0,0 +1,51 @@
+# -*- encoding : utf-8 -*-
+class TableContent < ActiveRecord::Base
+  has_one :portlet, :as => :content, :dependent => :destroy
+  has_many :table_rows,->{ order :position}
+  has_many :cel_tables, :through => :table_rows
+ 
+  STYLES = [["avec bordures",1],["sans bordures",2]]
+  
+  
+  after_create do
+  
+    self.nbr_rows.to_i.times do 
+      table_row = TableRow.create(:position => 1, :table_content_id => self.id)
+      
+      self.nbr_cols.to_i.times do 
+        cel_table = CelTable.new
+        table_row.cel_tables << cel_table
+      end
+      
+      
+     
+    end
+      
+  
+  end
+  
+
+  
+  def dup
+    @new = TableContent.new(self.attributes)
+    @new.id = nil
+    @new.save
+    
+    @new.table_rows.destroy_all
+    self.table_rows.each do |table_row|
+      
+      new_tr = table_row.dup
+      new_tr.table_content = @new
+      new_tr.save
+      
+    end
+    
+    @new
+    
+  end
+
+  def self.picto
+    "table"
+  end
+  
+end
diff --git a/app/models/table_row.rb b/app/models/table_row.rb
new file mode 100644
index 0000000..00e65d5
--- /dev/null
+++ b/app/models/table_row.rb
@@ -0,0 +1,82 @@
+# -*- encoding : utf-8 -*-
+class TableRow < ActiveRecord::Base
+  has_many :cel_tables, -> {order :position}
+  belongs_to :table_content
+  
+  attr_accessor :skip_before_update
+
+
+
+
+  before_create do
+    if !position
+      self.position = 1
+    end
+    if position
+      TableRow.where(["position >= ? and table_content_id = ?",self.position,self.table_content_id]).each do |table_row|
+        table_row.position = table_row.position + 1
+        table_row.skip_before_update = true
+        table_row.save!
+      end
+    end
+  end
+
+  before_update do
+    if !skip_before_update
+      if self.position_changed?
+        #si la position est plus grande que l'ancienne
+        if self.changes['position'][1] > self.changes['position'][0]
+          TableRow.where(["position > ? and position <= ? and table_content_id = ?",self.changes['position'][0],self.changes['position'][1],self.table_content_id]).each do |table_row|
+            table_row.position = table_row.position - 1
+            table_row.skip_before_update = true
+            table_row.save!
+          end
+        end
+        #si la position est plus petite que l'ancienne.  
+        if self.changes['position'][1] < self.changes['position'][0]
+          TableRow.where(["position >= ? and position < ? and table_content_id = ?",self.changes['position'][1],self.changes['position'][0],self.table_content_id]).each do |table_row|
+            table_row.position = table_row.position + 1
+            table_row.skip_before_update = true
+            table_row.save!
+          end  
+        end 
+      end
+    end
+  end
+
+  before_destroy do
+    TableRow.where(["position > ? and table_content_id = ?",self.position,self.table_content_id]).each do |table_row|
+      table_row.position = table_row.position - 1
+      table_row.skip_before_update = true
+      table_row.save!
+    end
+    
+    table = self.table_content
+    table_past_count = table.nbr_rows
+    table.nbr_rows = table_past_count - 1
+    table.save
+
+  end
+  
+  
+  def dup
+    @new = TableRow.new(self.attributes)
+    @new.id = nil
+    @new.table_content_id = nil
+    @new.save
+    
+    @new.cel_tables.destroy_all
+    self.cel_tables.each do |cel_table|
+      
+      new_td = cel_table.dup
+      new_td.table_row = @new
+      new_td.save
+      
+    end
+    
+    @new
+    
+  end
+
+
+end
diff --git a/app/models/tag.rb b/app/models/tag.rb
new file mode 100644
index 0000000..27e90ba
--- /dev/null
+++ b/app/models/tag.rb
@@ -0,0 +1,30 @@
+class Tag < ActiveRecord::Base
+  
+	
+	before_validation do
+		self.slug = self.name.to_s.to_slug
+		
+	end
+	
+
+	
+	has_many :tag_taggables
+	has_many :taggable, :through => :tag_taggables
+	
+	def recents_articles
+		articles_id = self.tag_taggables.where(:taggable_type => "Article").map {|t| t.taggable_id}
+		
+		Article.recents.where(:id => articles_id)
+	end
+
+validates :slug, :presence => true, :uniqueness => true
+
+  def self.tag_list
+    r = []
+    Tag.all.each do |tag|
+      r << tag.name
+    end
+    r
+    
+  end
+end
diff --git a/app/models/tag_taggable.rb b/app/models/tag_taggable.rb
new file mode 100644
index 0000000..7faf178
--- /dev/null
+++ b/app/models/tag_taggable.rb
@@ -0,0 +1,16 @@
+class TagTaggable < ActiveRecord::Base
+
+belongs_to :tag
+belongs_to :taggable, :polymorphic => true
+
+
+
+
+before_destroy do
+	puts self.tag
+	if self.tag
+		Tag.find(self.tag_id).destroy if self.tag.tag_taggables.size == 1 
+	end
+end
+
+end
diff --git a/app/models/text_content.rb b/app/models/text_content.rb
new file mode 100644
index 0000000..5c35d33
--- /dev/null
+++ b/app/models/text_content.rb
@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+class TextContent < ActiveRecord::Base
+  has_one :portlet, :as => :content, :dependent => :destroy
+  
+  STYLES = []#[["Style 1",1], ["Style 2",2]]
+  
+  def self.picto
+    "align-justify"
+  end
+end
diff --git a/app/models/title_content.rb b/app/models/title_content.rb
new file mode 100644
index 0000000..b0e9149
--- /dev/null
+++ b/app/models/title_content.rb
@@ -0,0 +1,11 @@
+# -*- encoding : utf-8 -*-
+class TitleContent < ActiveRecord::Base
+  has_one :portlet, :as => :content, :dependent => :destroy
+  validates :content, :presence => true
+  LEVELS = [1,2,3,4,5,6]
+  STYLES = []#[["Style 1",1], ["Style 2",2]]
+  
+  def self.picto
+    "header"
+  end
+end
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index e972b9c..7509398 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -16,10 +16,10 @@ class FileUploader < CarrierWave::Uploader::Base
     "#{Rails.root}/private_medias/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
-	def url
-    	"/#{model.class.to_s.underscore}/#{model.id}"
+  def url
+      "/download_data_files/#{model.token}"
 
-	end
+  end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:
    def default_url
@@ -49,10 +49,10 @@ class FileUploader < CarrierWave::Uploader::Base
   #   "something.jpg" if original_filename
   # end
 
-	def filename
-		File.basename(original_filename, File.extname(original_filename)).to_s.to_slug + File.extname(original_filename).to_s if original_filename
-		
-		
-	end
+  def filename
+    File.basename(original_filename, File.extname(original_filename)).to_s.to_slug + File.extname(original_filename).to_s if original_filename
+    
+    
+  end
 
 end
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
new file mode 100644
index 0000000..2d0d9c8
--- /dev/null
+++ b/app/uploaders/image_uploader.rb
@@ -0,0 +1,79 @@
+# -*- encoding : utf-8 -*-
+
+class ImageUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or ImageScience support:
+  include CarrierWave::RMagick
+  # include CarrierWave::ImageScience
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :s3
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "public_medias/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  process :resize_to_limit => [1200, 1200]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+
+
+
+
+
+  # Create different versions of your uploaded files:
+  version :large do
+    process :resize_to_limit => [1200, 1200]
+    
+    
+    version :medium do
+      process :resize_to_limit => [800, 700]
+      
+      version :small do
+        process :resize_to_limit => [300, 400]
+      
+        version :thumb do
+          process :resize_to_limit => [250, 250]
+        end
+      
+      end
+      
+      
+    end
+    
+    
+    
+    
+    
+  end
+
+  version :square do
+    process :resize_to_fill => [250, 250]
+  end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+     %w(jpg jpeg gif png bmp)
+  end
+
+  # Override the filename of the uploaded files:
+  def filename
+    File.basename(original_filename, File.extname(original_filename)).to_s.to_slug + File.extname(original_filename).to_s if original_filename
+    
+    
+  end
+
+end
diff --git a/app/views/admin/admin_auths/index.haml b/app/views/admin/admin_auths/index.haml
new file mode 100644
index 0000000..62855bd
--- /dev/null
+++ b/app/views/admin/admin_auths/index.haml
@@ -0,0 +1,6 @@
+.container
+  %h1
+    Bonjour
+    =current_admin.login
+  
+  
\ No newline at end of file
diff --git a/app/views/admin/admin_auths/new.haml b/app/views/admin/admin_auths/new.haml
new file mode 100644
index 0000000..0849bb8
--- /dev/null
+++ b/app/views/admin/admin_auths/new.haml
@@ -0,0 +1,19 @@
+
+
+= form_tag admin_admin_auths_path do
+  %h2.form-signin-heading Se connecter
+  
+  = text_field_tag :login, params[:login], :placeholder => "email", :class => "form-control"
+  = password_field_tag :password, "", :placeholder => "mot de passe", :class => "form-control"
+  
+
+  %p
+    = check_box_tag :remember_me, 1, params[:remember_me] 
+    = label_tag :remember_me, "Se rappeler de moi ?" 
+  
+
+  %p= submit_tag "Se connecter", :class => "btn btn-large btn-primary"
+
+  %p= link_to "Mot de passe oublié ?", new_admin_password_reset_path
+
+
diff --git a/app/views/admin/admins/_form.html.haml b/app/views/admin/admins/_form.html.haml
index 27ffe23..8f168be 100644
--- a/app/views/admin/admins/_form.html.haml
+++ b/app/views/admin/admins/_form.html.haml
@@ -1,7 +1,7 @@
 
 
 
-=semantic_form_for [:admin, @admin], :remote => true do |f| 
+=semantic_form_for [:admin, @admin], :remote => true, :html => { :multipart => true } do |f| 
   .content
     %h3
       -if @admin.id
@@ -10,7 +10,7 @@
         Ajouter un admin
 
     = f.inputs do
-
+      =#f.input :avatar, :label => "Avatar :"
       = f.input :email, :label => "Email :"
   
 
diff --git a/app/views/admin/albums/_album.html.haml b/app/views/admin/albums/_album.html.haml
new file mode 100644
index 0000000..b86d123
--- /dev/null
+++ b/app/views/admin/albums/_album.html.haml
@@ -0,0 +1,4 @@
+%li{}
+  
+  =link_to album.name, admin_image_files_path(:album_id => album.id, :manager => params[:manager], :multiple => params[:multiple]), :remote => true, :id => "album_"+album.id.to_s,:data_album_id => album.id, :data_album_path => admin_album_path(:format => "js",:album_id => album.id, :manager => params[:manager], :multiple => params[:multiple], :id => album.id), :data_edit_album_path => edit_admin_album_path(:format => "js",:album_id => album.id, :manager => params[:manager], :multiple => params[:multiple], :id => album.id),:class => (" active" if album.id == params[:album_id].to_i).to_s
+  
diff --git a/app/views/admin/albums/_albums.html.haml b/app/views/admin/albums/_albums.html.haml
new file mode 100644
index 0000000..cc591ce
--- /dev/null
+++ b/app/views/admin/albums/_albums.html.haml
@@ -0,0 +1,3 @@
+%ul.nav.nav-list
+  =render @albums
+  
diff --git a/app/views/admin/albums/_albums_navbar.html.haml b/app/views/admin/albums/_albums_navbar.html.haml
new file mode 100644
index 0000000..839c39b
--- /dev/null
+++ b/app/views/admin/albums/_albums_navbar.html.haml
@@ -0,0 +1,4 @@
+= link_to ic(:plus), new_admin_album_url(:album_id => params[:album_id], :manager => params[:manager], :multiple => params[:multiple]), :remote => true, :id => "add_album"
+= link_to ic(:pencil),edit_admin_album_url(:id => params[:album_id], :album_id => params[:album_id], :manager => params[:manager], :multiple => params[:multiple]), :remote => true, :id => "edit_current_album", :style => "display:inline-block; margin-right:5px;"
+
+= link_to ic(:"trash-o"), admin_album_url(:id => params[:album_id],:album_id => params[:album_id], :manager => params[:manager], :multiple => params[:multiple]), :remote => true, :id => "remove_current_album", :method => :delete, :confirm => "Voulez-vous vraiment supprimer cet album ? Attention, toutes les images de celui-ci seront définitivement supprimées.", :style => "display:inline-block;"
\ No newline at end of file
diff --git a/app/views/admin/albums/create.js.erb b/app/views/admin/albums/create.js.erb
new file mode 100644
index 0000000..7f37b68
--- /dev/null
+++ b/app/views/admin/albums/create.js.erb
@@ -0,0 +1,2 @@
+$('#albums').html("<%= escape_javascript(render(:partial => "albums")) %>");
+image_files_load();
\ No newline at end of file
diff --git a/app/views/admin/albums/destroy.js.erb b/app/views/admin/albums/destroy.js.erb
new file mode 100644
index 0000000..511c764
--- /dev/null
+++ b/app/views/admin/albums/destroy.js.erb
@@ -0,0 +1,4 @@
+
+
+
+$.ajax({url : $('#image_files_container').attr('data_reset_url')});
\ No newline at end of file
diff --git a/app/views/admin/albums/edit.js.erb b/app/views/admin/albums/edit.js.erb
new file mode 100644
index 0000000..86c718e
--- /dev/null
+++ b/app/views/admin/albums/edit.js.erb
@@ -0,0 +1,16 @@
+var new_album_name = prompt("Nom de l'album :\n <%= "Le nom que vous avez chosi existe déjà." if @album_update %>", "<%=escape_javascript(@album.name) %>");
+
+if(new_album_name){
+
+
+  $.ajax({url : $("#album_<%=@album.id %>").attr('data_album_path'), type: "PUT", data : {
+    album : {
+      name: new_album_name
+    }
+  }
+  
+  });
+
+
+
+}
\ No newline at end of file
diff --git a/app/views/admin/albums/new.js.erb b/app/views/admin/albums/new.js.erb
new file mode 100644
index 0000000..1c98a4d
--- /dev/null
+++ b/app/views/admin/albums/new.js.erb
@@ -0,0 +1,16 @@
+var new_album_name = prompt("Nom de l'album :\n <%= "Vous n'avez spécifié aucuns nom pour ce nouvel album, ou le nom que vous avez chosi existe déjà." if @album_create %>", "<%=escape_javascript(@album.name) %>");
+
+if(new_album_name){
+
+
+  $.ajax({url : "/admin/albums?&manager=true&multiple=true", type: "POST", data : {
+    album : {
+      name: new_album_name
+    }
+  }
+  
+  });
+
+
+
+}
\ No newline at end of file
diff --git a/app/views/admin/albums/update.js.erb b/app/views/admin/albums/update.js.erb
new file mode 100644
index 0000000..7f37b68
--- /dev/null
+++ b/app/views/admin/albums/update.js.erb
@@ -0,0 +1,2 @@
+$('#albums').html("<%= escape_javascript(render(:partial => "albums")) %>");
+image_files_load();
\ No newline at end of file
diff --git a/app/views/admin/articles/_article.html.haml b/app/views/admin/articles/_article.html.haml
new file mode 100644
index 0000000..6cbcbaa
--- /dev/null
+++ b/app/views/admin/articles/_article.html.haml
@@ -0,0 +1,22 @@
+%tr#article_row.article_row{:id => article.id, :class => ("warning" if !article.enabled)}
+  
+  %td{:style => "width:200px"}= l(article.published_at, :format => :date) if article.published_at?
+  %td=article.title
+  
+  %td{:style => "width:300px;"}
+    -article.tags.order(:name).each do |tag|
+      .tag_label=tag.name
+
+
+
+  %td{:style => "width:140px"}
+    = link_to i(:"trash-o"), [:admin, article], :confirm => 'Voulez-vous vraiment supprimer cet article ?', :method => :delete, :remote => true
+    
+    = link_to i(:pencil), edit_admin_article_path(article), :style => "padding:0px 0px 0px 0px;", :remote => true
+    = link_to i(:info), edit_admin_article_path(article), :style => "padding:0px 0px 0px 0px;"
+    
+    =link_to i(:"level-down"), admin_article_path(:id => article.id, :format => "js"), :class => "set_tag"
+    
+  
+
+  
diff --git a/app/views/admin/articles/_form.html.haml b/app/views/admin/articles/_form.html.haml
new file mode 100644
index 0000000..9c9a439
--- /dev/null
+++ b/app/views/admin/articles/_form.html.haml
@@ -0,0 +1,26 @@
+= semantic_form_for [:admin,@article], :remote => true do |form| 
+  .content
+    = form.inputs do 
+      =form.input :image_file_id, :as => :qi_image_select
+      =form.input :category_id, :as => :select, :collection => Category.order(:name)
+      = form.input :enabled,:as => :boolean , :label => "Actif" 
+      = form.input :published_at, :label => "Date de publication : ",:as => :qi_date_picker
+       
+      = form.input :title, :label => "Titre :" 
+      = form.input :title_cached,:as => :boolean , :label => "Titre masqué ?" 
+      = form.input :slug, :label => "Slug :"   
+      
+      = form.input :description, :label => "Description courte :", :as => :text
+      
+      = form.input :tags_cache, :label => "Tags :"
+    
+      %script
+        $("#article_tags_cache").select2({
+        =raw'tags:'+Tag.tag_list.to_json+','
+        tokenSeparators: [","]});
+      
+      
+
+    
+  .actions
+    = form.submit "Sauvegarder", :class => "btn btn-primary"
diff --git a/app/views/admin/articles/_index_block.html.haml b/app/views/admin/articles/_index_block.html.haml
new file mode 100644
index 0000000..1b2ca5d
--- /dev/null
+++ b/app/views/admin/articles/_index_block.html.haml
@@ -0,0 +1,30 @@
+
+.search_pannel
+  
+  =form_tag "", :method => "get", :remote => true, :onsubmit => "set_busy();" do
+    
+    .row
+      .col-xs-5
+        .input-group
+          =text_field_tag :start, params[:start],:class => "form-control datepicker", :placeholder => "Début"
+          %span.input-group-addon.btn{:onclick => "$(this).prev('input').val('');"}
+            =ic(:times)
+        
+      .col-xs-5
+        .input-group
+          =text_field_tag :stop, params[:stop],:class => "form-control datepicker", :placeholder => "Fin"
+          %span.input-group-addon.btn{:onclick => "$(this).prev('input').val('');"}
+            =ic(:times)
+    
+    
+        
+      .col-xs-2
+        =submit_tag "filtrer", :class => "btn btn-default", :style => "margin-bottom: 10px;"
+  
+
+%table#articles.table
+  =render @articles
+  #pagination
+    = paginate @articles, :remote => true 
+
+
diff --git a/app/views/admin/articles/_show.html.haml b/app/views/admin/articles/_show.html.haml
new file mode 100644
index 0000000..0d194a4
--- /dev/null
+++ b/app/views/admin/articles/_show.html.haml
@@ -0,0 +1,17 @@
+#article_show.QI_background_middle.QI_padding_small
+	%table
+		
+		%tr
+			%td{:style => "width:150px;"}  Nom : 
+			%td=@article.title
+		%tr
+			%td Permalink :
+			%td=@article.slug
+		%tr
+			%td Statut :
+			%td=@article.enabled ? "Publié" : "Brouillon"
+	
+
+		%tr 
+			%td{:style => "vertical-align:top"} Description courte :
+			%td= simple_format @article.description
diff --git a/app/views/admin/articles/_tags.html.haml b/app/views/admin/articles/_tags.html.haml
new file mode 100644
index 0000000..ef51708
--- /dev/null
+++ b/app/views/admin/articles/_tags.html.haml
@@ -0,0 +1,14 @@
+#tags
+  -Tag.order(:name).all.each do |tag|
+    .tag_label#tag_label{:"data-tag_id" => tag.id, :id => tag.id}
+      =tag.name
+      =ic(:"level-up")
+
+
+:coffeescript
+  
+  if typeof(tag_id) != 'undefined'
+    $(".set_tag").show()
+    $.each tag_id, (i,a) ->
+      $("#tag_label_"+a).addClass("active")
+    
\ No newline at end of file
diff --git a/app/views/admin/articles/create.js.erb b/app/views/admin/articles/create.js.erb
new file mode 100644
index 0000000..34d6244
--- /dev/null
+++ b/app/views/admin/articles/create.js.erb
@@ -0,0 +1,5 @@
+
+close_pane_hover();
+
+$('#articles').html("<%= escape_javascript(render(@articles))%>");
+
diff --git a/app/views/admin/articles/destroy.js.erb b/app/views/admin/articles/destroy.js.erb
new file mode 100644
index 0000000..f5772fe
--- /dev/null
+++ b/app/views/admin/articles/destroy.js.erb
@@ -0,0 +1,2 @@
+
+$('#article_row_<%=@article.id%>').remove();
diff --git a/app/views/admin/articles/edit.html.haml b/app/views/admin/articles/edit.html.haml
new file mode 100644
index 0000000..72a01ed
--- /dev/null
+++ b/app/views/admin/articles/edit.html.haml
@@ -0,0 +1,81 @@
+#toolbar-text
+
+#menu_item_block_edit{:style => "margin-right:330px;margin-top:45px;"}
+ 
+  =render :partial => "admin/blocks/block", :locals => {:block => @article.block, :sortable => true} 
+  
+  
+%br
+%br
+%br
+%br
+%br
+%br
+%br
+%br
+%br
+%br
+%br
+#menu_item_inspector_container
+  
+  
+  
+  
+  
+  
+  
+  #menu_item_informations
+    %h4
+      Infos sur l'article
+    
+    
+    .panel#collapseOne{:style => "display:none;"}
+      =render :partial => "form"    
+        
+    %h4 éléments
+    
+    .panel#collapse2
+      .block_portlets_sortable#content_types
+        -@article.block.alloweds_types.each do |slug, name|
+ 
+          .content_type{:id => slug, :"data-type" => slug}
+            =#i slug.to_s.constantize.picto
+            =image_tag("admin/content_type/type_"+slug.to_s+".png", :alt => name, :title => name, :class => "handle")
+      
+
+    #collapse3{:style => "display:none;"}
+      %h4 Modifier l'élément
+    
+    
+      .panel
+        #element_form
+    
+        %div#element_form_action
+          %a.move.btn.btn-default.portlet_handle{:href => "#", :data => {:portlet_id => nil}}
+            %span.move_message
+              =ic :arrows
+              &nbsp;
+              déplacer
+            %span.cancel_message
+              =ic :ban
+              &nbsp;
+              annuler
+          
+          =link_to ic(:"trash-o"), "#", :method => :delete, :data => { :confirm => "Etes-vous sûr ?"}, :remote => true, :class => "btn btn-danger trash"
+        
+          %button.save.btn.btn-primary
+            =ic(:"floppy-o")
+            &nbsp;
+            Sauvegarder
+        
+
+
+
+
+  
+
+  
+
+
+    
+  
diff --git a/app/views/admin/articles/edit.js.erb b/app/views/admin/articles/edit.js.erb
new file mode 100644
index 0000000..d042e6f
--- /dev/null
+++ b/app/views/admin/articles/edit.js.erb
@@ -0,0 +1,2 @@
+
+show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>",700,900);
diff --git a/app/views/admin/articles/index.html.haml b/app/views/admin/articles/index.html.haml
new file mode 100644
index 0000000..f3e99b1
--- /dev/null
+++ b/app/views/admin/articles/index.html.haml
@@ -0,0 +1,54 @@
+.row{:style => "max-width:inherit;"}
+  .col-xs-9
+    .right= link_to 'Ajouter un article', new_admin_article_path(), :class => "btn btn-primary", :remote => true
+    %h1 Liste des articles
+
+    #articles_index=render :partial => "index_block"
+    
+  .col-xs-3
+    %h3 Tags
+    =render :partial => "tags"
+  
+
+  :coffeescript
+    root = exports ? this
+    root.tag_id = []
+  
+  
+    $(document.body).on "click", "#tags .tag_label", ->
+    
+      if $(this).hasClass("active")
+        $(this).removeClass "active"  
+      
+      else
+        $(this).addClass "active"
+    
+      root.tag_id = []
+    
+      $("#tags .tag_label.active").each ->
+        root.tag_id.push $(this).data "tag_id"
+      
+      if root.tag_id.length > 0
+        $(".set_tag").show()
+      else
+        $(".set_tag").hide()
+   
+   
+    $(document.body).on "click", ".set_tag", ->    
+    
+      $.ajax({
+        url:$(this).attr("href"), 
+        type: "PUT",
+        data: { 
+        tag_id : tag_id
+        } 
+
+      })
+
+      return false
+  
+
+  
+  
+
+
diff --git a/app/views/admin/articles/index.js.erb b/app/views/admin/articles/index.js.erb
new file mode 100644
index 0000000..3432a39
--- /dev/null
+++ b/app/views/admin/articles/index.js.erb
@@ -0,0 +1,2 @@
+$('#articles_index').html("<%= escape_javascript(render(:partial => "index_block"))%>");
+unset_busy();
\ No newline at end of file
diff --git a/app/views/admin/articles/new.js.erb b/app/views/admin/articles/new.js.erb
new file mode 100644
index 0000000..7cfbb16
--- /dev/null
+++ b/app/views/admin/articles/new.js.erb
@@ -0,0 +1,2 @@
+
+show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>",700,900);
\ No newline at end of file
diff --git a/app/views/admin/articles/update.js.erb b/app/views/admin/articles/update.js.erb
new file mode 100644
index 0000000..c876799
--- /dev/null
+++ b/app/views/admin/articles/update.js.erb
@@ -0,0 +1,9 @@
+
+
+$('#article_row_<%= @article.id %>').replaceWith("<%= escape_javascript(render(@article))%>");
+
+$('#article_show').replaceWith("<%= escape_javascript(render(:partial => "show"))%>");
+
+
+$('#tags').replaceWith("<%= escape_javascript(render(:partial => 'tags'))%>");
+close_pane_hover();
\ No newline at end of file
diff --git a/app/views/admin/blocks/_block.html.haml b/app/views/admin/blocks/_block.html.haml
new file mode 100644
index 0000000..3236a31
--- /dev/null
+++ b/app/views/admin/blocks/_block.html.haml
@@ -0,0 +1,7 @@
+
+
+#block_portlet.block_portlets{:id => block.id, :"data-block_id"=>block.id, :class => ("block_portlets_sortable" if sortable).to_s}
+  
+  
+  =render :partial => "portlet/portlets/portlet", :collection => block.portlets.includes(:content).order(:position)
+  
diff --git a/app/views/admin/blocks/_block_allowed.html.haml b/app/views/admin/blocks/_block_allowed.html.haml
new file mode 100644
index 0000000..9e5f5f8
--- /dev/null
+++ b/app/views/admin/blocks/_block_allowed.html.haml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/app/views/admin/blocks/_edit.html.haml b/app/views/admin/blocks/_edit.html.haml
new file mode 100644
index 0000000..e69de29
diff --git a/app/views/admin/blocks/_form.html.haml b/app/views/admin/blocks/_form.html.haml
new file mode 100644
index 0000000..c2946d6
--- /dev/null
+++ b/app/views/admin/blocks/_form.html.haml
@@ -0,0 +1,16 @@
+
+%a.tab_link{:href => "#block-"+block.id.to_s}= block.block_name
+
+
+.tab{:id => "#block-"+block.id.to_s}
+
+  
+
+
+
+  .block_content{:id => "block_content-"+block.id.to_s}
+    
+  
+    =render block
+          
+        
diff --git a/app/views/admin/blocks/edit.html.haml b/app/views/admin/blocks/edit.html.haml
new file mode 100644
index 0000000..e559c9b
--- /dev/null
+++ b/app/views/admin/blocks/edit.html.haml
@@ -0,0 +1 @@
+=render :partial => "form", :locals => {:block => @block}
\ No newline at end of file
diff --git a/app/views/admin/blocks/edit.js.erb b/app/views/admin/blocks/edit.js.erb
new file mode 100644
index 0000000..85c7d96
--- /dev/null
+++ b/app/views/admin/blocks/edit.js.erb
@@ -0,0 +1,8 @@
+
+//$("#admin").html("<%= escape_javascript(render(:partial => "form", :locals => {:block => @block})) %>");
+
+$("#admin_block").load("<%= edit_admin_block_path(@block) %>", function() {when_admin_load();$('#front').hide();$('#admin_front').show();});
+
+
+
+
diff --git a/app/views/admin/blocks/old.block b/app/views/admin/blocks/old.block
new file mode 100644
index 0000000..d24722f
--- /dev/null
+++ b/app/views/admin/blocks/old.block
@@ -0,0 +1,5 @@
+.header_2
+  %h3
+    Blocks : 
+    -page.blocks.each do |block|
+      =link_to block.block_name, admin_block_path(block), :data_div_id => "Page_"+page.id.to_s+"_blocks_part", :class => "update_auto_load_div "+("selected" if block == page.blocks[0]).to_s
\ No newline at end of file
diff --git a/app/views/admin/blocks/old.show.html.haml b/app/views/admin/blocks/old.show.html.haml
new file mode 100644
index 0000000..08e70fe
--- /dev/null
+++ b/app/views/admin/blocks/old.show.html.haml
@@ -0,0 +1,19 @@
+
+
+#content_types_draggables
+
+  -@block.content_types.each do |content_type|
+
+    .content_types_draggable{:id => content_type.id, :data_type => content_type.slug}
+      =image_tag("admin/content_type/type_"+content_type.slug.to_s+".png", :alt => content_type.name)
+
+
+.grid_12
+
+  =render @block
+  
+  %div{:style => "height:70px;"}
+  
+:javascript
+  block_js_initialize();
+  
\ No newline at end of file
diff --git a/app/views/admin/categories/_category.html.haml b/app/views/admin/categories/_category.html.haml
new file mode 100644
index 0000000..12d872f
--- /dev/null
+++ b/app/views/admin/categories/_category.html.haml
@@ -0,0 +1,26 @@
+
+#category_row.category_row.row{:id => category.id,:"data-menu-item-id" => category.id}
+  
+  .col-xs-2.receptable{:data => {:parent_id => category.id}}
+    .btn-group
+      %span.handle.btn=i(:arrows, :icon => false)
+      =link_to (category.children.size > 0 ? i(:"folder", :icon => false) : i(:"folder-o", :icon => false) )+(category.children.size if category.children.size > 0).to_s, admin_categories_path(:parent_id => category.id), :remote => true, :class => "btn"
+    
+  
+  .col-xs-4
+    =category.name
+      
+ 
+      
+  .col-xs-4
+    =#link_to "/"+category.permalink+".html", category_path(:url => category.url)
+        
+  .col-xs-2.actions
+    
+    = link_to i(:"trash-o"), [:admin, category], :data =>{:remote => true, :confirm => 'Voulez-vous vraiment supprimer cet élément de menu ?'}, :method => :delete #, if current_admin.super_admin? || !category.super_admin
+
+    = link_to i(:pencil), edit_admin_category_path(category), :data => {:remote => true}
+
+    
+    
+
diff --git a/app/views/admin/categories/_form.html.haml b/app/views/admin/categories/_form.html.haml
new file mode 100644
index 0000000..7a871c7
--- /dev/null
+++ b/app/views/admin/categories/_form.html.haml
@@ -0,0 +1,10 @@
+= semantic_form_for [:admin,@category], :remote => true do |form| 
+  = form.input :parent_id,:as => :hidden 
+  .content
+    = form.inputs do 
+      = form.input :name, :label => "Nom de la catégorie :"
+      =form.input :front_page, :label => "Afficher dans la barre principale ?", :as => :boolean
+    
+  .actions
+    = form.submit "Sauvegarder"
+  
\ No newline at end of file
diff --git a/app/views/admin/categories/_index_block.html.haml b/app/views/admin/categories/_index_block.html.haml
new file mode 100644
index 0000000..aba71dc
--- /dev/null
+++ b/app/views/admin/categories/_index_block.html.haml
@@ -0,0 +1,53 @@
+#category_index
+
+	%ul.breadcrumb
+		= link_to 'Ajouter une catégorie', new_admin_category_path(:parent_id => params[:parent_id]), :class => "btn btn-primary",:remote => true, :style => "float:right;"
+		%li
+		-if @category_parent
+			-@category_parent.ancestors.reverse.each do |category|
+				%li
+					=link_to category.name, admin_categories_path( :parent_id =>category.id), :remote => true
+					%span.divider /
+			
+			%li
+				=@category_parent.name
+				%span.divider /
+		%p{:style => "clear:both;"}
+	
+	
+
+	-if @category_parent
+		.prevv_folder.receptable{:data => { :param_test => true, :parent_id => (@category_parent.parent ? @category_parent.parent.id : "no-menu-selected")} }
+			.row-fluid
+				.span1
+					=i(:"folder-close", :icon => false)
+	
+
+				.span2=link_to "...", admin_categories_path( :parent_id => (@category_parent.parent ? @category_parent.parent.id : nil)), :remote => true
+		
+				.span3
+		
+				.span4
+			
+			
+				.span2.actions
+				
+
+	#sortable_category{:data => {:parent_id => (@category_parent ? @category_parent.id : "")} }
+	
+		
+					
+		
+					
+
+			
+			
+		-if @categories.size > 0
+			=render @categories
+		-else
+			.no_categories
+				Il n'y a aucun éléments de menu actuellement.
+				
+	:javascript
+
+		init_categories_list();
\ No newline at end of file
diff --git a/app/views/admin/categories/cible.html.haml b/app/views/admin/categories/cible.html.haml
new file mode 100644
index 0000000..a034103
--- /dev/null
+++ b/app/views/admin/categories/cible.html.haml
@@ -0,0 +1,6 @@
+
+-Event.all.each do |event|
+	
+	%h4
+		=event.title 
+		= link_to i(:check_alt, :gray_light,12), "#",:onclick => "manager_send_cible("+event.id.to_s+", 'Folder', '#{escape_javascript(event.cible_name)}');return false;" if params[:manager] 
diff --git a/app/views/admin/categories/create.js.erb b/app/views/admin/categories/create.js.erb
new file mode 100644
index 0000000..18cc74f
--- /dev/null
+++ b/app/views/admin/categories/create.js.erb
@@ -0,0 +1,3 @@
+$('#category_index').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+close_pane_hover();
diff --git a/app/views/admin/categories/destroy.js.erb b/app/views/admin/categories/destroy.js.erb
new file mode 100644
index 0000000..1a788ee
--- /dev/null
+++ b/app/views/admin/categories/destroy.js.erb
@@ -0,0 +1,4 @@
+$('#category_index').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+
+<%= flash_js %>
diff --git a/app/views/admin/categories/edit.js.erb b/app/views/admin/categories/edit.js.erb
new file mode 100644
index 0000000..06a7cbc
--- /dev/null
+++ b/app/views/admin/categories/edit.js.erb
@@ -0,0 +1 @@
+show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>",550,600);
\ No newline at end of file
diff --git a/app/views/admin/categories/index.html.haml b/app/views/admin/categories/index.html.haml
new file mode 100644
index 0000000..de08522
--- /dev/null
+++ b/app/views/admin/categories/index.html.haml
@@ -0,0 +1,6 @@
+.header
+	.right=# link_to 'Ajouter une catégorie', new_admin_category_path, :class => "btn", :remote => true
+	%h1 Liste des catégories
+
+.grid_12
+	=render :partial => "index_block"
diff --git a/app/views/admin/categories/index.js.erb b/app/views/admin/categories/index.js.erb
new file mode 100644
index 0000000..5300be4
--- /dev/null
+++ b/app/views/admin/categories/index.js.erb
@@ -0,0 +1,13 @@
+
+
+if($('#category_index').length > 0){
+	$('#category_index').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+}
+else{
+
+	
+	$('body').html("<%= escape_javascript(render(:template => 'admin/categories/index.html.haml')) %>");
+
+}
+
diff --git a/app/views/admin/categories/new.js.erb b/app/views/admin/categories/new.js.erb
new file mode 100644
index 0000000..06a7cbc
--- /dev/null
+++ b/app/views/admin/categories/new.js.erb
@@ -0,0 +1 @@
+show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>",550,600);
\ No newline at end of file
diff --git a/app/views/admin/categories/reorder.js.erb b/app/views/admin/categories/reorder.js.erb
new file mode 100644
index 0000000..1a788ee
--- /dev/null
+++ b/app/views/admin/categories/reorder.js.erb
@@ -0,0 +1,4 @@
+$('#category_index').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+
+<%= flash_js %>
diff --git a/app/views/admin/categories/update.js.erb b/app/views/admin/categories/update.js.erb
new file mode 100644
index 0000000..1a788ee
--- /dev/null
+++ b/app/views/admin/categories/update.js.erb
@@ -0,0 +1,4 @@
+$('#category_index').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+
+<%= flash_js %>
diff --git a/app/views/admin/categories/update_row.js.erb b/app/views/admin/categories/update_row.js.erb
new file mode 100644
index 0000000..1d4f4e9
--- /dev/null
+++ b/app/views/admin/categories/update_row.js.erb
@@ -0,0 +1,2 @@
+close_pane_hover();
+$('#category_row_<%= @category.id %>').replaceWith("<%= escape_javascript(render(@category))%>");
diff --git a/app/views/admin/cibles/_cible_place.html.haml b/app/views/admin/cibles/_cible_place.html.haml
new file mode 100644
index 0000000..44c0330
--- /dev/null
+++ b/app/views/admin/cibles/_cible_place.html.haml
@@ -0,0 +1,10 @@
+#select_cible_type_bar.bar.dark_blue
+  -LinkContent::CIBLE_TYPES.each do |cible_type|
+    =link_to cible_type[:name], admin_cibles_path(:cible_type => cible_type[:slug], :i_cible_type => params[:i_cible_type], :i_cible_id => params[:i_cible_id],:manager => params[:manager] ), :remote => true, :class => ("active" if cible_type[:slug] == @cible_type).to_s
+    
+    
+  #cible_content
+  %script
+    
+    ="$('#cible_content').load('"+eval("cible_admin_#{@cible_type.tableize}_path(:i_cible_type => params[:i_cible_type], :i_cible_id => params[:i_cible_id],:manager => params[:manager])")+"');"
+  
\ No newline at end of file
diff --git a/app/views/admin/cibles/index.html.haml b/app/views/admin/cibles/index.html.haml
new file mode 100644
index 0000000..af03351
--- /dev/null
+++ b/app/views/admin/cibles/index.html.haml
@@ -0,0 +1 @@
+#cible_place= render :partial => "cible_place"
diff --git a/app/views/admin/cibles/index.js.erb b/app/views/admin/cibles/index.js.erb
new file mode 100644
index 0000000..9c67b54
--- /dev/null
+++ b/app/views/admin/cibles/index.js.erb
@@ -0,0 +1,2 @@
+
+$('#cible_place').html("<%=escape_javascript(render(:partial => "cible_place"))%>");
\ No newline at end of file
diff --git a/app/views/admin/cibles/new.html.haml b/app/views/admin/cibles/new.html.haml
new file mode 100644
index 0000000..b023357
--- /dev/null
+++ b/app/views/admin/cibles/new.html.haml
@@ -0,0 +1,15 @@
+= semantic_form_for [@namespace, @resource], :remote => true do |form| 
+  
+
+  
+  #link_content_cible_form.form2
+    #link_content_cible_form_content
+      = form.inputs do 
+        = form.input :cible_type,:as => :hidden
+        = form.input :cible_id,:as => :hidden
+      =render :partial => "portlet/link_contents/"+@resource.cible_type.tableize.singularize.to_s+"_form", :locals => {:form => form}
+
+  = form.buttons do 
+    = form.commit_button "Sauvegarder"
+
+
diff --git a/app/views/admin/comments/_comment.html.haml b/app/views/admin/comments/_comment.html.haml
new file mode 100644
index 0000000..b8671c5
--- /dev/null
+++ b/app/views/admin/comments/_comment.html.haml
@@ -0,0 +1,13 @@
+%tr#comment_row.comment_row{:id => comment.id, :class => ("warning" if !comment.enabled)}
+  %td
+    -if comment.commentable and comment.commentable_type = "Article"
+      =link_to comment.commentable.title,  public_article_path(:id => comment.commentable.slug, :anchor => "comments")
+    
+  %td=comment.pseudo
+  %td=comment.email
+  %td=comment.website
+  %td=simple_format comment.comment
+
+  %td.actions
+    = link_to i(:"trash-o"), [:admin, comment], :confirm => 'Voulez-vous vraiment supprimer ce commentaire ?', :method => :delete, :remote => true
+    = link_to i(:pencil), edit_admin_comment_path(comment), :remote => true
diff --git a/app/views/admin/comments/_form.html.haml b/app/views/admin/comments/_form.html.haml
new file mode 100644
index 0000000..89d007d
--- /dev/null
+++ b/app/views/admin/comments/_form.html.haml
@@ -0,0 +1,15 @@
+= semantic_form_for [:admin,@comment], :remote => true do |form| 
+	.content
+		= form.inputs do 
+			= form.input :enabled, :as => :boolean
+			= form.input :pseudo, :label => "Pseudo :" 
+			= form.input :email, :label => "Email :" 
+			= form.input :website, :label => "Site web :" 
+			
+		
+			= form.input :comment, :label => "Contenu :", :as => :text
+		
+		
+	.actions
+		= form.submit "Sauvegarder"
+	
\ No newline at end of file
diff --git a/app/views/admin/comments/destroy.js.erb b/app/views/admin/comments/destroy.js.erb
new file mode 100644
index 0000000..5b8db0c
--- /dev/null
+++ b/app/views/admin/comments/destroy.js.erb
@@ -0,0 +1,2 @@
+$('#comment_row_<%=@comment.id%>').remove();
+
diff --git a/app/views/admin/comments/edit.js.erb b/app/views/admin/comments/edit.js.erb
new file mode 100644
index 0000000..06a7cbc
--- /dev/null
+++ b/app/views/admin/comments/edit.js.erb
@@ -0,0 +1 @@
+show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>",550,600);
\ No newline at end of file
diff --git a/app/views/admin/comments/index.html.haml b/app/views/admin/comments/index.html.haml
new file mode 100644
index 0000000..5baa06b
--- /dev/null
+++ b/app/views/admin/comments/index.html.haml
@@ -0,0 +1,13 @@
+.header
+  %h1 Liste des commentaires
+
+.grid_12
+  %table#comments.table
+    %tr
+      %th Article
+      %th Nom
+      %th Email
+      %th Site
+      %th Commentaire
+      %th
+    =render @comments
diff --git a/app/views/admin/comments/update.js.erb b/app/views/admin/comments/update.js.erb
new file mode 100644
index 0000000..1e6986d
--- /dev/null
+++ b/app/views/admin/comments/update.js.erb
@@ -0,0 +1,3 @@
+close_pane_hover();
+
+$('#comment_row_<%= @comment.id %>').replaceWith("<%= escape_javascript(render(@comment))%>");
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 2343d8c..2d50e7b 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -5,7 +5,7 @@
 	%p
 		="Bonjour #{current_admin.firstname},"
 	%p
-		=" votre dernière connexion à été effectuée le #{l(current_admin.last_sign_in_at)} depuis l'adresse ip #{current_admin.last_sign_in_ip}"
+		=#" votre dernière connexion à été effectuée le #{l(current_admin.last_sign_in_at)} depuis l'adresse ip #{current_admin.last_sign_in_ip}"
 
 	
 
diff --git a/app/views/admin/data_files/_data_file.html.haml b/app/views/admin/data_files/_data_file.html.haml
new file mode 100644
index 0000000..c5f893e
--- /dev/null
+++ b/app/views/admin/data_files/_data_file.html.haml
@@ -0,0 +1,22 @@
+- if data_file.file?
+
+  
+  %tr#data_file.data_file{:id => data_file.id, :"data-id" => data_file.id, :"data-name" => data_file.abstract_file_name, :"data-description" => data_file.description, :"data-show_url" => admin_data_file_path(:id => data_file.id, :manager => params[:manager], :multiple => params[:multiple]), :"data-edit_url" => edit_admin_data_file_path(:id => data_file.id, :manager => params[:manager], :multiple => params[:multiple]) , :class => ("new" if @data_file_create)}
+    
+    %td{:style => "width:32px;text-align:center;"}
+      -ext = File.extname(data_file.file.path)[1..-1]
+      =image_tag "file_types/"+ext+".png", :style => "height:30px;"
+    %td
+      =data_file.abstract_file_name
+    %td{:style => "width:300px;"}
+  
+
+      =data_file.file_type
+    %td 
+      =data_file.file.url
+    %td{:style => "width:120px;text-align:right;"}
+      =link_to i(:"download"), data_file.file.url
+
+      = link_to i(:"trash-o"), admin_data_file_path(:id => data_file.id, :manager => params[:manager], :multiple => params[:multiple]), :data => {:confirm => 'Voulez-vous vraiment supprimer cette image ?'}, :method => :delete, :remote => true
+      = link_to i(:check), "#",:onclick => "manager_send_data_file("+data_file.id.to_s+");return false;" if params[:manager] and !params[:multiple]
+  
diff --git a/app/views/admin/data_files/_data_files_container.html.haml b/app/views/admin/data_files/_data_files_container.html.haml
new file mode 100644
index 0000000..87ba304
--- /dev/null
+++ b/app/views/admin/data_files/_data_files_container.html.haml
@@ -0,0 +1,4 @@
+#data_files_container
+  %table.table
+    %tbody#data_files=render @data_files
+  
\ No newline at end of file
diff --git a/app/views/admin/data_files/_form.html.haml b/app/views/admin/data_files/_form.html.haml
new file mode 100644
index 0000000..03b39ef
--- /dev/null
+++ b/app/views/admin/data_files/_form.html.haml
@@ -0,0 +1,15 @@
+- form_for @data_file, :url => admin_data_file_path(:id => @data_file.id, :file_folder_id => params[:file_folder_id], :manager => params[:manager], :multiple => params[:multiple]), :remote => true do |form| 
+  %table{:style => "width:100%"}
+    %tr
+      %td{:style => "width:120px"} Nom :
+      %td= form.text_field :name, :style => "width:90%"
+    %tr
+      %td{:style => "vertical-align:top;"} Description :
+      %td= form.text_area :description, :style => "max-width:90%;width:90%;height:100px;"
+    %tr.submit_tr
+      %td=link_to "Annuler", admin_data_file_path(:id => @data_file.id, :manager => params[:manager], :multiple => params[:multiple]), :remote => true
+      %td
+        
+        =form.submit "Sauvegarder"
+        
+  
\ No newline at end of file
diff --git a/app/views/admin/data_files/_index_block.html.haml b/app/views/admin/data_files/_index_block.html.haml
new file mode 100644
index 0000000..63e5dff
--- /dev/null
+++ b/app/views/admin/data_files/_index_block.html.haml
@@ -0,0 +1,150 @@
+#data_files_content
+  #data_files_big_container.container-fluid
+    #file_folders=render :partial => "admin/file_folders/file_folders"
+      
+    
+    #file_folders_navbar
+      =render :partial => "admin/file_folders/file_folders_navbar"
+      
+      
+      
+      
+
+    =render :partial => "data_files_container"
+
+
+  %form#fileupload{:action => admin_data_files_path(:id => @data_file.id, :file_folder_id => params[:file_folder_id], :manager => params[:manager], :multiple => params[:multiple]),:method=>"POST", :enctype=>"multipart/form-data", :style => "display:inline;"}
+    %input{:name => "redirect", :type => "hidden", :value => "/"}/
+    
+    
+    %nav.navbar.navbar-default.navbar-fixed-bottom#image_files_navbar{:style => "position:absolute;"}
+    
+      .container-fluid
+      
+        %ul.nav.navbar-nav.navbar-right
+        
+          .fileupload-progress.fade{:style => "float:left;"}
+            #upload_details{:style => ""}
+              .content
+                .fileupload-buttonbar
+                  %button.btn.btn-warning.cancel{:type => "reset"}
+                    %i.icon-ban-circle.icon-white
+                    %span Cancel upload
+                  %span.fileupload-loading
+        
+                %table.table.table-striped{:role => "presentation"}
+                  %tbody.ulpoad_files
+         
+        
+        
+            .progress-extended{:style => "float:left;padding: 10px;font-size:14px;line-height:20px;"}
+
+     
+            .progress.progress-success.progress-striped.active{"aria-valuemax" => "100", "aria-valuemin" => "0", :role => "progressbar",:style => "width:200px;float:left;margin: 10px;height:20px;"}
+              .bar{:style => "width:0%;"}
+       
+          
+  
+        .navbar-header
+          %span.navbar-brand Fichiers
+          
+          
+          
+        .collapse.navbar-collapse
+          %ul.nav.navbar-nav
+            %li
+              %a{:href => "#", :onclick => "$(this).next('input').click();return false;"}
+                %span.fileinput-button{}
+                  %i.icon-plus.icon-white
+                  %span Ajouter des fichiers
+              %input{:multiple => "", :name => "files[]", :type => "file", :style => "display:none;"}
+    
+          
+          
+    
+    
+         
+            
+              
+
+        
+        
+         
+
+            :plain
+               <!-- The template to display files available for upload -->
+               <script id="template-upload" type="text/x-tmpl">
+               {% for (var i=0, file; file=o.files[i]; i++) { %}
+                   <tr class="template-upload fade">
+                       <td>
+                           <span class="preview"></span>
+                       </td>
+                       <td>
+                           <p class="name">{%=file.name%}</p>
+                           {% if (file.error) { %}
+                               <div><span class="label label-important">Error</span> {%=file.error%}</div>
+                           {% } %}
+                       </td>
+                       <td>
+                           <p class="size">{%=o.formatFileSize(file.size)%}</p>
+                           {% if (!o.files.error) { %}
+                               <div class="progress progress-success progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="bar" style="width:0%;"></div></div>
+                           {% } %}
+                       </td>
+                       <td>
+                           {% if (!o.files.error && !i && !o.options.autoUpload) { %}
+                               <button class="btn btn-primary start">
+                                   <i class="icon-upload icon-white"></i>
+                                   <span>Start</span>
+                               </button>
+                           {% } %}
+                           {% if (!i) { %}
+                               <button class="btn btn-warning cancel">
+                                   <i class="icon-ban-circle icon-white"></i>
+                                   <span>Cancel</span>
+                               </button>
+                           {% } %}
+                       </td>
+                   </tr>
+               {% } %}
+               </script>
+               <!-- The template to display files available for download -->
+               <script id="template-download" type="text/x-tmpl">
+               {% for (var i=0, file; file=o.files[i]; i++) { %}
+                   <tr class="template-download fade", :style => "display:none;">
+      
+                   </tr>
+               {% } %}
+               </script>
+       
+
+
+
+        :coffeescript
+          $('#fileupload').fileupload({
+            paramName:"files",
+            dataType:"script",
+            autoUpload:true,
+            filesContainer:".ulpoad_files"
+      
+          }).bind('fileuploadadded',(e, data)->
+            $("#upload_details").show();
+          ).bind('fileuploadfinished',(e, data)->
+            $("#upload_details").hide();
+          )
+        
+        
+        
+        
+        
+
+  
+    
+    
+
+
+
+
+
+
+
diff --git a/app/views/admin/data_files/_show.html.haml b/app/views/admin/data_files/_show.html.haml
new file mode 100644
index 0000000..3307a7d
--- /dev/null
+++ b/app/views/admin/data_files/_show.html.haml
@@ -0,0 +1,18 @@
+.img{:style => ("background-image:url('"+(@data_file.file.url).to_s+"');")}
+  
+.form
+  %table{:style => "width:100%"}
+    %tr
+      %td{:style => "width:120px"} Date d'ajout :
+      %td= l @data_file.created_at
+  =render :partial => "form"
+#right_bar_clone
+  #right_bar_clone_buttons_left
+    = link_to i(:"trash-o"), admin_data_file_path(:id => @data_file.id, :manager => params[:manager], :multiple => params[:multiple]), :confirm => 'Voulez-vous vraiment supprimer cette image ?', :method => :delete, :remote => true
+    
+    
+    = link_to i(:check_alt, :gray_light), "#",:onclick => "manager_send_data_file("+@data_file.id.to_s+");return false;" if params[:manager] and !params[:multiple]
+    
+    
+    
+    
diff --git a/app/views/admin/data_files/create.js.erb b/app/views/admin/data_files/create.js.erb
new file mode 100644
index 0000000..48c7c21
--- /dev/null
+++ b/app/views/admin/data_files/create.js.erb
@@ -0,0 +1,4 @@
+$("#data_files").prepend("<%= escape_javascript(render(@data_file)) %>");
+$('#data_file_<%=@data_file.id %>').addClass('active');
+
+<%= flash_js %>
diff --git a/app/views/admin/data_files/destroy.js.erb b/app/views/admin/data_files/destroy.js.erb
new file mode 100644
index 0000000..3544cc4
--- /dev/null
+++ b/app/views/admin/data_files/destroy.js.erb
@@ -0,0 +1,2 @@
+$("#data_file_<%= @data_file.id.to_s %>").fadeOut(200).delay(6000).remove();
+<%= flash_js %>
\ No newline at end of file
diff --git a/app/views/admin/data_files/index.html.haml b/app/views/admin/data_files/index.html.haml
new file mode 100644
index 0000000..83dff9e
--- /dev/null
+++ b/app/views/admin/data_files/index.html.haml
@@ -0,0 +1,2 @@
+%div{:style => ("position:absolute;bottom:0px;left:0px;right:0px;top:52px;" if !params[:manager])}
+  =render :partial => "index_block"
\ No newline at end of file
diff --git a/app/views/admin/data_files/index.js.erb b/app/views/admin/data_files/index.js.erb
new file mode 100644
index 0000000..0cc0deb
--- /dev/null
+++ b/app/views/admin/data_files/index.js.erb
@@ -0,0 +1 @@
+$('#data_files_content').html("<%= escape_javascript(render(:partial => "index_block")) %>");
\ No newline at end of file
diff --git a/app/views/admin/data_files/show.js.erb b/app/views/admin/data_files/show.js.erb
new file mode 100644
index 0000000..d932dfe
--- /dev/null
+++ b/app/views/admin/data_files/show.js.erb
@@ -0,0 +1,3 @@
+
+
+$('#data_file_container_content').html("<%= escape_javascript(render(:partial => "show")) %>");
diff --git a/app/views/admin/data_files/update.js.erb b/app/views/admin/data_files/update.js.erb
new file mode 100644
index 0000000..3e4a78c
--- /dev/null
+++ b/app/views/admin/data_files/update.js.erb
@@ -0,0 +1,5 @@
+
+$('#data_file_<%= @data_file.id %>').replaceWith("<%= escape_javascript(render(@data_file))%>");
+$('#data_files_big_container #main_workspace_view #data_file_container .form').html("<%= escape_javascript(render(:partial => 'form'))%>");
+
+data_files_load();
\ No newline at end of file
diff --git a/app/views/admin/external_links/_external_link.html.haml b/app/views/admin/external_links/_external_link.html.haml
new file mode 100644
index 0000000..8962362
--- /dev/null
+++ b/app/views/admin/external_links/_external_link.html.haml
@@ -0,0 +1,11 @@
+%tr#external_link_row.external_link_row.row{:id => external_link.id}
+  %td
+    = link_to i(:ok), "#",:onclick => "manager_send_cible("+external_link.id.to_s+", 'ExternalLink', '#{escape_javascript(external_link.cible_name)}');return false;" 
+    =external_link.url
+
+
+  %td.actions
+    = link_to i(:"trash-o"), [:admin, external_link], :data => {:confirm => 'Voulez-vous vraiment supprimer ce lien externe ?'}, :method => :delete, :remote => true
+    
+    = link_to i(:pencil), edit_admin_external_link_path(external_link), :remote => true
+  
\ No newline at end of file
diff --git a/app/views/admin/external_links/_form.html.haml b/app/views/admin/external_links/_form.html.haml
new file mode 100644
index 0000000..2c46ded
--- /dev/null
+++ b/app/views/admin/external_links/_form.html.haml
@@ -0,0 +1,14 @@
+= semantic_form_for [:admin, @external_link], :remote => true do |form| 
+
+  = form.inputs do 
+
+    = form.input :url, :label => "Url :"
+
+
+  .actions
+    %button{:type => "submit"} Sauvegarder
+
+
+
+
+ 
\ No newline at end of file
diff --git a/app/views/admin/external_links/cible.html.haml b/app/views/admin/external_links/cible.html.haml
new file mode 100644
index 0000000..d7c0a65
--- /dev/null
+++ b/app/views/admin/external_links/cible.html.haml
@@ -0,0 +1,11 @@
+=# link_to 'Ajouter un lien', new_admin_external_link_path, :remote => true, :class => "button"
+#external_link_form
+  =render :partial => "form"
+
+%table.normal_table
+
+
+  %tbody#external_link_rows.rows
+
+    =render @external_links
+
diff --git a/app/views/admin/external_links/create.js.erb b/app/views/admin/external_links/create.js.erb
new file mode 100644
index 0000000..ffbcc15
--- /dev/null
+++ b/app/views/admin/external_links/create.js.erb
@@ -0,0 +1,2 @@
+$('#external_link_rows').prepend("<%= escape_javascript(render(@external_link))%>");
+manager_send_cible(<%= @external_link.id %>, 'ExternalLink', '<%= escape_javascript(@external_link.cible_name) %>');
\ No newline at end of file
diff --git a/app/views/admin/external_links/destroy.js.erb b/app/views/admin/external_links/destroy.js.erb
new file mode 100644
index 0000000..b2a7254
--- /dev/null
+++ b/app/views/admin/external_links/destroy.js.erb
@@ -0,0 +1 @@
+$('#external_link_row_<%= @external_link.id %>').remove();
\ No newline at end of file
diff --git a/app/views/admin/external_links/edit.html.haml b/app/views/admin/external_links/edit.html.haml
new file mode 100644
index 0000000..0f77e3f
--- /dev/null
+++ b/app/views/admin/external_links/edit.html.haml
@@ -0,0 +1,6 @@
+.grid_12
+  %h1 Modifier un administrateur
+
+    
+  =render :partial => "form"
+
diff --git a/app/views/admin/external_links/edit.js.erb b/app/views/admin/external_links/edit.js.erb
new file mode 100644
index 0000000..ee8b4d6
--- /dev/null
+++ b/app/views/admin/external_links/edit.js.erb
@@ -0,0 +1 @@
+show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>", 500, 500, 3000);
\ No newline at end of file
diff --git a/app/views/admin/external_links/index.js.erb b/app/views/admin/external_links/index.js.erb
new file mode 100644
index 0000000..6a4e08d
--- /dev/null
+++ b/app/views/admin/external_links/index.js.erb
@@ -0,0 +1,2 @@
+
+$('#Admin_index_block').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
\ No newline at end of file
diff --git a/app/views/admin/external_links/new.js.erb b/app/views/admin/external_links/new.js.erb
new file mode 100644
index 0000000..ee8b4d6
--- /dev/null
+++ b/app/views/admin/external_links/new.js.erb
@@ -0,0 +1 @@
+show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>", 500, 500, 3000);
\ No newline at end of file
diff --git a/app/views/admin/external_links/show.html.haml b/app/views/admin/external_links/show.html.haml
new file mode 100644
index 0000000..d2154d5
--- /dev/null
+++ b/app/views/admin/external_links/show.html.haml
@@ -0,0 +1,31 @@
+.header
+  %h1 Détails de l'utilisateur
+  .back
+    = link_to "Retour",admin_users_path
+.links
+  = link_to "Modifier", edit_admin_user_path(@user), :class => "lien" 
+
+.shadow_box{:style => "padding:10px;"}
+  %p
+    <b>Login:</b>
+    =h @user.login 
+
+  %p
+
+    <b>Email:</b>
+    =mail_to @user.email 
+
+
+
+.shadow_box.padding
+  %h2 Logs  
+  %table.admin_table
+    -for log in @user.user_logs.find(:all, :order => "created_at DESC")
+      %tr
+        %td=l log.created_at
+        %td=h log.message
+
+
+
+
+
diff --git a/app/views/admin/external_links/update.js.erb b/app/views/admin/external_links/update.js.erb
new file mode 100644
index 0000000..38f461b
--- /dev/null
+++ b/app/views/admin/external_links/update.js.erb
@@ -0,0 +1,2 @@
+close_pane_hover();
+$('#external_link_row_<%= @external_link.id %>').replaceWith("<%= escape_javascript(render(@external_link))%>");
\ No newline at end of file
diff --git a/app/views/admin/file_folders/_file_folder.html.haml b/app/views/admin/file_folders/_file_folder.html.haml
new file mode 100644
index 0000000..727bcf9
--- /dev/null
+++ b/app/views/admin/file_folders/_file_folder.html.haml
@@ -0,0 +1,5 @@
+%li{:class => (" active" if file_folder.id == params[:file_folder_id].to_i).to_s}
+  
+  =link_to file_folder.name, admin_data_files_path(:file_folder_id => file_folder.id, :manager => params[:manager], :multiple => params[:multiple]), :remote => true, :class => "file_folder"+(" active" if file_folder.id == params[:file_folder_id].to_i).to_s, :id => "file_folder_"+file_folder.id.to_s,:"data-file_folder_id" => file_folder.id, :"data-file_folder_path" => admin_file_folder_path(:format => "js",:file_folder_id => file_folder.id, :manager => params[:manager], :multiple => params[:multiple], :id => file_folder.id), :"data-edit_file_folder_path" => edit_admin_file_folder_path(:format => "js",:file_folder_id => file_folder.id, :manager => params[:manager], :multiple => params[:multiple], :id => file_folder.id)
+  
+ 
\ No newline at end of file
diff --git a/app/views/admin/file_folders/_file_folders.html.haml b/app/views/admin/file_folders/_file_folders.html.haml
new file mode 100644
index 0000000..4b06e9e
--- /dev/null
+++ b/app/views/admin/file_folders/_file_folders.html.haml
@@ -0,0 +1,6 @@
+%ul.nav.nav-list
+  =render @file_folders
+  
+  %li
+    =# link_to i(:plus), new_admin_file_folder_url(:file_folder_id => params[:file_folder_id], :manager => params[:manager], :multiple => params[:multiple]), :remote => true, :id => "add_album"
+
diff --git a/app/views/admin/file_folders/_file_folders_navbar.html.haml b/app/views/admin/file_folders/_file_folders_navbar.html.haml
new file mode 100644
index 0000000..a6ec442
--- /dev/null
+++ b/app/views/admin/file_folders/_file_folders_navbar.html.haml
@@ -0,0 +1,9 @@
+= link_to ic(:plus), new_admin_file_folder_url(:file_folder_id => params[:file_folder_id], :manager => params[:manager], :multiple => params[:multiple]), :remote => true, :id => "add_file_folder"
+= link_to ic(:pencil),edit_admin_file_folder_url(:id => params[:file_folder_id], :file_folder_id => params[:file_folder_id], :manager => params[:manager], :multiple => params[:multiple]), :remote => true, :id => "edit_current_file_folder", :style => "display:inline-block; margin-right:5px;"
+
+= link_to ic(:"trash-o"), admin_file_folder_url(:id => params[:file_folder_id],:file_folder_id => params[:file_folder_id], :manager => params[:manager], :multiple => params[:multiple]), :remote => true, :id => "remove_current_file_folder", :method => :delete, :"data-confirm" => "Voulez-vous vraiment supprimer cet file_folder ? Attention, toutes les images de celui-ci seront définitivement supprimées.", :style => "display:inline-block;"
+
+
+
+
+
diff --git a/app/views/admin/file_folders/create.js.erb b/app/views/admin/file_folders/create.js.erb
new file mode 100644
index 0000000..f204123
--- /dev/null
+++ b/app/views/admin/file_folders/create.js.erb
@@ -0,0 +1,2 @@
+$('#file_folders').html("<%= escape_javascript(render(:partial => "file_folders")) %>");
+data_files_load();
\ No newline at end of file
diff --git a/app/views/admin/file_folders/destroy.js.erb b/app/views/admin/file_folders/destroy.js.erb
new file mode 100644
index 0000000..e09a0f0
--- /dev/null
+++ b/app/views/admin/file_folders/destroy.js.erb
@@ -0,0 +1 @@
+$('#file_folders').html("<%= escape_javascript(render(:partial => "file_folders")) %>");
\ No newline at end of file
diff --git a/app/views/admin/file_folders/edit.js.erb b/app/views/admin/file_folders/edit.js.erb
new file mode 100644
index 0000000..0d099f4
--- /dev/null
+++ b/app/views/admin/file_folders/edit.js.erb
@@ -0,0 +1,16 @@
+var new_file_folder_name = prompt("Nom de l'file_folder :\n <%= "Le nom que vous avez chosi existe déjà." if @file_folder_update %>", "<%=escape_javascript(@file_folder.name) %>");
+
+if(new_file_folder_name){
+
+
+  $.ajax({url : $("#file_folder_<%=@file_folder.id %>").data('file_folder_path'), type: "PUT", data : {
+    file_folder : {
+      name: new_file_folder_name
+    }
+  }
+  
+  });
+
+
+
+}
\ No newline at end of file
diff --git a/app/views/admin/file_folders/index.js.erb b/app/views/admin/file_folders/index.js.erb
new file mode 100644
index 0000000..d8807f0
--- /dev/null
+++ b/app/views/admin/file_folders/index.js.erb
@@ -0,0 +1,3 @@
+
+$('#file_folders').html("<%= escape_javascript(render(:partial => "file_folders")) %>");
+data_files_load();
\ No newline at end of file
diff --git a/app/views/admin/file_folders/new.js.erb b/app/views/admin/file_folders/new.js.erb
new file mode 100644
index 0000000..1f35639
--- /dev/null
+++ b/app/views/admin/file_folders/new.js.erb
@@ -0,0 +1,16 @@
+var new_file_folder_name = prompt("Nom de l'file_folder :\n <%= "Vous n'avez spécifié aucuns nom pour ce nouvel file_folder, ou le nom que vous avez chosi existe déjà." if @file_folder_create %>", "<%=escape_javascript(@file_folder.name) %>");
+
+if(new_file_folder_name){
+
+
+  $.ajax({url : "/admin/file_folders?&manager=true&multiple=true", type: "POST", data : {
+    file_folder : {
+      name: new_file_folder_name
+    }
+  }
+  
+  });
+
+
+
+}
\ No newline at end of file
diff --git a/app/views/admin/file_folders/update.js.erb b/app/views/admin/file_folders/update.js.erb
new file mode 100644
index 0000000..f204123
--- /dev/null
+++ b/app/views/admin/file_folders/update.js.erb
@@ -0,0 +1,2 @@
+$('#file_folders').html("<%= escape_javascript(render(:partial => "file_folders")) %>");
+data_files_load();
\ No newline at end of file
diff --git a/app/views/admin/image_files/_form.html.haml b/app/views/admin/image_files/_form.html.haml
new file mode 100644
index 0000000..a6c21a9
--- /dev/null
+++ b/app/views/admin/image_files/_form.html.haml
@@ -0,0 +1,17 @@
+= form_for @image_file, :url => admin_image_file_path(:id => @image_file.id, :album_id => params[:album_id], :manager => params[:manager], :multiple => params[:multiple]), :remote => true do |form| 
+  %table{:style => "width:100%"}
+    %tr
+      %td{:style => "width:120px"} Nom :
+      %td= form.text_field :name, :style => "width:90%"
+    %tr
+      %td{:style => "width:120px"} Photographe :
+      %td= form.text_field :photograph, :style => "width:90%"
+    
+    %tr
+      %td{:style => "vertical-align:top;"} Description :
+      %td= form.text_area :description, :style => "max-width:90%;width:90%;height:100px;"
+  .actions.submit_tr
+    =link_to "Annuler", admin_image_file_path(:id => @image_file.id, :manager => params[:manager], :multiple => params[:multiple]), :remote => true, :class => "button"
+    =form.submit "Sauvegarder"
+        
+  
\ No newline at end of file
diff --git a/app/views/admin/image_files/_image_file.html.haml b/app/views/admin/image_files/_image_file.html.haml
new file mode 100644
index 0000000..074dbf2
--- /dev/null
+++ b/app/views/admin/image_files/_image_file.html.haml
@@ -0,0 +1,10 @@
+- if image_file.file?
+  #image_file.image_file.thumbnail{:id => image_file.id, :data_thumb => image_file.file.large.medium.small.thumb.url, :data_id => image_file.id, :data_name => image_file.name, :data_description => image_file.description, :data_tags => image_file.tags, :data_show_url => admin_image_file_path(:id => image_file.id, :manager => params[:manager], :multiple => params[:multiple]), :data_edit_url => edit_admin_image_file_path(:id => image_file.id, :manager => params[:manager], :multiple => params[:multiple]) , :class => ("new" if @image_file_create)}
+    %a{:name => "image_file_#{image_file.id}_anchor"}
+    .img.QI_background_resize{:style => ("background-image:url('"+(image_file.file.large.medium.small.thumb.url).to_s+"?u="+image_file.updated_at.to_s+"');")}
+    
+    .name
+      =image_file.name ? truncate(image_file.name, :length => 17) : raw("&nbsp;")
+      = link_to i(:"check"), "#",:onclick => "manager_send_image_file("+image_file.id.to_s+");return false;" if params[:manager] and !params[:multiple]
+      
+    
\ No newline at end of file
diff --git a/app/views/admin/image_files/_image_files_container.html.haml b/app/views/admin/image_files/_image_files_container.html.haml
new file mode 100644
index 0000000..0f336b1
--- /dev/null
+++ b/app/views/admin/image_files/_image_files_container.html.haml
@@ -0,0 +1,4 @@
+#image_files_container{ :data_reset_url => admin_image_files_path(:format => "js",:manager => params[:manager], :multiple => params[:multiple]), :data_current_url => url_for({}.merge!(params).merge!({:format => "js"}))}
+  
+  #image_files=render @image_files
+  %p{:style => "clear:both;"}
diff --git a/app/views/admin/image_files/_index_block.html.haml b/app/views/admin/image_files/_index_block.html.haml
new file mode 100644
index 0000000..90701f4
--- /dev/null
+++ b/app/views/admin/image_files/_index_block.html.haml
@@ -0,0 +1,165 @@
+#image_files_content
+  #image_files_big_container.container-fluid
+    #albums=render :partial => "admin/albums/albums"
+      
+    
+    #albums_navbar
+      =render :partial => "admin/albums/albums_navbar"
+      
+      
+      
+      
+
+    =render :partial => "image_files_container"
+
+
+  %form#fileupload{:action => admin_image_files_path(:id => @image_file.id, :album_id => params[:album_id], :manager => params[:manager], :multiple => params[:multiple]),:method=>"POST", :enctype=>"multipart/form-data", :style => "display:inline;"}
+    %input{:name => "redirect", :type => "hidden", :value => "/"}/
+  
+    %nav.navbar.navbar-default.navbar-fixed-bottom#image_files_navbar{:style => "position:absolute;"}
+    
+      .container-fluid
+      
+        %ul.nav.navbar-nav.navbar-right
+        
+          .fileupload-progress.fade{:style => "float:left;"}
+            #upload_details{:style => ""}
+              .content
+                .fileupload-buttonbar
+                  %button.btn.btn-warning.cancel{:type => "reset"}
+                    %i.icon-ban-circle.icon-white
+                    %span Cancel upload
+                  %span.fileupload-loading
+        
+                %table.table.table-striped{:role => "presentation"}
+                  %tbody.ulpoad_files
+         
+        
+        
+            .progress-extended{:style => "float:left;padding: 10px;font-size:14px;line-height:20px;"}
+
+     
+            .progress.progress-success.progress-striped.active{"aria-valuemax" => "100", "aria-valuemin" => "0", :role => "progressbar",:style => "width:200px;float:left;margin: 10px;height:20px;"}
+              .bar{:style => "width:0%;"}
+       
+          %div{:style => "float:left;padding: 10px;height:20px;"}
+            %input#grid_slider{:type=>"text", :value=>""}
+      
+          :coffeescript
+            initialize_slider()
+      
+       
+  
+  
+        .navbar-header
+          %span.navbar-brand Images
+    
+
+
+       
+          
+          
+          
+          
+        .collapse.navbar-collapse
+          %ul.nav.navbar-nav#multiple_selection
+
+            %li.dropdown#multiple_menu
+              %a#multiple_selection_text{:href => "#", :class => "dropdown-toggle", :data => {:toggle => "dropdown"}}
+                %b.caret
+      
+              %ul.dropdown-menu
+                
+                %li
+                  %a{:href => "#", :onclick => "delete_multiple_images();return false;"} Supprimer ces images
+        
+                %li.divider
+                %li
+                  %a{:href => "#", :onclick => "unselect_all_image();return false;"} Tout désélectionner
+                %li  
+                  %a{:href => "#", :onclick => "select_all_image();return false;"} Tout sélectionner
+        
+          %ul.nav.navbar-nav
+            %li
+              -if params[:multiple]
+                %li
+                  %a{:href => "#", :onclick => "manager_send_multiple_image_files();return false;"}=ic :"check-circle"
+            
+  
+          %ul.nav.navbar-nav
+            %li
+              %a{:href => "#", :onclick => "$(this).next('input').click();return false;"}
+                %span.fileinput-button{}
+                  %i.icon-plus.icon-white
+                  %span Ajouter des images
+              %input{:multiple => "", :name => "files[]", :type => "file", :style => "display:none;"}
+    
+          
+            
+
+      
+      
+       
+
+          :plain
+             <!-- The template to display files available for upload -->
+             <script id="template-upload" type="text/x-tmpl">
+             {% for (var i=0, file; file=o.files[i]; i++) { %}
+                 <tr class="template-upload fade">
+                     <td>
+                         <span class="preview"></span>
+                     </td>
+                     <td>
+                         <p class="name">{%=file.name%}</p>
+                         {% if (file.error) { %}
+                             <div><span class="label label-important">Error</span> {%=file.error%}</div>
+                         {% } %}
+                     </td>
+                     <td>
+                         <p class="size">{%=o.formatFileSize(file.size)%}</p>
+                         {% if (!o.files.error) { %}
+                             <div class="progress progress-success progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="bar" style="width:0%;"></div></div>
+                         {% } %}
+                     </td>
+                     <td>
+                         {% if (!o.files.error && !i && !o.options.autoUpload) { %}
+                             <button class="btn btn-primary start">
+                                 <i class="icon-upload icon-white"></i>
+                                 <span>Start</span>
+                             </button>
+                         {% } %}
+                         {% if (!i) { %}
+                             <button class="btn btn-warning cancel">
+                                 <i class="icon-ban-circle icon-white"></i>
+                                 <span>Cancel</span>
+                             </button>
+                         {% } %}
+                     </td>
+                 </tr>
+             {% } %}
+             </script>
+             <!-- The template to display files available for download -->
+             <script id="template-download" type="text/x-tmpl">
+             {% for (var i=0, file; file=o.files[i]; i++) { %}
+                 <tr class="template-download fade", :style => "display:none;">
+    
+                 </tr>
+             {% } %}
+             </script>
+     
+
+
+
+      :coffeescript
+        $('#fileupload').fileupload({
+          paramName:"files",
+          dataType:"script",
+          autoUpload:true,
+          filesContainer:".ulpoad_files"
+    
+        }).bind('fileuploadadded',(e, data)->
+          $("#upload_details").show();
+        ).bind('fileuploadfinished',(e, data)->
+          $("#upload_details").hide();
+        )
+
diff --git a/app/views/admin/image_files/_show.html.haml b/app/views/admin/image_files/_show.html.haml
new file mode 100644
index 0000000..bfb8ba2
--- /dev/null
+++ b/app/views/admin/image_files/_show.html.haml
@@ -0,0 +1,16 @@
+.img{:style => ("background-image:url('"+(@image_file.file.url).to_s+"?u="+ @image_file.updated_at.to_s+"');")}
+  
+.form
+
+  =render :partial => "form"
+#right_bar_clone
+  #right_bar_clone_buttons_left
+    = link_to i(:"trash-o"), admin_image_file_path(:id => @image_file.id, :manager => params[:manager], :multiple => params[:multiple]), :confirm => 'Voulez-vous vraiment supprimer cette image ?', :method => :delete, :remote => true
+    
+    = link_to i(:rotate, :gray_light, "12x14"), rotate_admin_image_file_path(:id => @image_file.id, :manager => params[:manager], :multiple => params[:multiple]), :remote => true, :onclick => "set_busy();"
+    = link_to i(:rotate_right, :gray_light, "12x14"), rotate_admin_image_file_path(:id => @image_file.id, :manager => params[:manager], :multiple => params[:multiple], :direction => :right), :remote => true, :onclick => "set_busy();"
+    = link_to i(:check_alt, :gray_light), "#",:onclick => "manager_send_image_file("+@image_file.id.to_s+");return false;" if params[:manager] and !params[:multiple]
+    
+    
+    
+    
diff --git a/app/views/admin/image_files/create.js.erb b/app/views/admin/image_files/create.js.erb
new file mode 100644
index 0000000..539855a
--- /dev/null
+++ b/app/views/admin/image_files/create.js.erb
@@ -0,0 +1,9 @@
+
+$("#image_files").prepend("<%= escape_javascript(render(@image_file)) %>");
+$('#image_file_<%=@image_file.id %>').addClass('active');
+update_multiple_selection_text();
+set_image_files_img_size();
+$('.template-download').fadeOut();
+
+
+<%= flash_js %>
diff --git a/app/views/admin/image_files/destroy.js.erb b/app/views/admin/image_files/destroy.js.erb
new file mode 100644
index 0000000..405f173
--- /dev/null
+++ b/app/views/admin/image_files/destroy.js.erb
@@ -0,0 +1,4 @@
+$('#image_file_prevualize_box').fadeOut();
+$("#image_file_<%= @image_file.id.to_s %>").fadeOut(200).delay(6000).remove();
+
+<%= flash_js %>
\ No newline at end of file
diff --git a/app/views/admin/image_files/index.html.haml b/app/views/admin/image_files/index.html.haml
new file mode 100644
index 0000000..875977c
--- /dev/null
+++ b/app/views/admin/image_files/index.html.haml
@@ -0,0 +1,3 @@
+
+%div{:style => ("position:absolute;bottom:0px;left:0px;right:0px;top:52px;" if !params[:manager])}
+  =render :partial => "index_block"
\ No newline at end of file
diff --git a/app/views/admin/image_files/index.js.erb b/app/views/admin/image_files/index.js.erb
new file mode 100644
index 0000000..1d46987
--- /dev/null
+++ b/app/views/admin/image_files/index.js.erb
@@ -0,0 +1,5 @@
+$('#image_files_content').html("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+$('#image_files_content').html("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+set_image_files_img_size();
diff --git a/app/views/admin/image_files/rotate.js.erb b/app/views/admin/image_files/rotate.js.erb
new file mode 100644
index 0000000..58db01e
--- /dev/null
+++ b/app/views/admin/image_files/rotate.js.erb
@@ -0,0 +1,9 @@
+
+$('#image_file_<%= @image_file.id %>').replaceWith("<%= escape_javascript(render(@image_file))%>");
+
+
+$('#image_file_container_content').html("<%= escape_javascript(render(:partial => "show")) %>");
+
+set_image_files_img_size($("#image_files_big_container #right_bar #grid_slider").slider("value"));
+image_files_load();
+unset_busy();
\ No newline at end of file
diff --git a/app/views/admin/image_files/show.js.erb b/app/views/admin/image_files/show.js.erb
new file mode 100644
index 0000000..06ad059
--- /dev/null
+++ b/app/views/admin/image_files/show.js.erb
@@ -0,0 +1,3 @@
+
+
+$('#image_file_container_content').html("<%= escape_javascript(render(:partial => "show")) %>");
diff --git a/app/views/admin/image_files/update.js.erb b/app/views/admin/image_files/update.js.erb
new file mode 100644
index 0000000..fdaae54
--- /dev/null
+++ b/app/views/admin/image_files/update.js.erb
@@ -0,0 +1,5 @@
+
+$('#image_file_<%= @image_file.id %>').replaceWith("<%= escape_javascript(render(@image_file))%>");
+$('#image_files_big_container #main_workspace_view #image_file_container .form').html("<%= escape_javascript(render(:partial => 'form'))%>");
+set_image_files_img_size($("#image_files_big_container #right_bar #grid_slider").slider("value"));
+image_files_load();
\ No newline at end of file
diff --git a/app/views/admin/menu_aliases/_form.html.haml b/app/views/admin/menu_aliases/_form.html.haml
new file mode 100644
index 0000000..31fc53c
--- /dev/null
+++ b/app/views/admin/menu_aliases/_form.html.haml
@@ -0,0 +1,6 @@
+
+=form.semantic_fields_for :menu_content do |content| 
+  = content.inputs do 
+    
+    -MenuItem.find(:all, :conditions => {:parent_id => nil}, :order => :position).each do |m|
+      =render :partial => "form_line", :locals => {:menu_item => m, :f => content}
\ No newline at end of file
diff --git a/app/views/admin/menu_aliases/_menu_alias.html.haml b/app/views/admin/menu_aliases/_menu_alias.html.haml
new file mode 100644
index 0000000..ebf0afe
--- /dev/null
+++ b/app/views/admin/menu_aliases/_menu_alias.html.haml
@@ -0,0 +1,4 @@
+%table
+  %tr
+    %td{:style => "width:150px;"} élément de menu :
+    %td= link_to menu_alias.menu_item_alias.name, edit_admin_menu_item_path(menu_alias.menu_item_alias) if menu_alias.menu_item_alias
diff --git a/app/views/admin/menu_aliases/edit.html.haml b/app/views/admin/menu_aliases/edit.html.haml
new file mode 100644
index 0000000..e69de29
diff --git a/app/views/admin/menu_items/_cible_line.html.haml b/app/views/admin/menu_items/_cible_line.html.haml
new file mode 100644
index 0000000..b8dd1c7
--- /dev/null
+++ b/app/views/admin/menu_items/_cible_line.html.haml
@@ -0,0 +1,9 @@
+.menu_item_cible_line
+  -menu_item.ancestors.size.times do 
+    &nbsp;&nbsp;&nbsp;&nbsp;
+  =menu_item.name
+  = link_to i(:ok), "#",:onclick => "manager_send_cible("+menu_item.id.to_s+", 'MenuItem', '#{escape_javascript(menu_item.cible_name)}');return false;" if params[:manager]
+  
+  -if menu_item.children.size > 0
+    -menu_item.children.each do |child|
+      =render :partial => "cible_line", :locals => {:menu_item => child}
\ No newline at end of file
diff --git a/app/views/admin/menu_items/_edit_form.html.haml b/app/views/admin/menu_items/_edit_form.html.haml
new file mode 100644
index 0000000..0118b89
--- /dev/null
+++ b/app/views/admin/menu_items/_edit_form.html.haml
@@ -0,0 +1,12 @@
+#menu_item_edit
+  = semantic_form_for [:admin,@menu_item], :remote => true do |form| 
+    =render :partial => "form", :locals => {:form => form}
+  
+  
+    
+    =render :partial => "admin/"+@menu_item.menu_content_type.tableize.to_s+"/form", :locals => {:form => form}
+  
+    .actions
+      = form.submit "Sauvegarder", :class => "btn btn-primary"
+      
+        
diff --git a/app/views/admin/menu_items/_form.html.haml b/app/views/admin/menu_items/_form.html.haml
new file mode 100644
index 0000000..b36f6a2
--- /dev/null
+++ b/app/views/admin/menu_items/_form.html.haml
@@ -0,0 +1,16 @@
+= form.inputs do 
+  = form.input :enabled, :label => "Publié ?"
+  = form.input :visible, :label => "Visible ?"
+  
+  
+  
+  
+  = form.input :name, :label => "Nom :" 
+  = form.input :slug, :label => "slug :"# if current_admin.super_admin? || !@menu_item.super_admin
+  = #form.input :super_admin,:as => :boolean , :label => "Super Admin"#  if current_admin.super_admin?
+  
+  
+  = form.input :menu_id,:as => :hidden 
+  = form.input :parent_id,:as => :hidden 
+  
+
diff --git a/app/views/admin/menu_items/_form_line.html.haml b/app/views/admin/menu_items/_form_line.html.haml
new file mode 100644
index 0000000..9ce5f4f
--- /dev/null
+++ b/app/views/admin/menu_items/_form_line.html.haml
@@ -0,0 +1,7 @@
+-menu_item.ancestors.size.times do 
+  &nbsp;&nbsp;
+=f.radio_button :menu_item_id, menu_item.id, :disabled => ("disabled" if menu_item.menu_content_type =="MenuAlias" or menu_item == @menu_item)
+%label{:for => "menu_item_id_"+menu_item.id.to_s}=menu_item.name
+%br
+-menu_item.children.order(:position).all.each do |m|
+  =render :partial => "form_line", :locals => {:menu_item => m, :f => f}
diff --git a/app/views/admin/menu_items/_index_block.html.haml b/app/views/admin/menu_items/_index_block.html.haml
new file mode 100644
index 0000000..a96c979
--- /dev/null
+++ b/app/views/admin/menu_items/_index_block.html.haml
@@ -0,0 +1,55 @@
+#menu_item_index
+
+  %ul.breadcrumb
+    = link_to 'Ajouter un élément au menu', new_admin_menu_item_path(:menu_id => @menu.id, :parent_id => params[:parent_id]), :class => "btn btn-primary",:remote => true, :style => "float:right;"
+    %li
+      =link_to @menu.name, admin_menu_items_path(:menu_id => @menu.id),:remote => true
+      %span.divider /
+    -if @menu_parent
+      -@menu_parent.ancestors.reverse.each do |menu_item|
+        %li
+          =link_to menu_item.name, admin_menu_items_path(:menu_id => @menu.id, :parent_id =>menu_item.id), :remote => true
+          %span.divider /
+      
+      %li
+        =@menu_parent.name
+        %span.divider /
+    %p{:style => "clear:both;"}
+  
+  
+
+  -if @menu_parent
+    .prevv_folder.receptable{:data => {:menu_id => @menu.id, :parent_id => (@menu_parent.parent ? @menu_parent.parent.id : "no-menu-selected")} }
+      .row-fluid
+        .span1
+          =i(:"folder-close", :icon => false)
+  
+
+        .span2=link_to "...", admin_menu_items_path(:menu_id => @menu.id, :parent_id => (@menu_parent.parent ? @menu_parent.parent.id : nil)), :remote => true
+    
+        .span3
+    
+        .span4
+      
+      
+        .span2.actions
+        
+
+  #sortable_menu_item{:data => {:menu_id => @menu.id, :parent_id => (@menu_parent ? @menu_parent.id : "")} }
+  
+    
+          
+    
+          
+
+      
+      
+    -if @menu_items.size > 0
+      =render @menu_items
+    -else
+      .no_menu_items
+        Il n'y a aucun éléments de menu actuellement.
+        
+  :javascript
+
+    init_menu_items_list();
\ No newline at end of file
diff --git a/app/views/admin/menu_items/_menu_item.html.haml b/app/views/admin/menu_items/_menu_item.html.haml
new file mode 100644
index 0000000..3975a9c
--- /dev/null
+++ b/app/views/admin/menu_items/_menu_item.html.haml
@@ -0,0 +1,34 @@
+#menu_item_row.menu_item_row.row{:id => menu_item.id,:"data-menu-item-id" => menu_item.id}
+  
+  
+    
+  
+  .col-xs-3
+    .receptable{:style => "display:inline-block;width:110px;",:data => {:menu_id => (@menu.id if @menu), :parent_id => menu_item.id}}
+      -if @menu
+        .btn-group
+          %span.handle.btn.btn-default=ic(:arrows, :icon => false)
+          =link_to (menu_item.children.size > 0 ? ic(:"folder") : ic(:"folder-o") )+(menu_item.children.size if menu_item.children.size > 0).to_s, admin_menu_items_path(:menu_id => menu_item.menu_id, :parent_id => menu_item.id), :remote => true, :class => "btn btn-default"
+  
+    =menu_item.menu_content_type.constantize::HUMAN_NAME
+      
+  .col-xs-3=menu_item.name
+      
+  .col-xs-4
+    -if @menu
+      =link_to "/"+menu_item.permalink.to_s+".html", "/"+menu_item.permalink.to_s+".html"
+    -else
+      =link_to archive_public_menu_item_path(menu_item), archive_public_menu_item_path(menu_item)
+        
+  .col-xs-2.actions
+    
+    =link_to i(:copy), clone_admin_menu_item_path(menu_item), :data => {:confirm => 'Voulez-vous vraiment cloner cet élément de menu ?'}
+
+    = link_to i(:"trash-o"), [:admin, menu_item], :data =>{:confirm => 'Voulez-vous vraiment supprimer cet élément de menu ?'}, :method => :delete #, if current_admin.super_admin? || !menu_item.super_admin
+
+    = link_to i(:pencil), edit_admin_menu_item_path(menu_item)
+
+    
+    
+
+
diff --git a/app/views/admin/menu_items/_menu_item_content_form.html.haml b/app/views/admin/menu_items/_menu_item_content_form.html.haml
new file mode 100644
index 0000000..2642aaf
--- /dev/null
+++ b/app/views/admin/menu_items/_menu_item_content_form.html.haml
@@ -0,0 +1,7 @@
+#select_menu_item_content_type_bar
+  -MenuItemContentType.all.each do |menu_item_content_type|
+    =link_to menu_item_content_type.name, new_admin_menu_item_path(:menu_id => @menu_item.menu_id, :parent_id =>@menu_item.parent_id, :menu_item_content_type => menu_item_content_type.slug ), :remote => true, :class => ("active" if menu_item_content_type.slug == @menu_item.menu_content_type).to_s
+.form2=render :partial => "admin/"+@menu_item.menu_content_type.tableize.to_s+"/form", :locals => {:form => form}
+
+- form.buttons do 
+  = form.commit_button "Sauvegarder"
\ No newline at end of file
diff --git a/app/views/admin/menu_items/_new_form.html.haml b/app/views/admin/menu_items/_new_form.html.haml
new file mode 100644
index 0000000..cf6a3bd
--- /dev/null
+++ b/app/views/admin/menu_items/_new_form.html.haml
@@ -0,0 +1,25 @@
+
+
+
+= semantic_form_for [:admin,@menu_item], :remote => true do |form| 
+  .content
+    %h3 Ajouter un élément de menu
+    .form1=render :partial => "form", :locals => {:form => form}
+
+
+
+    #select_menu_item_content_type_bar.bar.dark_blue
+      -MenuItem::ContentTypes.each do |menu_item_content_type|
+        =link_to menu_item_content_type[:name], new_admin_menu_item_path(:menu_id => @menu_item.menu_id, :parent_id =>@menu_item.parent_id, :menu_item_content_type => menu_item_content_type[:slug] ), :onclick => "$('#menu_item_content_form').load($(this).attr('href')+' #menu_item_content_form');$('#select_menu_item_content_type_bar .btn-primary').removeClass('btn-primary');$(this).addClass('btn-primary');return false;",:class => "btn btn-default "+("btn-primary" if menu_item_content_type[:slug] == @menu_item.menu_content_type).to_s
+    #menu_item_content_form.form2
+      = form.inputs do 
+        = form.input :menu_content_type,:as => :hidden
+      =render :partial => "admin/"+@menu_item.menu_content_type.tableize.to_s+"/form", :locals => {:form => form}
+
+
+
+  .actions
+    = form.submit "Sauvegarder", :class => "btn btn-primary"
+
+
+
diff --git a/app/views/admin/menu_items/_show.html.haml b/app/views/admin/menu_items/_show.html.haml
new file mode 100644
index 0000000..239521d
--- /dev/null
+++ b/app/views/admin/menu_items/_show.html.haml
@@ -0,0 +1,7 @@
+%h1#menu_item_show
+  
+  =@menu_item.name
+  (
+  =@menu_item.enabled ? "Publié" : "Brouillon"
+  )
+  
\ No newline at end of file
diff --git a/app/views/admin/menu_items/archives.html.haml b/app/views/admin/menu_items/archives.html.haml
new file mode 100644
index 0000000..ab618e0
--- /dev/null
+++ b/app/views/admin/menu_items/archives.html.haml
@@ -0,0 +1,10 @@
+%h1 Archives
+
+
+#menu_item_index
+  #sortable_menu_item=render @menu_items
+
+
+
+
+  
\ No newline at end of file
diff --git a/app/views/admin/menu_items/cible.html.haml b/app/views/admin/menu_items/cible.html.haml
new file mode 100644
index 0000000..91d1e35
--- /dev/null
+++ b/app/views/admin/menu_items/cible.html.haml
@@ -0,0 +1,5 @@
+
+-@menu_items.each do |menu_item|
+  
+  =render :partial => "cible_line", :locals => {:menu_item => menu_item}
+    
\ No newline at end of file
diff --git a/app/views/admin/menu_items/create.js.erb b/app/views/admin/menu_items/create.js.erb
new file mode 100644
index 0000000..46d6cdf
--- /dev/null
+++ b/app/views/admin/menu_items/create.js.erb
@@ -0,0 +1,4 @@
+$('#menu_item_index').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+close_pane_hover();
+initialize_menu_items();
\ No newline at end of file
diff --git a/app/views/admin/menu_items/edit.html.haml b/app/views/admin/menu_items/edit.html.haml
new file mode 100644
index 0000000..422cefd
--- /dev/null
+++ b/app/views/admin/menu_items/edit.html.haml
@@ -0,0 +1,14 @@
+
+
+
+
+  
+
+  
+
+
+-if @menu_item.menu_content_type == "Page"
+  =render @menu_item.menu_content
+  
+  
+    
diff --git a/app/views/admin/menu_items/edit.js.erb b/app/views/admin/menu_items/edit.js.erb
new file mode 100644
index 0000000..cabb358
--- /dev/null
+++ b/app/views/admin/menu_items/edit.js.erb
@@ -0,0 +1,3 @@
+
+
+$('#menu_item_edit').replaceWith("<%= escape_javascript(render(:partial => "edit_form"))%>");
diff --git a/app/views/admin/menu_items/import.html.haml b/app/views/admin/menu_items/import.html.haml
new file mode 100644
index 0000000..9e14904
--- /dev/null
+++ b/app/views/admin/menu_items/import.html.haml
@@ -0,0 +1,112 @@
+
+-@agendas.each do |actu|
+
+
+
+
+  -@event= Event.new(:skip_date => true,:stop_date => true, :start_at => (actu["start_at"]  != "0000-00-00 00:00:00" ? actu["start_at"] : "2010-01-01 00:00:00"),:stop_at => (actu["finished_at"]  != "0000-00-00 00:00:00" ? actu["finished_at"] : "2010-01-01 00:00:00"), :updated_at => actu["updated_at"], :created_at => actu["created_at"],:title => actu["title"],:description => HTMLEntities.new.decode(actu["description"]) )
+
+  
+
+
+  -if @event.save
+
+  
+  
+    
+    -content = ""
+    -begin
+
+      =@event.block.portlets << Portlet.create(:content => TextContent.new(:content => HTMLEntities.new.decode(actu["content"])))
+    -rescue
+  
+  -else
+    =debug @event.errors
+        
+
+ 
+
+
+
+
+
+
+-@album = Album.create(:name => "images actualité")
+
+
+
+
+-@actualitees.each do |actu|
+
+  -@article= Article.new(:enabled => true, :frontpage => true,:end_at => (actu["end_at"]  != "0000-00-00 00:00:00" ? actu["end_at"] : "2010-01-01 00:00:00"), :published_at => (actu["start_at"]  != "0000-00-00 00:00:00" ? actu["start_at"] : "2010-01-01 00:00:00"), :updated_at => actu["updated_at"], :created_at => actu["created_at"],:title => actu["title"],:description => HTMLEntities.new.decode(actu["description"]) )
+
+  -begin
+    -rep = false
+    -rep = @article.save
+  -rescue
+    %h2 erreur
+    =debug @article
+
+  -if rep
+    -content = ""
+    -begin
+
+      =@article.block.portlets << Portlet.create(:content => TextContent.new(:content => HTMLEntities.new.decode(actu["content"])))
+    -rescue
+      
+        
+  -@url = Rails.root.join("public", "system","images", actu["id"],"original",actu["image_file_name"])
+  
+  -if File.exist?(@url)
+    
+    =debug  File.open(@url)
+    -@image_file = ImageFile.new(:file => File.open(@url))
+    -@image_file.album_id = @album.id
+    =debug @image_file.save
+    -@article.image_file_id = @image_file.id
+    -@article.save
+ 
+
+
+-@blocks.each do |block|
+  -if block["block_name_id"] == "1"
+    -lang_page = @lang_pages[block["lang_page_id"].to_i]
+    -page = @pages[lang_page["page_id"].to_i]
+
+
+
+    -if page and lang_page
+  
+      -@menu_item= MenuItem.new(:id => page["id"].to_i,:position => page["position"].to_i,:enabled => true, :visible => true,:menu_id => 1,:archive_id => page["archive_id"], :archived_at => (page["archived_at"]  != "0000-00-00 00:00:00" ? page["archived_at"] : "2010-01-01 00:00:00"), :updated_at => page["updated_at"], :created_at => page["created_at"], :menu_content_type => "Page",:name => lang_page["menu_title"], :slug => lang_page["slug"], :parent_id => (page["parent_id"] != "NULL" ? page["parent_id"].to_i : nil), :archived => (page["archived"] != "NULL" ? true : nil))
+  
+  
+  
+  
+      -content = Page.new(:title => HTMLEntities.new.decode(lang_page["title"]), :description => HTMLEntities.new.decode(lang_page["description"]), :keywords => HTMLEntities.new.decode(lang_page["keywords"]))
+  
+  
+  
+      -@menu_item.menu_content = content
+
+      -if @menu_item.save!
+        -content = ""
+        -begin
+      
+          =@menu_item.menu_content.blocks[0].portlets << Portlet.new(:content => TextContent.new(:content => HTMLEntities.new.decode(block["content"])))
+        -rescue
+          %h1 
+            ALERT
+  
+  
+  
+
+    =debug block
+
+    =debug lang_page
+    =debug page
+-MenuItem.all.each do |mi|
+
+  -if mi.created_at.year < 1980
+    -mi.created_at = "2010-08-01"
+    -mi.save 
+  -mi.set_permalink
diff --git a/app/views/admin/menu_items/index.html.haml b/app/views/admin/menu_items/index.html.haml
new file mode 100644
index 0000000..f02531a
--- /dev/null
+++ b/app/views/admin/menu_items/index.html.haml
@@ -0,0 +1,9 @@
+%h1="Liste des éléments du #{@menu.name}"
+
+
+=render :partial => "index_block"
+
+
+
+
+  
\ No newline at end of file
diff --git a/app/views/admin/menu_items/index.js.erb b/app/views/admin/menu_items/index.js.erb
new file mode 100644
index 0000000..12f9681
--- /dev/null
+++ b/app/views/admin/menu_items/index.js.erb
@@ -0,0 +1,13 @@
+
+
+if($('#menu_item_index').length > 0){
+  $('#menu_item_index').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+}
+else{
+
+  
+  $('body').html("<%= escape_javascript(render(:template => 'admin/menu_items/index.html.haml')) %>");
+
+}
+
diff --git a/app/views/admin/menu_items/new.html.haml b/app/views/admin/menu_items/new.html.haml
new file mode 100644
index 0000000..2f7ae3b
--- /dev/null
+++ b/app/views/admin/menu_items/new.html.haml
@@ -0,0 +1,4 @@
+.header
+  %h1 Ajouter un élément de menu
+
+=render "new_form"
diff --git a/app/views/admin/menu_items/new.js.erb b/app/views/admin/menu_items/new.js.erb
new file mode 100644
index 0000000..19df7fa
--- /dev/null
+++ b/app/views/admin/menu_items/new.js.erb
@@ -0,0 +1,3 @@
+
+
+show_pane_hover("<%= escape_javascript(render(:partial => "new_form"))%>",700,900);
\ No newline at end of file
diff --git a/app/views/admin/menu_items/reorder.js.erb b/app/views/admin/menu_items/reorder.js.erb
new file mode 100644
index 0000000..14070c8
--- /dev/null
+++ b/app/views/admin/menu_items/reorder.js.erb
@@ -0,0 +1,4 @@
+$('#menu_item_index').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+
+<%= flash_js %>
diff --git a/app/views/admin/menu_items/show.js.erb b/app/views/admin/menu_items/show.js.erb
new file mode 100644
index 0000000..c144717
--- /dev/null
+++ b/app/views/admin/menu_items/show.js.erb
@@ -0,0 +1,11 @@
+
+$('#menu_item_row_<%= @menu_item.id %>').replaceWith("<%= escape_javascript(render(@menu_item))%>");
+$('#menu_item_show').replaceWith("<%= escape_javascript(render(:partial => "show"))%>");
+
+
+
+<%= flash_js %>
+
+
+
+
diff --git a/app/views/admin/menu_items/update.js.erb b/app/views/admin/menu_items/update.js.erb
new file mode 100644
index 0000000..14070c8
--- /dev/null
+++ b/app/views/admin/menu_items/update.js.erb
@@ -0,0 +1,4 @@
+$('#menu_item_index').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+
+<%= flash_js %>
diff --git a/app/views/admin/menu_items/update_reorder_failled.js.erb b/app/views/admin/menu_items/update_reorder_failled.js.erb
new file mode 100644
index 0000000..0864a7a
--- /dev/null
+++ b/app/views/admin/menu_items/update_reorder_failled.js.erb
@@ -0,0 +1,7 @@
+$('#menu_item_index').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
+
+
+<%= flash_js %>
+
+
+
diff --git a/app/views/admin/menu_urls/_form.html.haml b/app/views/admin/menu_urls/_form.html.haml
new file mode 100644
index 0000000..3452bde
--- /dev/null
+++ b/app/views/admin/menu_urls/_form.html.haml
@@ -0,0 +1,5 @@
+
+=form.semantic_fields_for :menu_content do |content| 
+  - content.inputs do 
+    = content.input :url, :as => :string, :label => "Url :"
+    
\ No newline at end of file
diff --git a/app/views/admin/menu_urls/_menu_url.html.haml b/app/views/admin/menu_urls/_menu_url.html.haml
new file mode 100644
index 0000000..ec073ea
--- /dev/null
+++ b/app/views/admin/menu_urls/_menu_url.html.haml
@@ -0,0 +1,4 @@
+%table
+  %tr
+    %td{:style => "width:150px;"} Url :
+    %td=menu_url.url
diff --git a/app/views/admin/menu_urls/edit.html.haml b/app/views/admin/menu_urls/edit.html.haml
new file mode 100644
index 0000000..e69de29
diff --git a/app/views/admin/menus/_form.html.haml b/app/views/admin/menus/_form.html.haml
new file mode 100644
index 0000000..8e95468
--- /dev/null
+++ b/app/views/admin/menus/_form.html.haml
@@ -0,0 +1,8 @@
+- semantic_form_for [:admin,@menu] do |form| 
+  - form.inputs do 
+    = form.input :name, :label => "Nom :" 
+    = form.input :max_levels, :label => "Nombre de niveau max :" 
+  
+
+  - form.buttons do 
+    = form.commit_button "Sauvegarder"
diff --git a/app/views/admin/menus/_index_block.html.haml b/app/views/admin/menus/_index_block.html.haml
new file mode 100644
index 0000000..041c948
--- /dev/null
+++ b/app/views/admin/menus/_index_block.html.haml
@@ -0,0 +1,43 @@
+#menu_index_block.index_block{:data_add_url => url_for({}.merge!(params).merge!({"format" => "js", "page" => 1, "order" => "created_at", "a_d" => "DESC"})), :data_current_url => url_for({}.merge!(params).merge!({:format => "js"}))}
+
+  
+
+  %table
+    -if @menus.num_pages > 1
+      %tr.pagination
+        %td.per_page_cel
+          =per_page_links(params[:per_page], @menus.num_pages)
+        %td.paginate_cel{:colspan => 4}
+          = paginate(@menus, :remote => true)
+    
+  %table.normal_table
+    %thead#menu_rows_header.rows_header
+      
+      %tr
+        %td
+          =link_to_sort_results("Date de création", "created_at")
+        %td
+          =link_to_sort_results("Nom", "name")
+    
+        
+        %td.right{:style => "width:70px"}
+    
+      
+        
+        
+    %tbody#Admin_rows.rows
+      
+      =render @menus
+      
+      
+  %table
+    %tr.pagination
+      %td.per_page_cel
+        
+      %td.paginate_cel{:colspan => 4}
+        = paginate(@menus, :remote => true)
+
+  
+
+
+
diff --git a/app/views/admin/menus/_menu.html.haml b/app/views/admin/menus/_menu.html.haml
new file mode 100644
index 0000000..d90fe4c
--- /dev/null
+++ b/app/views/admin/menus/_menu.html.haml
@@ -0,0 +1,9 @@
+%tr#menu_row.admin_row.row{:id => menu.id, :class => (cycle("row_1", "row_2", :name => "menus"))}
+  %td=l menu.created_at
+  %td=menu.name
+
+
+  %td.actions
+    = link_to image_tag("/quartz_admin/icons/round_delete.png"), [:admin, menu], :confirm => 'Voulez-vous vraiment supprimer ce menu ?', :method => :delete
+    
+    = link_to image_tag("/quartz_admin/icons/round_edit.png"), edit_admin_menu_path(menu)
diff --git a/app/views/admin/menus/edit.html.haml b/app/views/admin/menus/edit.html.haml
new file mode 100644
index 0000000..b3a1fb1
--- /dev/null
+++ b/app/views/admin/menus/edit.html.haml
@@ -0,0 +1,4 @@
+.grid_12
+  %h1 Modifier un menu
+
+  =render "form"
diff --git a/app/views/admin/menus/index.html.haml b/app/views/admin/menus/index.html.haml
new file mode 100644
index 0000000..9ecad8e
--- /dev/null
+++ b/app/views/admin/menus/index.html.haml
@@ -0,0 +1,5 @@
+.grid_12
+  %h1 Gestion des menus
+  =link_to "Ajouter un menu", new_admin_menu_path
+
+  =render :partial => "index_block"
\ No newline at end of file
diff --git a/app/views/admin/menus/index.js.erb b/app/views/admin/menus/index.js.erb
new file mode 100644
index 0000000..696ccd6
--- /dev/null
+++ b/app/views/admin/menus/index.js.erb
@@ -0,0 +1,2 @@
+
+$('#menu_index_block').replaceWith("<%= escape_javascript(render(:partial => "index_block")) %>");
\ No newline at end of file
diff --git a/app/views/admin/menus/new.html.haml b/app/views/admin/menus/new.html.haml
new file mode 100644
index 0000000..e988e54
--- /dev/null
+++ b/app/views/admin/menus/new.html.haml
@@ -0,0 +1,4 @@
+.grid_12
+  %h1 Ajouter un menu
+
+  =render "form"
diff --git a/app/views/admin/menus/show.html.haml b/app/views/admin/menus/show.html.haml
new file mode 100644
index 0000000..a9e8c01
--- /dev/null
+++ b/app/views/admin/menus/show.html.haml
@@ -0,0 +1,2 @@
+%h1 Admin::Menus#show
+%p Find me in app/views/admin/menus/show.html.haml
\ No newline at end of file
diff --git a/app/views/admin/pages/_form.html.haml b/app/views/admin/pages/_form.html.haml
new file mode 100644
index 0000000..94683e4
--- /dev/null
+++ b/app/views/admin/pages/_form.html.haml
@@ -0,0 +1,6 @@
+
+=form.semantic_fields_for :menu_content do |content| 
+  = content.inputs do 
+    = content.input :title, :as => :string, :label => "Titre :"
+    = content.input :keywords, :as => :string, :label => "Mots clefs :"
+    = content.input :description, :as => :string, :label => "Description :"
diff --git a/app/views/admin/pages/_page.html.haml b/app/views/admin/pages/_page.html.haml
new file mode 100644
index 0000000..3534023
--- /dev/null
+++ b/app/views/admin/pages/_page.html.haml
@@ -0,0 +1,78 @@
+#toolbar-text
+
+#menu_item_block_edit{:style => "margin-right:330px;margin-top:45px;"}
+ 
+  =render :partial => "admin/blocks/block", :locals => {:block => page.blocks[0], :sortable => true} 
+  
+  
+%br
+%br
+%br
+%br
+%br
+%br
+%br
+%br
+%br
+%br
+%br
+#menu_item_inspector_container
+  
+  
+  
+  
+  
+  
+  
+  #menu_item_informations
+    %h4
+      Infos sur la page
+    
+    
+    .panel#collapseOne{:style => "display:none;"}
+      =render :partial => "edit_form"    
+        
+    %h4 éléments
+    
+    .panel#collapse2
+      .block_portlets_sortable#content_types
+        -page.blocks[0].alloweds_types.each do |slug, name|
+ 
+          .content_type{:id => slug, :"data-type" => slug}
+            =#i slug.to_s.constantize.picto
+            =image_tag("admin/content_type/type_"+slug.to_s+".png", :alt => name, :title => name, :class => "handle")
+      
+
+    #collapse3{:style => "display:none;"}
+      %h4 Modifier l'élément
+    
+    
+      .panel
+        #element_form
+    
+        %div#element_form_action
+          %a.move.btn.btn-default.portlet_handle{:href => "#", :data => {:portlet_id => nil}}
+            %span.move_message
+              =ic :arrows
+              &nbsp;
+              déplacer
+            %span.cancel_message
+              =ic :ban
+              &nbsp;
+              annuler
+          
+          =link_to ic(:"trash-o"), "#", :method => :delete, :data => { :confirm => "Etes-vous sûr ?"}, :remote => true, :class => "btn btn-danger trash"
+        
+          %button.save.btn.btn-primary
+            =ic(:"floppy-o")
+            &nbsp;
+            Sauvegarder
+        
+
+
+
+
+  
+
+  
+
diff --git a/app/views/admin/pages/edit.html.haml b/app/views/admin/pages/edit.html.haml
new file mode 100644
index 0000000..e69de29
diff --git a/app/views/admin/pages/update.html.haml b/app/views/admin/pages/update.html.haml
new file mode 100644
index 0000000..88939f4
--- /dev/null
+++ b/app/views/admin/pages/update.html.haml
@@ -0,0 +1,2 @@
+%h1 Admin::Pages#update
+%p Find me in app/views/admin/pages/update.html.haml
\ No newline at end of file
diff --git a/app/views/admin/password_resets/edit.html.haml b/app/views/admin/password_resets/edit.html.haml
new file mode 100644
index 0000000..6ead844
--- /dev/null
+++ b/app/views/admin/password_resets/edit.html.haml
@@ -0,0 +1,6 @@
+= semantic_form_for @admin, :url => admin_password_reset_path(params[:id]) do |f|
+  =f.inputs do 
+    = f.input :password, :placeholder => "Nouveau mot de passe", :label => false
+    = f.input :password_confirmation, :placeholder => "Confirmation", :label => false
+  
+  = f.submit "Mettre à jour le mot de passe", :class => "btn btn-large btn-primary"
\ No newline at end of file
diff --git a/app/views/admin/password_resets/new.html.haml b/app/views/admin/password_resets/new.html.haml
new file mode 100644
index 0000000..3e3e6d0
--- /dev/null
+++ b/app/views/admin/password_resets/new.html.haml
@@ -0,0 +1,6 @@
+= form_tag admin_password_resets_path, :method => :post do
+  %p
+
+    = text_field_tag :login, params[:login], :placeholder => "email ou login"
+    
+  = submit_tag "Envoyer" , :class => "btn btn-large btn-primary"
diff --git a/app/views/admin/passwords/edit.html.haml b/app/views/admin/passwords/edit.html.haml
new file mode 100644
index 0000000..c6ca425
--- /dev/null
+++ b/app/views/admin/passwords/edit.html.haml
@@ -0,0 +1,16 @@
+-content_for :title do
+  %h1 Changer mon mot de passe.
+= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
+  
+  = f.hidden_field :reset_password_token
+  %p
+    = f.label :password, "Nouveau mot de passe :"
+    %br/
+    = f.password_field :password
+  %p
+    = f.label :password_confirmation, "Confirmation :"
+    %br/
+    = f.password_field :password_confirmation
+  %p
+    %button{:type => "submit"} Changer mon mot de passe
+%p= link_to "Se connecter", new_session_path(resource_name)
diff --git a/app/views/admin/passwords/new.html.haml b/app/views/admin/passwords/new.html.haml
new file mode 100644
index 0000000..32ad37a
--- /dev/null
+++ b/app/views/admin/passwords/new.html.haml
@@ -0,0 +1,11 @@
+-content_for :title do
+  %h1 Mot de passe perdu ?
+= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f|
+
+  %p
+    = f.label :email, "Email :"
+    %br/
+    = f.text_field :email
+  %button{:type => "submot"} Recevoir les instructions pour changer de mot de passe.
+
+%p= link_to "Se connecter", new_session_path(resource_name)
diff --git a/app/views/admin/tiny_urls/index.html.haml b/app/views/admin/tiny_urls/index.html.haml
index 930cd98..5bb8e03 100644
--- a/app/views/admin/tiny_urls/index.html.haml
+++ b/app/views/admin/tiny_urls/index.html.haml
@@ -1,4 +1,4 @@
-.right= link_to i(:plus, :icon => false)+' Ajouter une url courte', new_admin_tiny_url_path, :class => "btn btn-primary"
+.right= link_to ic(:plus)+' Ajouter une url courte', new_admin_tiny_url_path, :class => "btn btn-primary"
 %h1 Liste des urls courtes
 
 %table.stat_table.table.table-striped.table-hover
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index e3c6c3d..23b1b96 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -40,46 +40,39 @@
               %b.caret
             %ul.dropdown-menu
               %li=link_to "liste des adhérents", admin_sheets_path
+              
               %li=link_to "gestion groupes d'adhérents", admin_newsgroups_path
-              %li=link_to i(:envelope, :icon => false)+" gestion newsletters", admin_newsletters_path
+              %li.divider
+              %li=link_to ic(:envelope)+" gestion newsletters", admin_newsletters_path
               
               %li.divider
               %li=link_to "Sondages", admin_survey_types_path
               %li=link_to "Petitions", admin_petitions_path
-              
           
-          
-          
-          %li=link_to "notes", admin_topics_path
-          %li=link_to "urls courtes", admin_tiny_urls_path
-          
-        
-          %li
-            -#Menu.all.each do |menu|
-            =# link_to "Pages", admin_menu_items_path(:menu_id => menu.id)
-        
-          
-           
           %li.dropdown
             %a{:href => "#", :class => "dropdown-toggle", :data => {:toggle => "dropdown"}}
-              Blog
+              Site
               %b.caret
             %ul.dropdown-menu
-              %li= link_to "Articles", admin_articles_path
-            
+              %li
+                -Menu.all.each do |menu|
+                  = link_to "Pages", admin_menu_items_path(:menu_id => menu.id)
               %li.divider
+              %li= link_to "Articles", admin_articles_path
+              %li= link_to "Evénements", admin_events_path
+              %li.divider
+              %li= link_to "Images", admin_image_files_path
+              %li= link_to "Fichiers", admin_data_files_path
+         
+          %li.dropdown
+            %a{:href => "#", :class => "dropdown-toggle", :data => {:toggle => "dropdown"}}
+              Outils
+              %b.caret
+            %ul.dropdown-menu
+              %li=link_to "notes", admin_topics_path
+              %li=link_to "urls courtes", admin_tiny_urls_path
+    
             
-              %li= link_to "Catégories", admin_categories_path
-              %li= link_to "Commentaires", admin_comments_path
-          
-          
-          %li= link_to "Evénements", admin_events_path
-          
-          %li= link_to "Images", admin_image_files_path
-          %li= link_to "Fichiers", admin_data_files_path
-         
-       
-         
         
         %ul.nav.navbar-nav.navbar-right
           %li.dropdown
diff --git a/app/views/layouts/forum.haml b/app/views/layouts/forum.haml
index 9277780..a1334fb 100644
--- a/app/views/layouts/forum.haml
+++ b/app/views/layouts/forum.haml
@@ -24,7 +24,7 @@
           %span.icon-bar
           %span.icon-bar
           %span.icon-bar
-        %a.navbar-brand{href: "/admin"} 
+        %a.navbar-brand{href: "/forum"} 
           =ic(:home, :icon => false)
           Forum du Pic Vert
       
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
new file mode 100644
index 0000000..d2ee824
--- /dev/null
+++ b/app/views/layouts/public.html.haml
@@ -0,0 +1,126 @@
+!!!
+
+%html{:lang => "fr", "xml:lang" => "fr", :xmlns => "http://www.w3.org/1999/xhtml"}
+  %head
+    %title=@title.to_s+" "
+    
+    
+    %meta{ :"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8" }
+    %meta{ :"name" => "Description", :content => @description }
+    %meta{ :"name" => "Keywords", :content => @keywords }  
+    
+
+    = javascript_include_tag "public"
+    
+    = csrf_meta_tag 
+    
+    = stylesheet_link_tag 'public' 
+    = stylesheet_link_tag '/fonts/Stylograph/stylesheet.css' 
+    <script src="//use.typekit.net/twa3qoy.js"></script>
+    <script>try{Typekit.load();}catch(e){}</script>
+    
+    =javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false&region=FR"
+    
+  %body
+
+  
+    -if flash[:error] or flash[:notice] or flash[:alert] 
+      .flash
+      
+        =flash[:error]
+        =flash[:notice]
+        =flash[:alert]
+    
+    
+      
+
+          
+    -if !(@menu_item and @menu_item.slug and @menu_item.slug == "index" )
+      %p{:style => "height:80px;"}
+      
+    
+    #slider_content
+      .top
+
+        =link_to image_tag("/logo_pic_vert.png", :id => "logo"), "/"
+  
+        #menu
+ 
+          -MenuItem.where(:parent_id => nil, :enabled => true, :visible => true).order(:position).each do |menu_item|
+            -description = ""
+            -description = menu_item.menu_content.description if menu_item.menu_content and menu_item.menu_content_type == "Page"
+            =link_to sanitize("#{menu_item.name}"),menu_item_path(:url => menu_item.url), :class => menu_item.slug.to_s+"_menu"+(" active" if @menu_item and (@menu_item == menu_item or @menu_item.ancestors.include?(menu_item))).to_s
+    
+      -if @menu_item and @menu_item.slug and @menu_item.slug == "index" 
+        =#{:style => "display:none"}
+        <ul class="bxslider" data-ratio="2.2">
+        <li><img src="http://photographie-hors-piste.com/slide/1.jpg" title="" /></li>
+        <li><img src="http://photographie-hors-piste.com/slide/2.jpg" title="" /></li>
+        <li><img src="http://photographie-hors-piste.com/slide/3.jpg" title="" /></li>
+    
+        </ul>
+    
+    #main
+      #corps{:class => (@menu_item.slug if @menu_item)}
+        
+        
+        -if @menu_item and @menu_item.slug and @menu_item.slug == "index" 
+          .main_section_title
+            =link_to "Actualités +", "/blog.html"
+          
+          -article = Article.before(Date.today).recents.first
+            
+          -if article
+            .first_article
+              .image=image_tag article.image_file.file.large.medium.url if article.image_file
+              
+              .description
+                %h1=article.title
+                =simple_format article.description
+              .clear
+          
+          -articles = Article.before(Date.today).recents.offset(1).limit(6)
+            
+          -if articles
+            .articles
+              -articles.each do |article|
+                .article
+                  .image=image_tag article.image_file.file.large.medium.url if article.image_file
+              
+                
+                  .description
+                    %h2=article.title
+                  
+              .clear
+          
+          
+          
+          =render Article.before(Date.today).recents.first
+          =link_to "tout les articles >", "/blog.html", :class => "articles_button"
+          
+        =yield
+      
+      #sidebar
+        -if @menu_item and @menu_item.slug and @menu_item.slug == "index" 
+          .main_section_title
+            Prochainement +
+          
+        
+        =#render Event.recents.limit(2)
+        dsfdfs
+        =yield :sidebar
+      
+      .clear
+       
+      
+    .bottom
+
+      =link_to image_tag("/nb.png"), "http://nicolasbally.com", :target => "_blank"
+  
+
+    
+
+    
+    
+  
+
diff --git a/app/views/portlet/block_contents/_block_content.html.haml b/app/views/portlet/block_contents/_block_content.html.haml
new file mode 100644
index 0000000..773d51f
--- /dev/null
+++ b/app/views/portlet/block_contents/_block_content.html.haml
@@ -0,0 +1,20 @@
+-style=""
+-if block_content.style== 2
+  -style += "background:#d8d8d8;"
+-if block_content.nbr_columns == 1
+  -block_content.blocks.each do |block|
+
+    .container_12{:style => "padding:0px;"+style.to_s}
+      .grid_12
+        =render :partial => "admin/blocks/block", :locals => {:block => block}
+      .clear
+-else
+  .container_12{:style => "padding:0px;"+style.to_s}
+    -i = 0
+    -block_content.blocks.each do |block|
+      -i+=1
+      .grid_6.col{:class => ("col_"+i.to_s)}
+
+        =render :partial => "admin/blocks/block", :locals => {:block => block}
+  
+    .clear
\ No newline at end of file
diff --git a/app/views/portlet/block_contents/_form.html.haml b/app/views/portlet/block_contents/_form.html.haml
new file mode 100644
index 0000000..bff1406
--- /dev/null
+++ b/app/views/portlet/block_contents/_form.html.haml
@@ -0,0 +1,84 @@
+
+=semantic_form_for( [:portlet, @block_content], :remote => true) do |f|
+  -if !@block_content.id
+    %table
+      %tr
+        %td Nombre de colonnes :
+        %td
+      
+          %p
+            =f.radio_button :nbr_columns, 1
+            Une colonne
+          %p
+            =f.radio_button :nbr_columns, 2
+            Deux colonnes
+            
+          %p
+            =f.radio_button :nbr_columns, 3
+            Trois colonnes
+            
+          %p
+            =f.radio_button :nbr_columns, 4
+            Quatre colonnes
+  
+  -else
+    
+    
+    #column_sliders{:style => "height:22px;"}
+      -for i in 1..(@block_content.nbr_columns.to_i-1)
+    
+        .column_slider{:"data-slider-value"=>eval("@block_content.row#{i}_value.to_i"), :style => "width:100%;"}
+      
+
+  
+    :javascript
+      function compareNumbers(a, b)
+      {
+          return a - b;
+      }
+
+      $(".column_slider").slider({
+        max: 12,
+        min: 0,
+        step:1
+      }).on("slide", function(ev) 
+      {      
+        var return_array = new Array();
+      
+        $("#column_sliders .column_slider").each(function(){      
+          return_array.push($(this).data('slider').getValue());
+        
+        });
+      
+        var cols_values = [];
+        prev_value= 0;
+        $.each(return_array.sort(compareNumbers), function(index, value) {
+          cols_values.push(value-prev_value);
+        
+        
+          prev_value = value;
+        
+        });
+      
+        cols_values.push(12-prev_value);
+      
+        $.each(cols_values, function(index, value) {
+        
+          $("#row"+(index+1)).val(value);
+        
+        
+        });
+      
+      
+        
+      });
+  
+  =f.hidden_field :row1, :id => "row1"
+  =f.hidden_field :row2, :id => "row2"
+  =f.hidden_field :row3, :id => "row3"
+  =f.hidden_field :row4, :id => "row4"
+  
+  -if BlockContent::STYLES.size > 0
+    Style :
+    = f.select :style, BlockContent::STYLES
+  
diff --git a/app/views/portlet/break_contents/_break_content.html.haml b/app/views/portlet/break_contents/_break_content.html.haml
new file mode 100644
index 0000000..a287381
--- /dev/null
+++ b/app/views/portlet/break_contents/_break_content.html.haml
@@ -0,0 +1 @@
+%hr
\ No newline at end of file
diff --git a/app/views/portlet/break_contents/_form.html.haml b/app/views/portlet/break_contents/_form.html.haml
new file mode 100644
index 0000000..cd5b099
--- /dev/null
+++ b/app/views/portlet/break_contents/_form.html.haml
@@ -0,0 +1,11 @@
+=semantic_form_for( [:portlet, @break_content], :remote => true) do |f|
+  %table.form_table
+    %tr
+      %td Trait ?
+      %td=f.check_box :line
+    
+    -if BreakContent::STYLES.size > 0
+      %tr
+        %td Style :
+        %td= f.select :style, BreakContent::STYLES
+  
\ No newline at end of file
diff --git a/app/views/portlet/download_contents/_download_content.html.haml b/app/views/portlet/download_contents/_download_content.html.haml
new file mode 100644
index 0000000..edbf904
--- /dev/null
+++ b/app/views/portlet/download_contents/_download_content.html.haml
@@ -0,0 +1,8 @@
+
+%p 
+  Titre :
+  =download_content.title
+  
+%p
+  Téléchargement : 
+  =download_content.data_file.abstract_file_name if download_content.data_file
diff --git a/app/views/portlet/download_contents/_form.html.haml b/app/views/portlet/download_contents/_form.html.haml
new file mode 100644
index 0000000..921a049
--- /dev/null
+++ b/app/views/portlet/download_contents/_form.html.haml
@@ -0,0 +1,31 @@
+=semantic_form_for( [:portlet, @download_content], :remote => true) do |f|
+
+  
+  
+  %table.form_table
+
+    %tr
+      %td Titre :
+      %td=f.text_field :title
+    
+    %tr
+      %td
+        -r = rand(1000000000000000000000000000)  
+        Fichier :
+      %td
+        #name{:id => r}
+          =f.object.data_file.abstract_file_name if f.object.data_file
+        =f.hidden_field :data_file_id, :id => "input_"+r.to_s
+
+        =link_to "Modifier ce fichier", "#", :onclick => "select_file_from_manager('"+r.to_s+"');return false;"
+        
+    
+
+    -if DownloadContent::STYLES.size >0
+      %tr
+        %td Style :
+        %td= f.select :style, DownloadContent::STYLES
+
+
+
+ 
\ No newline at end of file
diff --git a/app/views/portlet/dynamic_contents/_dynamic_content.html.haml b/app/views/portlet/dynamic_contents/_dynamic_content.html.haml
new file mode 100644
index 0000000..aa8aa31
--- /dev/null
+++ b/app/views/portlet/dynamic_contents/_dynamic_content.html.haml
@@ -0,0 +1 @@
+=DynamicContent::NAMES[dynamic_content.name] if dynamic_content.name
\ No newline at end of file
diff --git a/app/views/portlet/dynamic_contents/_form.html.haml b/app/views/portlet/dynamic_contents/_form.html.haml
new file mode 100644
index 0000000..8e91f3d
--- /dev/null
+++ b/app/views/portlet/dynamic_contents/_form.html.haml
@@ -0,0 +1,11 @@
+=semantic_form_for( [:portlet, @dynamic_content], :remote => true) do |f|
+
+
+  %table.form_table
+
+    %tr
+
+      %td= f.select :name, DynamicContent::NAMES.map {|u| [u[1], u[0]] }
+
+
+
diff --git a/app/views/portlet/gallery_contents/_form.html.haml b/app/views/portlet/gallery_contents/_form.html.haml
new file mode 100644
index 0000000..149cd36
--- /dev/null
+++ b/app/views/portlet/gallery_contents/_form.html.haml
@@ -0,0 +1,10 @@
+= semantic_form_for [:portlet, @gallery_content], :remote => true do |form| 
+  %p
+    =link_to "Ajouter des images", "#", :onclick => "select_gallery_images_from_manager('#{form.object.id.to_s}');return false;", :class => "btn btn-default" if form.object.id
+  -if GalleryContent::STYLES.size > 0
+    Style :
+    = form.select :style, GalleryContent::STYLES  
+  
+  
+
+
diff --git a/app/views/portlet/gallery_contents/_gallery_content.html.haml b/app/views/portlet/gallery_contents/_gallery_content.html.haml
new file mode 100644
index 0000000..a874d75
--- /dev/null
+++ b/app/views/portlet/gallery_contents/_gallery_content.html.haml
@@ -0,0 +1,18 @@
+%h2=gallery_content.name
+.description
+  =raw gallery_content.description
+  
+%p{:style => "text-align:center;"}=link_to "Ajouter des images", "#", :onclick => "select_gallery_images_from_manager('"+gallery_content.id.to_s+"');return false;", :class => "btn"
+
+.gallery_images  
+  =render :collection => gallery_content.gallery_images, :partial => "portlet/gallery_images/gallery_image"
+  %p{:style => "clear:both;"}
+  
+:javascript
+  $('.gallery_images').sortable({
+    itemSelector:".gallery_image",
+    nested:true
+  });
+  
+
+  
\ No newline at end of file
diff --git a/app/views/portlet/gallery_images/_form.html.haml b/app/views/portlet/gallery_images/_form.html.haml
new file mode 100644
index 0000000..dd6bbd9
--- /dev/null
+++ b/app/views/portlet/gallery_images/_form.html.haml
@@ -0,0 +1,19 @@
+= semantic_form_for [:portlet, @gallery_image], :remote => true do |form| 
+  .content
+
+    %h3 Modifier les infos
+
+    = form.inputs do 
+      = form.input :title, :label => "Titre :" 
+      = form.input :tags, :label => "Tags :" 
+      = form.input :description, :label => "Description :", :as => :text, :input_html => {:class => "text_editor"}
+
+
+
+  
+  .actions
+    =form.submit "Sauvegarder", :class => "btn btn-primary"
+  
+  
+
+
diff --git a/app/views/portlet/gallery_images/_gallery_image.html.haml b/app/views/portlet/gallery_images/_gallery_image.html.haml
new file mode 100644
index 0000000..a1a660e
--- /dev/null
+++ b/app/views/portlet/gallery_images/_gallery_image.html.haml
@@ -0,0 +1,9 @@
+-if gallery_image.image_file
+  .gallery_image.image_square#gallery_image{:id => gallery_image.id, :data => { :title => gallery_image.title , :description => gallery_image.description, :id =>  gallery_image.id} }
+    .img{:style => "background-image : url('#{gallery_image.image_file.file.large.medium.small.thumb.url}');"} 
+    
+    .actions
+      =link_to i(:"trash-o"), [:portlet, gallery_image], :confirm => 'Voulez-vous vraiment supprimer cette image ?', :method => :delete, :remote => true
+      =link_to i(:pencil), edit_portlet_gallery_image_path(gallery_image), :remote => true
+    
+    
\ No newline at end of file
diff --git a/app/views/portlet/gallery_images/create.js.erb b/app/views/portlet/gallery_images/create.js.erb
new file mode 100644
index 0000000..8b50597
--- /dev/null
+++ b/app/views/portlet/gallery_images/create.js.erb
@@ -0,0 +1 @@
+$('#portlet_<%= @gallery_content.portlet.id %> .gallery_images').prepend("<%= escape_javascript(render(@gallery_images)) %>");
\ No newline at end of file
diff --git a/app/views/portlet/gallery_images/destroy.js.erb b/app/views/portlet/gallery_images/destroy.js.erb
new file mode 100644
index 0000000..c4e8f8a
--- /dev/null
+++ b/app/views/portlet/gallery_images/destroy.js.erb
@@ -0,0 +1,4 @@
+
+$("#gallery_image_<%= @gallery_image.id.to_s %>").fadeOut(500).delay(6000).remove();
+
+<%= flash_js %>
\ No newline at end of file
diff --git a/app/views/portlet/gallery_images/edit.js.erb b/app/views/portlet/gallery_images/edit.js.erb
new file mode 100644
index 0000000..3d94bc2
--- /dev/null
+++ b/app/views/portlet/gallery_images/edit.js.erb
@@ -0,0 +1 @@
+show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>");
\ No newline at end of file
diff --git a/app/views/portlet/gallery_images/reorder.js.erb b/app/views/portlet/gallery_images/reorder.js.erb
new file mode 100644
index 0000000..e69de29
diff --git a/app/views/portlet/gallery_images/update.js.erb b/app/views/portlet/gallery_images/update.js.erb
new file mode 100644
index 0000000..7f4b7c8
--- /dev/null
+++ b/app/views/portlet/gallery_images/update.js.erb
@@ -0,0 +1,5 @@
+close_pane_hover();
+$('#gallery_image_<%= @gallery_image.id %>').effect("highlight", 1000);
+
+
+<%= flash_js %>
\ No newline at end of file
diff --git a/app/views/portlet/html_contents/_form.html.haml b/app/views/portlet/html_contents/_form.html.haml
new file mode 100644
index 0000000..5b68841
--- /dev/null
+++ b/app/views/portlet/html_contents/_form.html.haml
@@ -0,0 +1,53 @@
+.html_content_form
+  
+  =semantic_form_for( [:portlet, @html_content], :remote => true) do |f|
+
+
+    =f.text_area :content, :style => "width:98%;height:400px;", :class => "inputText", :id => "ace_editor_textarea"
+
+    %pre#ace_editor_pre{:style => "margin:0px;"}
+    =raw "<!---"
+    <script>
+    var editor;
+
+    editor = ace.edit("ace_editor_pre");
+    editor.setTheme("ace/theme/textmate");
+    editor.getSession().setMode("ace/mode/html");
+    editor.setPrintMarginColumn(0);
+    editor.session.setUseWrapMode(true);
+
+    var textarea = $('#ace_editor_textarea').hide();
+    editor.getSession().setValue(textarea.val());
+  
+    editor.getSession().on('change', function(){
+
+    textarea.val(editor.getSession().getValue());
+
+  
+    });
+  
+
+
+    </script>
+  
+    =raw "---->"
+    %table.form_table
+      %tr
+        %td Style :
+        %td= f.select :content_type, HtmlContent::CONTENT_TYPES
+    
+  
+  
+    .action
+      %button{:onclick => "$(this).closest('.html_content_form').toggleClass('large');editor.resize() ;return false;"} zoom
+    
+
+
+    -if HtmlContent::STYLES.size > 0
+      %table.form_table
+        %tr
+          %td Style :
+          %td= f.select :style, HtmlContent::STYLES
+  
+      
+    
diff --git a/app/views/portlet/html_contents/_html_content.html.haml b/app/views/portlet/html_contents/_html_content.html.haml
new file mode 100644
index 0000000..220947b
--- /dev/null
+++ b/app/views/portlet/html_contents/_html_content.html.haml
@@ -0,0 +1,11 @@
+-begin
+  =render :inline => html_content.content, :type => html_content.content_type
+-rescue Exception=>e
+  -if html_content.content_type == "haml"
+    %h3= e.message
+    %p
+      à la ligne 
+      = e.original_exception.line
+
+  -else
+    %h3= e.message
diff --git a/app/views/portlet/image_contents/_form.html.haml b/app/views/portlet/image_contents/_form.html.haml
new file mode 100644
index 0000000..4ac7c09
--- /dev/null
+++ b/app/views/portlet/image_contents/_form.html.haml
@@ -0,0 +1,29 @@
+
+    
+= semantic_form_for [:portlet, @image_content], :remote => true do |form| 
+
+  = form.inputs do 
+    = form.input :image_file_id, :label => "Image :" , :as => :qi_image_select
+    
+
+    = form.input :alt, :label => "Texte alternatif :" 
+    
+    = form.input :alignement, :label => "Alignement :", :as => :select, :collection => ImageContent::ALIGNS, :include_blank => false
+    = form.input :style, :label => "Style :", :as => :select, :collection => ImageContent::STYLES, :include_blank => false
+    = form.input :width, :label => "Largeur :" 
+    = form.input :height, :label => "Hauteur :" 
+  
+    
+    = form.input :with_cible, :as => :boolean, :label => "Avec lien ?", :input_html => { :onchange => "if ($('#with_cible').is(':checked')) {  $('#with_cible').closest('form').find('.cible_space').show();$('#with_cible').closest('form').find('.expandable').hide(); }else{ $('#with_cible').closest('form').find('.cible_space').hide();$('#with_cible').closest('form').find('.expandable').show(); }", :id => "with_cible" }, :label_html => {:onchange => ""}
+
+    .expandable{:style => ((!@image_content.cible and !@image_content.with_cible) ? "display:block;" : "display:none;" )}
+      = form.inputs do 
+        = form.input :expandable,:as => :boolean , :label => "L'image peut être agrandie ? :"
+  
+
+    .cible_space{:style => ((!@image_content.cible and !@image_content.with_cible) ? "display:none;" : "display:block;" )}
+      = form.inputs do 
+        = form.input :cible, :label => "Cible :" , :as => :qi_cible_select
+        = form.input :popup, :label => "Ouvrir dans une popup ?", :as => :boolean
+
+
diff --git a/app/views/portlet/image_contents/_image_content.html.haml b/app/views/portlet/image_contents/_image_content.html.haml
new file mode 100644
index 0000000..860311f
--- /dev/null
+++ b/app/views/portlet/image_contents/_image_content.html.haml
@@ -0,0 +1,42 @@
+
+-if image_content.image_file
+
+  -if image_content.style== "1"
+    -url =image_content.image_file.file.large.medium.url
+
+  -elsif image_content.style== "2"
+    -url =image_content.image_file.file.large.medium.small.url
+
+  -elsif image_content.style== "3"
+    -url =image_content.image_file.file.square.url
+
+  -elsif image_content.style== "4"
+    -url =image_content.image_file.file.large.medium.small.thumb.url
+  -elsif image_content.style== "5"
+    -url =image_content.image_file.file.large.url
+  
+
+  =image_content.style
+
+-else
+  -url ="admin/default_image.png"
+-style = ""
+-style = "text-align:center;" if image_content.alignement == "center"
+
+
+-style = "text-align:right;" if image_content.alignement == "right"
+  
+
+-style = "text-align:left;" if image_content.alignement == "left"
+
+-styleimg=""
+-styleimg += "width:"+image_content.width.to_s+"px;" if image_content.width?
+-styleimg += "height:"+image_content.height.to_s+"px;" if image_content.height?
+
+
+
+%p.img{:style =>style}
+  =image_tag(url, :alt => image_content.alt.to_s, :style => styleimg)
+  
+
+="L'image peut être agrandie si l'on clique dessus" if image_content.expandable
\ No newline at end of file
diff --git a/app/views/portlet/link_contents/_form.html.haml b/app/views/portlet/link_contents/_form.html.haml
new file mode 100644
index 0000000..fb4f4b3
--- /dev/null
+++ b/app/views/portlet/link_contents/_form.html.haml
@@ -0,0 +1,12 @@
+= semantic_form_for [:portlet, @link_content], :remote => true do |form| 
+  
+  .form1
+    = form.inputs do 
+      = form.input :name, :label => "Texte à afficher :" 
+      =# form.input :title, :label => "Title :" 
+      = form.input :popup,:as => :boolean , :label => "Ouvrir dans une nouvelle fenêtre ?" 
+
+      = form.input :cible, :label => "Cible :" , :as => :qi_cible_select
+      
+      
+ 
\ No newline at end of file
diff --git a/app/views/portlet/link_contents/_link_content.html.haml b/app/views/portlet/link_contents/_link_content.html.haml
new file mode 100644
index 0000000..63f5510
--- /dev/null
+++ b/app/views/portlet/link_contents/_link_content.html.haml
@@ -0,0 +1,10 @@
+
+Texte affiché : 
+%strong=link_content.name.to_s
+%br
+="s'ouvre dans une nouvelle page" if link_content.popup
+
+- if link_content.cible  
+  %strong
+    Liens vers 
+    = link_content.cible.cible_name
\ No newline at end of file
diff --git a/app/views/portlet/map_contents/_form.html.haml b/app/views/portlet/map_contents/_form.html.haml
new file mode 100644
index 0000000..d4bc2ba
--- /dev/null
+++ b/app/views/portlet/map_contents/_form.html.haml
@@ -0,0 +1,22 @@
+=semantic_form_for( [:portlet, @map_content], :remote => true) do |f|
+  
+  %p
+    Adresse :
+    =f.text_field :address, :style => "width:98%;", :class => "inputText"
+
+  %p 
+    Nom du lieu :
+    =f.text_field :name, :style => "width:98%;", :class => "inputText"  
+  
+  %p 
+    Infobule
+    =f.check_box :info_bule
+  
+  %p 
+    Vue
+    = f.select :view, MapContent::VIEWS
+
+  %p
+    Zoom 
+    = f.select :zoom, MapContent::ZOOMS
+  
diff --git a/app/views/portlet/map_contents/_map_content.html.haml b/app/views/portlet/map_contents/_map_content.html.haml
new file mode 100644
index 0000000..111ca18
--- /dev/null
+++ b/app/views/portlet/map_contents/_map_content.html.haml
@@ -0,0 +1,64 @@
+#map_content_map.map_content_map{:id => map_content.id, :style => "width:400px; height:300px;margin:auto;"}
+
+
+
+<script type="text/javascript">
+
+="var address ='#{escape_javascript(map_content.address.to_s)}';"
+
+var geocoder;
+geocoder = new google.maps.Geocoder();
+
+geocoder.geocode( { 'address': address}, function(results, status) {
+if (status == google.maps.GeocoderStatus.OK) {
+
+
+
+
+
+var myLatlng = results[0].geometry.location;
+var myOptions = {
+="zoom:#{escape_javascript(map_content.zoom.to_s)},"
+center: myLatlng,
+
+-if map_content.view == 1
+  mapTypeId: google.maps.MapTypeId.ROADMAP
+-elsif map_content.view == 2
+  mapTypeId: google.maps.MapTypeId.HYBRID
+
+-elsif map_content.view == 3
+  mapTypeId: google.maps.MapTypeId.SATELLITE
+};
+
+="var map = new google.maps.Map(document.getElementById('map_content_map_#{map_content.id}'),"
+myOptions);
+
+
+
+var marker = new google.maps.Marker({
+position: myLatlng, 
+
+map : map,
+
+="title:'=#{escape_javascript(map_content.name)}',"
+
+
+});
+
+
+var infowindow = new google.maps.InfoWindow({
+="content:'#{escape_javascript(map_content.name)}',"
+});
+
+
+
+-if map_content.info_bule
+  infowindow.open(map,marker);
+
+} 
+});
+
+
+
+
+</script>
\ No newline at end of file
diff --git a/app/views/portlet/portlets/_portlet.html.haml b/app/views/portlet/portlets/_portlet.html.haml
new file mode 100644
index 0000000..03015b3
--- /dev/null
+++ b/app/views/portlet/portlets/_portlet.html.haml
@@ -0,0 +1,28 @@
+#portlet.portlet{:"data-show-link" => eval("portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id, :format => :js)"), :"data-edit-link" => eval("edit_portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id, :format => :js)"), :id => portlet.id,:"data-portlet_id" => portlet.id, :class => "portlet_"+portlet.content_type.tableize.singularize+(" " if portlet.content_type == "BlockContent").to_s}  
+  
+  
+  -if portlet.content_type == "BlockContent"
+    .btn-toolbar{:style => "position:absolute;margin-left:150px;margin-top:5px;"}
+      .btn-group
+        %a.btn.handle{:href => "#"}=ic :arrows
+        =link_to ic(:pencil), eval("edit_portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id)"), :remote => true, :class => "btn"
+        =link_to ic(:"trash-o"), eval("portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id)"), :method => :delete, :data => { :confirm => "Etes-vous sûr ?"}, :remote => true, :class => "btn"
+  
+  
+    
+  
+  
+  -else
+    .btn-toolbar{:style => "position:absolute;margin-left:10px;z-index:1;"}
+      .btn-group
+        %a.btn.btn-default.portlet_handle{:href => "#", :data => {:portlet_id => portlet.id}}=ic :arrows
+        =link_to ic(:pencil), eval("edit_portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id)"), :remote => true, :class => "btn btn-default"
+        =link_to ic(:"trash-o"), eval("portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id)"), :method => :delete, :data => { :confirm => "Etes-vous sûr ?"}, :remote => true, :class => "btn btn-default"
+  
+  
+  
+  
+
+  
+
+  =render :partial => "portlets/render_public/"+portlet.content_type.to_s.downcase, :locals => {:input => portlet.content, :admin => true, :edit_link => eval("edit_portlet_"+portlet.content_type.tableize.singularize+"_path(portlet.content, :portlet_id => portlet.id)") }
\ No newline at end of file
diff --git a/app/views/portlet/portlets/new.html.haml b/app/views/portlet/portlets/new.html.haml
new file mode 100644
index 0000000..93494dd
--- /dev/null
+++ b/app/views/portlet/portlets/new.html.haml
@@ -0,0 +1,7 @@
+.portlet_types
+  -ContentType.all.each do |content_type|
+    =link_to content_type.name, eval("new_portlet_"+content_type.slug.tableize.singularize+"_path(:block_id => @portlet.block_id, :position => params[:position])"), :remote => true
+
+%br
+%br
+#new_portlet_content_form
\ No newline at end of file
diff --git a/app/views/portlet/portlets/new.js.erb b/app/views/portlet/portlets/new.js.erb
new file mode 100644
index 0000000..c21cdf1
--- /dev/null
+++ b/app/views/portlet/portlets/new.js.erb
@@ -0,0 +1,12 @@
+$.ajax({
+  url:"<%= eval("new_portlet_"+params[:content_type].tableize.singularize+"_path(:format => 'js')") %>", 
+  type: "GET",
+  data: { 
+    block_id : "<%= params[:block_id] %>",
+    position : "<%= params[:position] %>"
+    } ,
+  success : function (){
+    
+  }
+});
+
diff --git a/app/views/portlet/portlets/update.js.erb b/app/views/portlet/portlets/update.js.erb
new file mode 100644
index 0000000..3438a65
--- /dev/null
+++ b/app/views/portlet/portlets/update.js.erb
@@ -0,0 +1,8 @@
+
+
+
+$("#block_portlets_<%= @portlet.block.id %>").replaceWith("<%= escape_javascript(render(:partial => 'admin/blocks/block', :locals => {:block => @portlet.block})) %>");
+$("#portlet_<%= @portlet.id %>").effect("highlight", {}, 3000);
+block_js_initialize();
+
+<%= flash_notice() %>
\ No newline at end of file
diff --git a/app/views/portlet/shared/create.js.erb b/app/views/portlet/shared/create.js.erb
new file mode 100644
index 0000000..e509526
--- /dev/null
+++ b/app/views/portlet/shared/create.js.erb
@@ -0,0 +1,18 @@
+block_portlet_id = $("#new_portlet_form_inline").closest(".block_portlets").data('block_id');
+
+$("#new_portlet_form_inline").replaceWith("<%= escape_javascript(render(@portlet)) %>");
+
+
+
+
+$("#collapse3 .trash").attr("href", $("#portlet_<%= @portlet.id %>").data("show-link"));
+
+update_block_portlet_order(block_portlet_id);
+//$.ajax({url : $("#portlet_<%= @portlet.id %>").data("edit-link"), type: "GET"});
+
+
+cancel_move_portlet();
+unselect_portlet();
+
+
+<%= flash_js %>
\ No newline at end of file
diff --git a/app/views/portlet/shared/destroy.js.erb b/app/views/portlet/shared/destroy.js.erb
new file mode 100644
index 0000000..187ecdb
--- /dev/null
+++ b/app/views/portlet/shared/destroy.js.erb
@@ -0,0 +1,13 @@
+
+
+cancel_move_portlet();
+unselect_portlet();
+
+//reset_edit_pane();
+$("#portlet_<%= @portlet.id %>").remove();
+$("#element_form").html("");
+<%= flash_js %>
+
+update_portlet_order();
+
+
diff --git a/app/views/portlet/shared/edit.js.erb b/app/views/portlet/shared/edit.js.erb
new file mode 100644
index 0000000..63fb69d
--- /dev/null
+++ b/app/views/portlet/shared/edit.js.erb
@@ -0,0 +1,15 @@
+$("#toolbar-text").html("");
+$("#element_form").html("<%= escape_javascript(render( :partial => "form")) %>");
+
+
+open_collapse3();
+
+<%- cancel_button = escape_javascript(link_to("annuler", portlet_portlet_path(@portlet), :class => "button cancel", :remote => true)); %>
+
+$("#portlet_<%= @portlet.id %>").find('.buttons ol').prepend('<%= cancel_button %>');
+
+
+
+$("#collapse3 .portlet_handle").data("portlet-id", <%= @portlet.id %>);
+
+
diff --git a/app/views/portlet/shared/new.js.erb b/app/views/portlet/shared/new.js.erb
new file mode 100644
index 0000000..5aa53af
--- /dev/null
+++ b/app/views/portlet/shared/new.js.erb
@@ -0,0 +1,7 @@
+$("#toolbar-text").html("");
+$("#element_form").html("<%= escape_javascript(render( :partial => "form")) %>");
+
+$("#collapse3 .portlet_handle").data("portlet-id", "");
+
+open_collapse3();
+
diff --git a/app/views/portlet/shared/update.js.erb b/app/views/portlet/shared/update.js.erb
new file mode 100644
index 0000000..f35ef7b
--- /dev/null
+++ b/app/views/portlet/shared/update.js.erb
@@ -0,0 +1,7 @@
+
+$("#portlet_<%= @portlet.id %>").replaceWith("<%= escape_javascript(render(@portlet)) %>");
+
+cancel_move_portlet();
+unselect_portlet();
+
+<%= flash_js %>
\ No newline at end of file
diff --git a/app/views/portlet/table_cols/create.js.erb b/app/views/portlet/table_cols/create.js.erb
new file mode 100644
index 0000000..2db2ece
--- /dev/null
+++ b/app/views/portlet/table_cols/create.js.erb
@@ -0,0 +1,4 @@
+
+$("#portlet_<%= @table_content.portlet.id %>").replaceWith("<%= escape_javascript(render(@table_content.portlet)) %>");
+
+<%= flash_js %>
\ No newline at end of file
diff --git a/app/views/portlet/table_cols/destroy.js.erb b/app/views/portlet/table_cols/destroy.js.erb
new file mode 100644
index 0000000..2db2ece
--- /dev/null
+++ b/app/views/portlet/table_cols/destroy.js.erb
@@ -0,0 +1,4 @@
+
+$("#portlet_<%= @table_content.portlet.id %>").replaceWith("<%= escape_javascript(render(@table_content.portlet)) %>");
+
+<%= flash_js %>
\ No newline at end of file
diff --git a/app/views/portlet/table_contents/_form.html.haml b/app/views/portlet/table_contents/_form.html.haml
new file mode 100644
index 0000000..675ea62
--- /dev/null
+++ b/app/views/portlet/table_contents/_form.html.haml
@@ -0,0 +1,18 @@
+
+=semantic_form_for( [:portlet, @table_content], :remote => true) do |f|
+
+
+  -if !@table_content.id
+    %table
+      %tr
+        %td Nombre de lignes :
+        %td=f.text_field :nbr_rows
+      %tr
+        %td Nombre de colonnes :
+        %td=f.text_field :nbr_cols
+  
+  -if BlockContent::STYLES.size > 0
+    Style :
+    = f.select :style, TableContent::STYLES
+  
+ 
\ No newline at end of file
diff --git a/app/views/portlet/table_contents/_table_content.html.haml b/app/views/portlet/table_contents/_table_content.html.haml
new file mode 100644
index 0000000..e8208fe
--- /dev/null
+++ b/app/views/portlet/table_contents/_table_content.html.haml
@@ -0,0 +1,46 @@
+
+
+
+%table.table_content
+  -table_rows = table_content.table_rows
+  %tr
+    -i = 0
+    -table_content.nbr_cols.times do 
+      -i += 1
+      %td.add_col
+        %span.innerWrapper
+          .col_menu
+            =link_to "Ajouter une colonne avant", portlet_table_cols_path(:position => i, :table_content_id =>table_content.id ), :method => :post, :remote => true
+          
+            =link_to "Ajouter une colonne après", portlet_table_cols_path(:position => i+1, :table_content_id =>table_content.id ), :method => :post, :remote => true
+            
+            -if table_content.nbr_cols > 1
+              =link_to "Supprimer cette colonne", portlet_table_col_path(:id => i, :table_content_id =>table_content.id ), :method => :delete, :remote => true, :confirm => "Voulez-vous vraiment supprimer cette colonne ?"
+          = i(:cog_alt, :gray_light, 12)
+        
+    %td
+  
+  -table_rows.each do |table_row|
+    %tr{:id => table_row.id}
+    
+      
+      -CelTable.where(:table_row_id => table_row.id).order("position ASC").each do |cel_table|
+        
+        %td.table_content_cel{:id => cel_table.id}
+
+          =render :partial => "admin/blocks/block", :locals => {:block => cel_table.block}
+      
+      %td.add_cel 
+        
+        .innerWrapper
+          .row_menu
+            =link_to "Ajouter un rang avant", portlet_table_rows_path(:table_row => {:table_content_id => table_content.id, :position => (table_row.position)}), :method => :post, :remote => true
+          
+            =link_to "Ajouter un rang après", portlet_table_rows_path(:table_row => {:table_content_id => table_content.id, :position => (table_row.position+1)}), :method => :post, :remote => true
+            -if table_content.nbr_rows > 1
+              =link_to "Supprimer ce rang", portlet_table_row_path(table_row), :method => :delete, :remote => true, :confirm => "Voulez-vous vraiment supprimer ce rang ?"
+          = i(:cog_alt, :gray_light, 12)
+        
+          
+        
+    
\ No newline at end of file
diff --git a/app/views/portlet/table_contents/_table_content_edit_pane.html.haml b/app/views/portlet/table_contents/_table_content_edit_pane.html.haml
new file mode 100644
index 0000000..5dfdc3c
--- /dev/null
+++ b/app/views/portlet/table_contents/_table_content_edit_pane.html.haml
@@ -0,0 +1,33 @@
+%table.table_content
+  -table_rows = @table_content.table_rows
+  %tr
+    
+    
+
+
+  -table_rows.each do |table_row|
+    %tr
+      %td.row_left
+        .crl
+          %a{:href => "#", :onclick => "$('.table_row_menu').hide();$('#table_row_menu_"+table_row.id.to_s+"').toggle();return false;"}+
+        
+        
+        
+        
+          .table_row_menu#table_row_menu{:id => table_row.id}
+            =link_to "ajouter un rang avant", portlet_table_rows_path(:table_row => {:table_content_id => @table_content.id, :position => (table_row.position)}), :method => :post
+            %br
+            =link_to "ajouter un rang après", portlet_table_rows_path(:table_row => {:table_content_id => @table_content.id, :position => (table_row.position+1)}), :method => :post
+            %br
+            =link_to "supprimer ce rang", [:portlet, table_row], :method => :delete, :confirm => "Voulez-vous vraiment supprimer ce rang ainsi que son contenu ?", :remote => true
+          
+      -table_row.cel_tables.each do |cel_table|
+
+        %td.table_content_cel
+          =auto_load_div(admin_block_path(cel_table.block),"Page_"+"@page.id.to_s"+"_blocks_part")
+
+      %td.add_col
+        %span +
+      -@table_content.nbr_cols.times do 
+        %td.add_col
+          %span +f
diff --git a/app/views/portlet/table_contents/destroy_row.js.erb b/app/views/portlet/table_contents/destroy_row.js.erb
new file mode 100644
index 0000000..8fd1b2d
--- /dev/null
+++ b/app/views/portlet/table_contents/destroy_row.js.erb
@@ -0,0 +1,6 @@
+
+
+
+
+$("#table_content_edit_pane_<%= @table_content.id %>").html("<%= escape_javascript(render(:partial => "portlet/table_contents/table_content_edit_pane")) %>");
+<%= flash_notice() %>
\ No newline at end of file
diff --git a/app/views/portlet/table_rows/create.js.erb b/app/views/portlet/table_rows/create.js.erb
new file mode 100644
index 0000000..928d700
--- /dev/null
+++ b/app/views/portlet/table_rows/create.js.erb
@@ -0,0 +1,4 @@
+
+$("#portlet_<%= @portlet.id %>").replaceWith("<%= escape_javascript(render(@portlet)) %>");
+
+<%= flash_js %>
\ No newline at end of file
diff --git a/app/views/portlet/table_rows/destroy.js.erb b/app/views/portlet/table_rows/destroy.js.erb
new file mode 100644
index 0000000..687bbba
--- /dev/null
+++ b/app/views/portlet/table_rows/destroy.js.erb
@@ -0,0 +1,4 @@
+
+$("#portlet_<%= @table_row.table_content.portlet.id %>").replaceWith("<%= escape_javascript(render(@table_row.table_content.portlet)) %>");
+
+<%= flash_js %>
\ No newline at end of file
diff --git a/app/views/portlet/text_contents/_form.html.haml b/app/views/portlet/text_contents/_form.html.haml
new file mode 100644
index 0000000..6186808
--- /dev/null
+++ b/app/views/portlet/text_contents/_form.html.haml
@@ -0,0 +1,78 @@
+%p Vous pouvez modifier le contenu directement à l'endroit où vous avez placé votre texte.
+%p N'oubliez pas de sauvegarder vos modifications avec le bouton ci dessous.
+
+-if @text_content.id
+  =semantic_form_for( [:portlet, @text_content], :remote => true, :html => {:"data-portlet-id" => @text_content.portlet.id}) do |f|
+  
+    
+    =f.text_area :content, :style => "width:98%;height:600px;", :class => "redactor_content", :style => "display:none;"
+
+  
+  
+  
+    -if TextContent::STYLES.size > 0
+      Style :
+      = f.select :style, TextContent::STYLES
+
+
+ 
+    :javascript
+      $("#element_form form").submit(function (e){
+      
+        $("#element_form textarea").val($('#portlet_'+$("#element_form form").data("portlet-id")+' .content').redactor('code.get'));
+        $("#toolbar-text").html("");
+      
+      });
+      
+      $('#portlet_'+$("#element_form form").data("portlet-id")+' .content').redactor({
+        focus: true,
+        toolbarExternal: '#toolbar-text',
+        buttonSource: true,
+        buttons : [ 'html','alignleft', 'aligncenter', 'alignright', 'justify', 'formatting', 'bold', 'italic', 'deleted','underline','unorderedlist', 'orderedlist', 'outdent', 'indent','image', 'file', 'link', 'alignment','fontsize', 'horizontalrule','fontcolor', 'backcolor'],
+        plugins : ['bufferbuttons','fontsize',"fontfamily", 'fontcolor', 'scriptbuttons']
+      
+      
+    
+      });
+  
+    
+  
+  
+-else
+  =semantic_form_for( [:portlet, @text_content], :remote => true) do |f|
+    =f.text_area :content, :style => "width:98%;height:600px;", :class => "redactor_content", :style => "display:none;"
+
+  
+  
+  
+    -if TextContent::STYLES.size > 0
+      Style :
+      = f.select :style, TextContent::STYLES
+
+
+ 
+    :javascript
+    
+      $("#new_portlet_form_inline").html('<div class="content"></div>')
+      
+      content_element = $('#new_portlet_form_inline .content')
+      
+      $("#element_form form").submit(function (e){
+      
+        $("#element_form textarea").val(content_element.redactor('code.get'));
+        $("#toolbar-text").html("");
+      
+      });
+      
+      content_element.redactor({
+        focus: true,
+        toolbarExternal: '#toolbar-text',
+        buttons : ['undo','redo','|', 'formatting', '|', 'bold', 'italic', 'deleted','underline','|', 'alignleft', 'aligncenter', 'alignright', 'justify', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent', '|', 'table', 'link', '|','fontcolor', 'backcolor','|', 'horizontalrule', '|','html']
+      
+      
+    
+      });
+  
+    
+
+  
diff --git a/app/views/portlet/text_contents/_text_content.html.haml b/app/views/portlet/text_contents/_text_content.html.haml
new file mode 100644
index 0000000..f36ab60
--- /dev/null
+++ b/app/views/portlet/text_contents/_text_content.html.haml
@@ -0,0 +1,2 @@
+
+.content=raw text_content.content
\ No newline at end of file
diff --git a/app/views/portlet/title_contents/_form.html.haml b/app/views/portlet/title_contents/_form.html.haml
new file mode 100644
index 0000000..dfb1a51
--- /dev/null
+++ b/app/views/portlet/title_contents/_form.html.haml
@@ -0,0 +1,34 @@
+=semantic_form_for( [:portlet, @title_content], :remote => true, :html => {:"data-portlet-id" => (@title_content.portlet.id if @title_content.portlet)}) do |f|
+  
+  =f.text_field :content, :style => "width:98%;", :class => "inputText", :style => ("display:none;" if @title_content.id)
+
+  Importance :
+  = f.select :level, TitleContent::LEVELS
+  -if TitleContent::STYLES.size > 0
+    Style :
+    = f.select :style, TitleContent::STYLES
+  %br
+
+-if @title_content.id
+  
+  :javascript
+    
+    $("#element_form form").submit(function (e){
+    
+      $("#element_form #title_content_content").val($('#portlet_'+$("#element_form form").data("portlet-id")+' .title_content_inline').redactor('code.get'));
+      $("#toolbar-text").html("");
+    
+    });
+    
+    $('#portlet_'+$("#element_form form").data("portlet-id")+' .title_content_inline').redactor({
+      focus: true,
+      toolbarExternal: '#toolbar-text',
+      buttonSource: true,
+      plugins : [ 'fontcolor', 'scriptbuttons'],
+      buttons: [ 'bold', 'italic'],
+      allowedTags: ['sup', "strong", "em", "sub", "span", "br"],
+      linebreaks: true
+    
+    
+  
+    });
\ No newline at end of file
diff --git a/app/views/portlet/title_contents/_title_content.html.haml b/app/views/portlet/title_contents/_title_content.html.haml
new file mode 100644
index 0000000..c394932
--- /dev/null
+++ b/app/views/portlet/title_contents/_title_content.html.haml
@@ -0,0 +1,4 @@
+=raw '<h'+title_content.level.to_s+">"
+=title_content.content
+=raw "</h"+title_content.level.to_s+">"
+
diff --git a/app/views/portlets/render_public/_blockcontent.html.haml b/app/views/portlets/render_public/_blockcontent.html.haml
new file mode 100644
index 0000000..32e89ed
--- /dev/null
+++ b/app/views/portlets/render_public/_blockcontent.html.haml
@@ -0,0 +1,36 @@
+
+-if input.nbr_columns == 1 and admin == "dd"
+  -input.blocks.each do |block|
+    .block
+      =render :partial => "admin/blocks/block", :locals => {:block => block, :sortable => false}
+  .clear
+    
+-else
+  =raw '</div>' if !admin
+
+  - css_class = ""
+  - css_class = "dark_background" if input.style == 2
+  - css_class = "gray_light_background" if input.style == 3
+  - css_class = "blue_background" if input.style == 4
+  - css_class = "yellow_background" if input.style == 5
+  - css_class = "green_background" if input.style == 6
+  - css_class = "beton" if input.style == 7
+  - css_class = "content_center" if input.style == 8
+  
+  =raw "<div class='#{css_class}'>" if !admin
+  
+  =raw "<div class='main'>" if input.style > 1 or input.style < 10
+  .row
+    -for i in 1..input.nbr_columns.to_i
+      %div{:class => "columns span_"+eval("input.row#{i}").to_s}
+        -if admin
+          =render :partial => "admin/blocks/block", :locals => {:admin => false,:block => input.blocks[i-1], :sortable => false}
+        -else
+          =render :partial => "public/blocks/block", :locals => {:admin => false, :block => input.blocks[i-1], :sortable => false}
+    .clear
+
+  =raw "</div>" if input.style > 1 or input.style < 10
+  =raw "</div>" if !admin
+  =raw '<div class="row">' if !admin
+  
+  
\ No newline at end of file
diff --git a/app/views/portlets/render_public/_breakcontent.html.haml b/app/views/portlets/render_public/_breakcontent.html.haml
new file mode 100644
index 0000000..a287381
--- /dev/null
+++ b/app/views/portlets/render_public/_breakcontent.html.haml
@@ -0,0 +1 @@
+%hr
\ No newline at end of file
diff --git a/app/views/portlets/render_public/_downloadcontent.html.haml b/app/views/portlets/render_public/_downloadcontent.html.haml
new file mode 100644
index 0000000..fd904f1
--- /dev/null
+++ b/app/views/portlets/render_public/_downloadcontent.html.haml
@@ -0,0 +1,11 @@
+-if input.data_file
+  
+  
+  
+  .download_content
+    =link_to input.title.to_s, input.data_file.file.url
+
+-else
+
+  .download_content
+    =link_to input.title.to_s, ""
diff --git a/app/views/portlets/render_public/_dynamiccontent.html.haml b/app/views/portlets/render_public/_dynamiccontent.html.haml
new file mode 100644
index 0000000..7b58256
--- /dev/null
+++ b/app/views/portlets/render_public/_dynamiccontent.html.haml
@@ -0,0 +1,3 @@
+
+
+=render :partial => "portlets/dynamic_contents/"+input.name.to_s.downcase if input.name
\ No newline at end of file
diff --git a/app/views/portlets/render_public/_eventcontent.html.haml b/app/views/portlets/render_public/_eventcontent.html.haml
new file mode 100644
index 0000000..a710d19
--- /dev/null
+++ b/app/views/portlets/render_public/_eventcontent.html.haml
@@ -0,0 +1,106 @@
+.event{:class => input.event_type.to_i}
+  %a{:id => "event_#{input.id}"}
+  -if input.image_file
+
+    %p.img{:style =>"float:left;"}
+      =image_tag(input.image_file.file.large.medium.small.thumb)
+    
+
+
+
+
+
+
+  
+
+
+
+  
+  %h2=input.title
+  %h3= input.artist
+  %h4
+    ="Rencontre avec l'artiste" if input.event_type.to_i == 1
+    = l input.start_at, :format => :human
+  %p{:style => "clear:both;margin-top:20px;"}  
+  
+  #map.map{:id => input.id, :style => "width:400px; height:200px;"}
+
+
+
+  <script type="text/javascript">
+
+  ="var address ='#{escape_javascript(input.address.to_s)}';"
+
+  var geocoder;
+  geocoder = new google.maps.Geocoder();
+
+  geocoder.geocode( { 'address': address}, function(results, status) {
+  if (status == google.maps.GeocoderStatus.OK) {
+
+
+
+
+
+  var myLatlng = results[0].geometry.location;
+  var myOptions = {
+  ="zoom:#{escape_javascript(12.to_s)},"
+  center: myLatlng,
+
+  
+  mapTypeId: google.maps.MapTypeId.ROADMAP
+  
+  };
+
+  ="var map = new google.maps.Map(document.getElementById('map_#{input.id}'),"
+  myOptions);
+
+
+
+  var marker = new google.maps.Marker({
+  position: myLatlng, 
+
+  map : map,
+
+  ="title:'=#{escape_javascript(input.title)}',"
+
+
+  });
+
+
+  var infowindow = new google.maps.InfoWindow({
+  ="content:'#{escape_javascript(input.title)}',"
+  });
+
+
+
+
+
+  } 
+  });
+
+
+
+
+  </script>
+  
+  
+  
+  
+  %p
+    %strong=input.place
+    %br
+    =simple_format input.address
+
+    
+
+  =simple_format input.description
+  %p=link_to "voir la carte en grand", "http://maps.google.com/maps?q="+u(input.address), :target => "blank"
+  
+  -if input.with_cible?
+  
+
+    - if input.cible  
+      =link_to "site de l'artiste", input.cible.cible_url, :target => ("_blank" if input.popup).to_s
+  
+  %p{:style => "clear:both;margin-top:10px;"}  
+  
\ No newline at end of file
diff --git a/app/views/portlets/render_public/_gallerycontent.html.haml b/app/views/portlets/render_public/_gallerycontent.html.haml
new file mode 100644
index 0000000..b6ae711
--- /dev/null
+++ b/app/views/portlets/render_public/_gallerycontent.html.haml
@@ -0,0 +1,130 @@
+
+-if admin
+
+  %h2=input.name
+  .description
+    =raw input.description
+ 
+  .gallery_images  
+    =render :collection => input.gallery_images, :partial => "portlet/gallery_images/gallery_image"
+    %p{:style => "clear:both;"}
+  
+  :coffeescript
+  
+    adjustment = ""
+    
+    $('.gallery_images').sortable({
+      itemSelector:".gallery_image",
+      containerSelector :".gallery_images",
+      nested:true,
+      placeholder:"<div class='placeholder' style='display:inline-block;width:50px;height:170px;'></div>",
+      onDragStart: ($item, container, _super) ->
+        $("body").addClass("dragging")
+      
+        offset = $item.offset()
+        pointer = container.rootGroup.pointer
+        adjustment = {
+          left: pointer.left - offset.left,
+          top: pointer.top - offset.top
+          }
+      onDrag: ($item, position, _super) ->
+        
+        $item.css({
+          
+          left: position.left - adjustment.left,
+          top: position.top - adjustment.top - $(window).scrollTop()
+          
+        })
+        
+      onDrop: ($item, container, _super) ->
+      
+        $item.removeClass("dragged").removeAttr("style")
+        $("body").removeClass("dragging")
+      
+        result = []
+        container.el.find(".gallery_image").each ->
+          result.push $(this).data("id")
+        
+      
+    
+
+        $.ajax({
+          url:"/portlet/gallery_images/reorder.js", 
+          type: "GET",
+          data: { 
+            order : result
+            } 
+    
+        })
+    });
+  
+
+  
+
+-else
+  -if input.style == 4
+    %ul#portfolio-filter
+    
+      %li
+        %a.current{:href => "#all"} Tous
+      
+      -input.tags.each do |tag|
+        %li
+          %a{:href => "##{tag.to_slug}"}= tag
+
+
+    
+    %ul#portfolio-list
+      -input.gallery_images.each do |gallery_images|
+        %li{:class => gallery_images.tags_class}=link_to image_tag(gallery_images.image_file.file.square.url),gallery_images.image_file.file.large.url, :title => "#{gallery_images.title}", :rel => "prettyPhoto"
+        
+        
+    :coffeescript
+      $('#portfolio-list').filterable({
+        animationSpeed: 300,
+        show: { height: 'show',width: 'show' },
+        hide: { height: 'hide' ,width: 'hide'}
+      })
+      
+    
+  
+  -if input.style == 3
+    .portlet.input
+    
+      
+    
+      .rea-gal  
+        -input.gallery_images.each do |gallery_images|
+          =link_to image_tag(gallery_images.image_file.file.square.url, :alt => "#{gallery_images.title}"), gallery_images.image_file.file.large.url, :title => gallery_images.title
+        .clear
+
+  -elsif input.style==2
+ 
+    %ul.bxslider{:data => {:ratio => 1.8}}
+      -input.gallery_images.each do |gallery_images|
+        %li
+          =image_tag(gallery_images.image_file.file.large.url, :title => "#{gallery_images.title}")
+        
+    
+
+
+
+  -elsif input.style==1
+    .portlet.input
+      %table.gallery_images  
+        =raw "<tr>"
+      
+        - i = 0
+        -input.gallery_images.each do |gallery_images|
+          -if gallery_images.image_file
+            - i = i+1
+        
+            %td=link_to image_tag(gallery_images.image_file.file.large.medium.small.thumb.url, :alt => "#{gallery_images.title}"), gallery_images.image_file.file.large.url, :rel => "prettyPhoto"
+        
+            -if i % 4 == 0
+              =raw "</tr><tr>"
+        
+        
+        =raw "</tr>"
+
+  
\ No newline at end of file
diff --git a/app/views/portlets/render_public/_htmlcontent.html.haml b/app/views/portlets/render_public/_htmlcontent.html.haml
new file mode 100644
index 0000000..0c5e39d
--- /dev/null
+++ b/app/views/portlets/render_public/_htmlcontent.html.haml
@@ -0,0 +1,5 @@
+
+-begin
+  =render :inline => input.content, :type => input.content_type
+-rescue Exception=>e
+  =raw "<br /><br /><br /><br />"
\ No newline at end of file
diff --git a/app/views/portlets/render_public/_imagecontent.html.haml b/app/views/portlets/render_public/_imagecontent.html.haml
new file mode 100644
index 0000000..840fbda
--- /dev/null
+++ b/app/views/portlets/render_public/_imagecontent.html.haml
@@ -0,0 +1,62 @@
+    
+-if input.image_file
+
+  -if input.style== "1"
+    -url =input.image_file.file.large.medium.url
+
+  -elsif input.style== "2"
+    -url =input.image_file.file.large.medium.small.url
+
+  -elsif input.style== "3"
+    -url =input.image_file.file.square.url
+
+  -elsif input.style== "4"
+    -url =input.image_file.file.large.medium.small.thumb.url
+    
+  -elsif input.style== "5"
+    -url =input.image_file.file.large.url
+  -elsif input.style== "6"
+    -url =input.image_file.file.url
+    
+    
+
+-else
+  -url =""
+
+-url = "http://"+request.host_with_port+url
+-style = ""
+-style = "text-align:center;" if input.alignement == "center"
+
+
+-style = "float:right;" if input.alignement == "right"
+  
+
+-style = "float:left;" if input.alignement == "left"
+
+-style = false if input.alignement == "none"
+
+- if input.cible
+  -link = input.cible.cible_url
+
+-styleimg=""
+-styleimg += "width:"+input.width.to_s+"px;" if input.width?
+-styleimg += "height:"+input.height.to_s+"px;" if input.height?
+
+=raw '<div class="img" style="'+style+'">' if style
+
+-if admin
+  = image_tag(url, :alt => input.alt.to_s, :style => styleimg )
+-else
+
+  -if link
+  
+    =link_to image_tag(url, :alt => input.alt.to_s, :style => styleimg ), link, :title => input.alt.to_s, :target => (input.popup ? "_blank" : "")
+
+    
+  -elsif input.expandable
+    =link_to image_tag(url, :alt => input.alt.to_s, :style => styleimg ), (input.image_file ? input.image_file.file.large.url : ""), :title => input.alt.to_s, :class => "expandable_image"
+
+  -else
+    =image_tag(url, :alt => input.alt.to_s, :style => styleimg )
+
+=raw '</div>' if style
\ No newline at end of file
diff --git a/app/views/portlets/render_public/_imglinkcontent.html.haml b/app/views/portlets/render_public/_imglinkcontent.html.haml
new file mode 100644
index 0000000..1caa603
--- /dev/null
+++ b/app/views/portlets/render_public/_imglinkcontent.html.haml
@@ -0,0 +1,27 @@
+.img_link_portlet
+
+  - if input.cible
+    -url = input.cible.cible_url
+    
+    .image_file
+      =link_to image_tag(input.image_file.file.square.url), url if input.image_file
+
+    .title
+      %h3=link_to input.title, url
+    .description
+      = link_to simple_format(input.description), url
+    .clear
+    
+    
+  -else
+
+
+    .image_file
+      =image_tag(input.image_file.file.square.url) if input.image_file
+
+    .title
+      %h3=input.title
+    .description
+      = simple_format(input.description)
+    .clear
+
diff --git a/app/views/portlets/render_public/_linkcontent.html.haml b/app/views/portlets/render_public/_linkcontent.html.haml
new file mode 100644
index 0000000..50910b7
--- /dev/null
+++ b/app/views/portlets/render_public/_linkcontent.html.haml
@@ -0,0 +1,6 @@
+.link_content
+  - if input.cible
+    -url = input.cible.cible_url
+  -else 
+    -url = ""
+  =link_to input.name.to_s, url.to_s, :class => "external_link", :target => ("_blank" if input.popup).to_s
\ No newline at end of file
diff --git a/app/views/portlets/render_public/_mapcontent.html.haml b/app/views/portlets/render_public/_mapcontent.html.haml
new file mode 100644
index 0000000..c11d9a9
--- /dev/null
+++ b/app/views/portlets/render_public/_mapcontent.html.haml
@@ -0,0 +1,64 @@
+#map_content_map.map_content_map{:id => input.id, :style => "width:100%; height:400px;margin:auto;"}
+
+
+
+<script type="text/javascript">
+
+="var address ='#{escape_javascript(input.address.to_s)}';"
+
+var geocoder;
+geocoder = new google.maps.Geocoder();
+
+geocoder.geocode( { 'address': address}, function(results, status) {
+if (status == google.maps.GeocoderStatus.OK) {
+
+
+
+
+
+var myLatlng = results[0].geometry.location;
+var myOptions = {
+="zoom:#{escape_javascript(input.zoom.to_s)},"
+center: myLatlng,
+
+-if input.view == 1
+  mapTypeId: google.maps.MapTypeId.ROADMAP
+-elsif input.view == 2
+  mapTypeId: google.maps.MapTypeId.HYBRID
+
+-elsif input.view == 3
+  mapTypeId: google.maps.MapTypeId.SATELLITE
+};
+
+="var map = new google.maps.Map(document.getElementById('map_content_map_#{input.id}'),"
+myOptions);
+
+
+
+var marker = new google.maps.Marker({
+position: myLatlng, 
+
+map : map,
+
+="title:'=#{escape_javascript(input.name)}',"
+
+
+});
+
+
+var infowindow = new google.maps.InfoWindow({
+="content:'#{escape_javascript(input.name)}',"
+});
+
+
+
+-if input.info_bule
+  infowindow.open(map,marker);
+
+} 
+});
+
+
+
+
+</script>
\ No newline at end of file
diff --git a/app/views/portlets/render_public/_tablecontent.html.haml b/app/views/portlets/render_public/_tablecontent.html.haml
new file mode 100644
index 0000000..2bc31bc
--- /dev/null
+++ b/app/views/portlets/render_public/_tablecontent.html.haml
@@ -0,0 +1,74 @@
+-if admin 
+
+
+
+
+
+  %table
+    -table_rows = input.table_rows
+    %tr
+      -i = 0
+      -input.nbr_cols.times do 
+        -i += 1
+        %td.add_col{:style => "text-align:center;"}
+          
+          .btn-group
+            %a.btn.dropdown-toggle{:href => "#", :data => {:toggle => "dropdown"}}
+              = i(:cog)
+              
+            %ul.dropdown-menu
+              %li=link_to "Ajouter une colonne avant", portlet_table_cols_path(:position => i, :table_content_id =>input.id ), :method => :post, :remote => true
+          
+              %li=link_to "Ajouter une colonne après", portlet_table_cols_path(:position => i+1, :table_content_id =>input.id ), :method => :post, :remote => true
+            
+              -if input.nbr_cols > 1
+                %li=link_to "Supprimer cette colonne", portlet_table_col_path(:id => i, :table_content_id =>input.id ), :method => :delete, :remote => true, :confirm => "Voulez-vous vraiment supprimer cette colonne ?"
+              
+    
+      %td
+  
+    -table_rows.each do |table_row|
+      %tr{:id => table_row.id}
+    
+      
+        -CelTable.where(:table_row_id => table_row.id).order("position ASC").each do |cel_table|
+        
+          %td.input_cel{:id => cel_table.id, :style => "border:1px solid black;"}
+
+            =render :partial => "admin/blocks/block", :locals => {:block => cel_table.block, :sortable => false}
+      
+        %td.add_cel 
+        
+          .btn-group{:style => "position:relative;"}
+            %a.btn.dropdown-toggle{:href => "#", :data => {:toggle => "dropdown"}}
+              = i(:cog)
+              
+            %ul.dropdown-menu{:style => "position:absolute;right:40px !important;left:auto !important;top:-2px !important;"}
+              %li=link_to "Ajouter un rang avant", portlet_table_rows_path(:table_row => {:table_content_id => input.id, :position => (table_row.position)}), :method => :post, :remote => true
+          
+              %li=link_to "Ajouter un rang après", portlet_table_rows_path(:table_row => {:table_content_id => input.id, :position => (table_row.position+1)}), :method => :post, :remote => true
+              -if input.nbr_rows > 1
+                %li=link_to "Supprimer ce rang", portlet_table_row_path(table_row), :method => :delete, :remote => true, :confirm => "Voulez-vous vraiment supprimer ce rang ?"
+        
+    
+        
+    
+
+-else
+
+  %table
+    -table_rows = input.table_rows
+
+
+    -table_rows.each do |table_row|
+      %tr
+    
+        -table_row.cel_tables.each do |cel_table|
+      
+          %td
+        
+            =render cel_table.block
+    
+    
+        
+
diff --git a/app/views/portlets/render_public/_textcontent.html.haml b/app/views/portlets/render_public/_textcontent.html.haml
new file mode 100644
index 0000000..3208fe0
--- /dev/null
+++ b/app/views/portlets/render_public/_textcontent.html.haml
@@ -0,0 +1,4 @@
+-if admin
+  .content=raw(input.content)
+-else
+  =raw(input.content)
\ No newline at end of file
diff --git a/app/views/portlets/render_public/_titlecontent.html.haml b/app/views/portlets/render_public/_titlecontent.html.haml
new file mode 100644
index 0000000..7fa8706
--- /dev/null
+++ b/app/views/portlets/render_public/_titlecontent.html.haml
@@ -0,0 +1,8 @@
+-level = (input.level || "1").to_s
+
+-if admin 
+  =raw '<h'+level+" class='title_content_inline' data-title-id='"+sanitize(input.id.to_s)+"'>"
+-else
+  =raw '<h'+level+" >"
+=sanitize input.content
+=raw '</h'+level+"  >" 
diff --git a/app/views/public/articles/_article.html.haml b/app/views/public/articles/_article.html.haml
new file mode 100644
index 0000000..65e2d71
--- /dev/null
+++ b/app/views/public/articles/_article.html.haml
@@ -0,0 +1,20 @@
+%article
+  
+  
+  
+  
+  .article_body
+    .date=l(article.published_at, :format =>"%e %B %Y")
+    -if !article.title_cached
+      %h1=link_to article.title, public_article_path(:id => article.slug)
+      
+   
+    
+  
+    =render article.block
+
+    .share
+      =link_to i(:"twitter"), "http://twitter.com/intent/tweet?source=sharethiscom&text=Blog de Photographie Hors Piste : "+article.title+"&url="+public_article_path(:id => article.slug), :target => "_blank",:title => "partager sur twitter l'article du blog de Photographie Hors Piste : "+article.title.to_s
+      =link_to i(:"facebook"), "https://www.facebook.com/sharer.php?u="+public_article_path(:id => article.slug)+"&t=Blog de Photographie Hors Piste : "+article.title+"", :target => "_blank",:title => "partager sur facebook l'article du blog de Photographie Hors Piste : "+article.title.to_s
+      =#link_to i(:"pinterest"), "https://www.facebook.com/sharer.php?u="+public_article_path(:id => article.slug)+"&t=Blog de Photographie Hors Piste : "+article.title+"", :target => "_blank",:title => "partager sur facebook l'article du blog de Photographie Hors Piste : "+article.title.to_s
+  .hr
\ No newline at end of file
diff --git a/app/views/public/articles/_article_intro.html.haml b/app/views/public/articles/_article_intro.html.haml
new file mode 100644
index 0000000..ffe51ee
--- /dev/null
+++ b/app/views/public/articles/_article_intro.html.haml
@@ -0,0 +1,35 @@
+%article
+
+	%header
+		
+		%aside
+			<img src="http://www.gravatar.com/avatar/199574623fb5c99b721233fb31bee19f.png" class="avatar avatar-50 photo" >
+			
+			%p
+				Article de
+				%strong
+			
+					Nicolas Bally
+			
+		
+			%time.updated{:datetime => Time.now, :pubdate => true}
+				publié
+				="le "+l(article.published_at, :format => :human_date)
+		
+			%p{:style => "margin-top:1em;"}
+				-if article.comments.count == 0
+					=link_to "Pas de commentaires", article_path(:slug => article.slug, :anchor => "comments")
+				-elsif article.comments.count == 1
+					=link_to "1 commentaire", article_path(:slug => article.slug, :anchor => "comments")
+				-else
+					=link_to "#{article.comments.count} commentaires", article_path(:slug => article.slug, :anchor => "comments")
+				
+		
+		
+      	
+		%h1=link_to article.title, article_path(:slug => article.slug), :title => "blog conseil en image : "+article.title.to_s
+		
+		%h2= article.description
+
+	=render article.block
+	
diff --git a/app/views/public/articles/_index.html.haml b/app/views/public/articles/_index.html.haml
new file mode 100644
index 0000000..111446b
--- /dev/null
+++ b/app/views/public/articles/_index.html.haml
@@ -0,0 +1,6 @@
+-if @articles.size > 0
+  =render :partial => "public/articles/article", :collection => @articles, :as => "article"
+  #articles_pagination= paginate @articles
+-else
+  %p
+    Aucun article plublié.
\ No newline at end of file
diff --git a/app/views/public/articles/_sidebar_archives.html.haml b/app/views/public/articles/_sidebar_archives.html.haml
new file mode 100644
index 0000000..5c9956d
--- /dev/null
+++ b/app/views/public/articles/_sidebar_archives.html.haml
@@ -0,0 +1,16 @@
+.archives.widget
+  %h3 Archives du blog
+
+  -if Article.before(Date.today).recents.size > 0
+    %ul
+      -first_month = Article.before(Date.today).recents.order(:published_at).first.published_at.beginning_of_month
+      -last_month = Article.before(Date.today).recents.order(:published_at).last.published_at.beginning_of_month
+      -the_month = last_month
+  
+      -while the_month >= first_month
+        -articles = Article.before(Date.today).recents.where("enabled = ? and published_at > ? and published_at < ?", true, the_month.beginning_of_month, the_month.end_of_month ).count
+      
+        -if articles > 0
+          %li=link_to l(the_month.to_date, :format => :only_month)+" (#{articles})", archive_public_article_path(:year => the_month.year, :month => the_month.month)
+      
+        -the_month = the_month.prev_month
\ No newline at end of file
diff --git a/app/views/public/articles/_sidebar_categories.html.haml b/app/views/public/articles/_sidebar_categories.html.haml
new file mode 100644
index 0000000..729c2cf
--- /dev/null
+++ b/app/views/public/articles/_sidebar_categories.html.haml
@@ -0,0 +1,7 @@
+
+.categories.widget
+	%h3 Catégories
+	%ul
+		-Category.order(:name).each do |category|
+			%li
+				=link_to category.name+" (#{category.articles.recents.count})", category_public_article_path(:slug => category.slug), :title => "La cabanne du lutin, catégorie \""+category.name.to_s+'"'
diff --git a/app/views/public/articles/_sidebar_recents.html.haml b/app/views/public/articles/_sidebar_recents.html.haml
new file mode 100644
index 0000000..3165861
--- /dev/null
+++ b/app/views/public/articles/_sidebar_recents.html.haml
@@ -0,0 +1,8 @@
+
+.recents.widget
+	%h3 Articles récents
+	%ul
+		-Article.before(Date.today).recents.limit(5).each do |article|
+			%li= link_to article.title, public_article_path(:id => article.slug),:title => "La cabanne du lutin : "+article.title.to_s
+
+			
\ No newline at end of file
diff --git a/app/views/public/articles/_sidebar_tags.html.haml b/app/views/public/articles/_sidebar_tags.html.haml
new file mode 100644
index 0000000..31dfaa7
--- /dev/null
+++ b/app/views/public/articles/_sidebar_tags.html.haml
@@ -0,0 +1,7 @@
+
+.tags.widget
+	%h3 Tags
+	%p
+		-Tag.order(:name).each do |tag|
+			=link_to raw(tag.name+raw(" (#{tag.recents_articles.count})")), public_tag_path(tag.slug), :title => "La cabanne du lutin : articles avec le tag \""+tag.name.to_s+'"', :class => "tag"
+				
\ No newline at end of file
diff --git a/app/views/public/articles/archive.html.haml b/app/views/public/articles/archive.html.haml
new file mode 100644
index 0000000..7520d0c
--- /dev/null
+++ b/app/views/public/articles/archive.html.haml
@@ -0,0 +1,19 @@
+%h1 Sommaire
+
+-if Article.before(Date.today).recents.size > 0
+  
+
+  -first_month = Article.before(Date.today).where(:enabled => true).order(:published_at).first.published_at.beginning_of_month
+  -last_month = Article.before(Date.today).where(:enabled => true).order(:published_at).last.published_at.beginning_of_month
+  -the_month = last_month
+  
+  -while the_month >= first_month
+    -articles = Article.before(Date.today).recents.where("enabled = ? and published_at > ? and published_at < ?", true, the_month.beginning_of_month, the_month.end_of_month )
+    %h2=l(the_month.to_date, :format => :only_month)
+    
+  
+    -articles.each do |article|
+      %p= link_to article.title, public_article_path(:id => article.slug),:title => "La cabanne du lutin : "+article.title.to_s
+      
+    %hr
+    -the_month = the_month.prev_month
\ No newline at end of file
diff --git a/app/views/public/articles/feed.rss.builder b/app/views/public/articles/feed.rss.builder
new file mode 100644
index 0000000..5a3a383
--- /dev/null
+++ b/app/views/public/articles/feed.rss.builder
@@ -0,0 +1,22 @@
+
+
+
+xml.instruct! :xml, :version => "1.0" 
+xml.rss :version => "2.0" do
+  xml.channel do
+    xml.title @title
+    xml.description ""
+    xml.link "http://la-cabane-du-lutin.com/"
+
+    for article in @articles
+      xml.item do
+        xml.title article.title
+        xml.description( (image_tag(article.image_file.file.large.medium.small.url) if article.image_file).to_s+simple_format(article.description))
+        xml.pubDate article.published_at.to_s(:rfc822)
+        xml.link public_article_url(:id => article.slug)
+        xml.guid public_article_url(:id => article.slug)
+      end
+    end
+  end
+end
+
diff --git a/app/views/public/articles/index.html.haml b/app/views/public/articles/index.html.haml
new file mode 100644
index 0000000..84d837d
--- /dev/null
+++ b/app/views/public/articles/index.html.haml
@@ -0,0 +1,4 @@
+=render :partial => "index"
+
+-content_for :sidebar do
+  =render :partial => "sidebar_archives"
\ No newline at end of file
diff --git a/app/views/public/articles/index.js.erb b/app/views/public/articles/index.js.erb
new file mode 100644
index 0000000..dd08136
--- /dev/null
+++ b/app/views/public/articles/index.js.erb
@@ -0,0 +1,50 @@
+
+$('#main_content').fadeOut({
+
+  complete:function(){
+    
+    
+    $("#main_content").html('<%=escape_javascript(render(:partial => "index"))%>')
+    
+    $("#menu_top").html("<%= escape_javascript(render(:partial => "public/shared/first_menu") )%>");
+    
+    
+    <% if content_for?(:bandeau) %>;
+      $("#bandeau").html("<%= escape_javascript(render(:partial => "bandeau") )%>");
+      $("#bandeau").fadeIn()
+      $("#main").addClass("with_banner");
+      
+    <% else %>
+      $("#bandeau").fadeOut()
+      $("#main").removeClass("with_banner");
+      
+    <% end %>
+    
+    
+    
+    var stateObj = { url: "<%=request.fullpath%>" };
+    if(popstat == false){
+      history.pushState(stateObj, "", "<%=request.fullpath%>");
+    }else{
+      popstat = false;
+    }
+    window.onpopstate = function(event) {
+      popstat= true;
+        
+        if(event && event.state) {
+          $.ajax({url:event.state.url,dataType:"script"});
+            
+        }
+    }
+    
+
+    $('#main').fadeIn(500);
+    $('#accueil').fadeOut(500);
+    $('#color_background').fadeIn(500);
+    $(this).fadeIn(500);
+   
+    $("#top").removeClass("acceuil");
+  
+}
+
+});
\ No newline at end of file
diff --git a/app/views/public/articles/show.html.haml b/app/views/public/articles/show.html.haml
new file mode 100644
index 0000000..0020c7f
--- /dev/null
+++ b/app/views/public/articles/show.html.haml
@@ -0,0 +1 @@
+=render @article
diff --git a/app/views/public/blocks/_block.html.haml b/app/views/public/blocks/_block.html.haml
new file mode 100644
index 0000000..bf565ed
--- /dev/null
+++ b/app/views/public/blocks/_block.html.haml
@@ -0,0 +1,5 @@
+.row-fluid
+  -block.portlets.each do |p|
+    -if p.content_type
+
+      =render :partial => "portlets/render_public/"+p.content_type.to_s.downcase, :locals => {:admin => false,:input => p.content}
\ No newline at end of file
diff --git a/app/views/public/comments/_comment.html.haml b/app/views/public/comments/_comment.html.haml
new file mode 100644
index 0000000..0249d75
--- /dev/null
+++ b/app/views/public/comments/_comment.html.haml
@@ -0,0 +1,26 @@
+.comment#comment{:class => ("author" if comment.email == "info@nicolasbally.com"), :id => comment.id}
+	%aside=#gravatar_image_tag(comment.email? ? comment.email : comment.pseudo, :gravatar => {:default => "http://#{HOSTNAME}/assets/front/default_avatar.jpg"})
+	
+			
+	%p.header
+		
+		Mot doux de
+		%strong
+			
+			-if comment.website?
+				=link_to comment.pseudo, comment.website, :target => "_blank"
+			-else
+				=comment.pseudo
+		
+		%time.updated{:datetime => Time.now, :pubdate => true}
+			envoyé
+			="le "+l(comment.created_at, :format => :human_date)
+		
+	
+	
+
+	%blockquote=simple_format comment.comment
+
+	
+	
+	
\ No newline at end of file
diff --git a/app/views/public/comments/_form.html.haml b/app/views/public/comments/_form.html.haml
new file mode 100644
index 0000000..26988e2
--- /dev/null
+++ b/app/views/public/comments/_form.html.haml
@@ -0,0 +1,32 @@
+
+%h3
+	Ajouter un mot doux 
+
+=form_for [:public,(@comment || Comment.new(:commentable_id => @article.id, :commentable_type => "Article"))], :remote => true do |f|
+	=f.hidden_field :commentable_id
+	=f.hidden_field :commentable_type
+
+	%p
+		=f.label :pseudo, "Pseudo :"
+		
+		=f.text_field :pseudo
+	
+	%p
+
+		=f.label :email, "Email :"
+		=f.text_field :email
+	
+	%p
+
+		=f.label :website, "Site :"
+		=f.text_field :website
+		
+	%p	
+
+		=f.label :comment, "Commentaire :"
+		=f.text_area :comment, :style => "width:98%;height:200px;"
+	
+	
+	
+		
+	=f.submit "Envoyer", :class => "submit btn"
\ No newline at end of file
diff --git a/app/views/public/comments/create.js.erb b/app/views/public/comments/create.js.erb
new file mode 100644
index 0000000..4412f41
--- /dev/null
+++ b/app/views/public/comments/create.js.erb
@@ -0,0 +1,12 @@
+$("#comment_form").html("<%= escape_javascript(render(:partial => "form")) %>");
+
+$("#comments").html("<%= escape_javascript(render(@comment.commentable.comments.where(:enabled => true).order("created_at DESC"))) %>");
+
+
+
+
+
+
+$(document.body).animate({
+    'scrollTop':  ( $("#comment_<%= @comment_id %>").offset().top - 150)
+}, 700);
\ No newline at end of file
diff --git a/app/views/public/events/_event.haml b/app/views/public/events/_event.haml
new file mode 100644
index 0000000..d979e80
--- /dev/null
+++ b/app/views/public/events/_event.haml
@@ -0,0 +1,9 @@
+%a{:href => public_event_path(event.slug)}
+  .event
+    =image_tag event.image_file.file.large.medium.small.url if event.image_file
+    .date
+      =l event.start_at, :format => :date if event.start_at
+    %h3= event.title
+    =simple_format event.description
+    .clear
+    
\ No newline at end of file
diff --git a/app/views/public/events/index.html.haml b/app/views/public/events/index.html.haml
new file mode 100644
index 0000000..c6823f2
--- /dev/null
+++ b/app/views/public/events/index.html.haml
@@ -0,0 +1,2 @@
+%h1 Liste des événements
+=render @events
\ No newline at end of file
diff --git a/app/views/public/events/show.html.haml b/app/views/public/events/show.html.haml
new file mode 100644
index 0000000..d892f5e
--- /dev/null
+++ b/app/views/public/events/show.html.haml
@@ -0,0 +1,2 @@
+=render @event
+=render @event.block
diff --git a/app/views/public/menu_items/show.html.haml b/app/views/public/menu_items/show.html.haml
new file mode 100644
index 0000000..5c50dea
--- /dev/null
+++ b/app/views/public/menu_items/show.html.haml
@@ -0,0 +1 @@
+=render :partial => "public/blocks/block", :locals => {:block => @menu_item.menu_content.blocks[0]}
diff --git a/app/views/public/shared/_first_menu.html.haml b/app/views/public/shared/_first_menu.html.haml
new file mode 100644
index 0000000..f8f2ed2
--- /dev/null
+++ b/app/views/public/shared/_first_menu.html.haml
@@ -0,0 +1,3 @@
+
+-MenuItem.where(:parent_id => nil, :enabled => true, :visible => true).order(:position).each do |menu_item|
+  =menu_item_link(menu_item)
diff --git a/app/views/public/shared/_ga.html.erb b/app/views/public/shared/_ga.html.erb
new file mode 100644
index 0000000..f47f676
--- /dev/null
+++ b/app/views/public/shared/_ga.html.erb
@@ -0,0 +1,13 @@
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
\ No newline at end of file
diff --git a/config/deploy.rb b/config/deploy.rb
index cac2e19..9f4621e 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -4,7 +4,7 @@ require 'bundler/capistrano'
 
 
 set :application, 'pic_vert_app' 
-	set :domain, 'lepicvert.org'
+	set :domain, 'new.lepicvert.org'
 
 set :user, 'web'
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 1793b39..1709628 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-HOSTNAME = 'http://lepicvert.org'
+HOSTNAME = 'http://new.lepicvert.org'
 
 Survey::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
@@ -91,7 +91,7 @@ Survey::Application.configure do
 
 
   
-	config.action_mailer.default_url_options = { :host => "lepicvert.org" }
+	config.action_mailer.default_url_options = { :host => "new.lepicvert.org" }
 
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = {
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
deleted file mode 100644
index 1b4ad10..0000000
--- a/config/initializers/devise.rb
+++ /dev/null
@@ -1,241 +0,0 @@
-# -*- encoding : utf-8 -*-
-# Use this hook to configure devise mailer, warden hooks and so forth.
-# Many of these configuration options can be set straight in your model.
-Devise.setup do |config|
-  # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in Devise::Mailer,
-  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "nb@nicolasbally.com"
-
-  # Configure the class responsible to send e-mails.
-  # config.mailer = "Devise::Mailer"
-
-  # ==> ORM configuration
-  # Load and configure the ORM. Supports :active_record (default) and
-  # :mongoid (bson_ext recommended) by default. Other ORMs may be
-  # available as additional gems.
-  require 'devise/orm/active_record'
-
-  # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating a user. The default is
-  # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating a user, both parameters are required. Remember that those
-  # parameters are used only when authenticating and not when retrieving from
-  # session. If you need permissions, you should implement that in a before filter.
-  # You can also supply a hash where the value is a boolean determining whether
-  # or not authentication should be aborted when the value is not present.
-  # config.authentication_keys = [ :email ]
-
-  # Configure parameters from the request object used for authentication. Each entry
-  # given should be a request method and it will automatically be passed to the
-  # find_for_authentication method and considered in your model lookup. For instance,
-  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
-  # The same considerations mentioned for authentication_keys also apply to request_keys.
-  # config.request_keys = []
-
-  # Configure which authentication keys should be case-insensitive.
-  # These keys will be downcased upon creating or modifying a user and when used
-  # to authenticate or find a user. Default is :email.
-  config.case_insensitive_keys = [ :email ]
-
-  # Configure which authentication keys should have whitespace stripped.
-  # These keys will have whitespace before and after removed upon creating or
-  # modifying a user and when used to authenticate or find a user. Default is :email.
-  config.strip_whitespace_keys = [ :email ]
-
-  # Tell if authentication through request.params is enabled. True by default.
-  # It can be set to an array that will enable params authentication only for the
-  # given strategies, for example, `config.params_authenticatable = [:database]` will
-  # enable it only for database (email + password) authentication.
-  # config.params_authenticatable = true
-
-  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
-  # It can be set to an array that will enable http authentication only for the
-  # given strategies, for example, `config.http_authenticatable = [:token]` will
-  # enable it only for token authentication.
-  # config.http_authenticatable = false
-
-  # If http headers should be returned for AJAX requests. True by default.
-  # config.http_authenticatable_on_xhr = true
-
-  # The realm used in Http Basic Authentication. "Application" by default.
-  # config.http_authentication_realm = "Application"
-
-  # It will change confirmation, password recovery and other workflows
-  # to behave the same regardless if the e-mail provided was right or wrong.
-  # Does not affect registerable.
-  # config.paranoid = true
-
-  # By default Devise will store the user in session. You can skip storage for
-  # :http_auth and :token_auth by adding those symbols to the array below.
-  # Notice that if you are skipping storage for all authentication paths, you
-  # may want to disable generating routes to Devise's sessions controller by
-  # passing :skip => :sessions to `devise_for` in your config/routes.rb
-  config.skip_session_storage = [:http_auth]
-
-  # ==> Configuration for :database_authenticatable
-  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
-  # using other encryptors, it sets how many times you want the password re-encrypted.
-  #
-  # Limiting the stretches to just one in testing will increase the performance of
-  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
-  # a value less than 10 in other environments.
-  config.stretches = Rails.env.test? ? 1 : 10
-
-  # Setup a pepper to generate the encrypted password.
-  # config.pepper = "f87f546ec6d8de949f2d87b6d699b69dff6dc469973073afe67e596d826df7392658165fe3172e00d0d5775790cda87a329e1539a393308adfaf1f655a41fe7f"
-
-  # ==> Configuration for :confirmable
-  # A period that the user is allowed to access the website even without
-  # confirming his account. For instance, if set to 2.days, the user will be
-  # able to access the website for two days without confirming his account,
-  # access will be blocked just in the third day. Default is 0.days, meaning
-  # the user cannot access the website without confirming his account.
-  # config.allow_unconfirmed_access_for = 2.days
-
-  # If true, requires any email changes to be confirmed (exactly the same way as
-  # initial account confirmation) to be applied. Requires additional unconfirmed_email
-  # db field (see migrations). Until confirmed new email is stored in
-  # unconfirmed email column, and copied to email column on successful confirmation.
-  config.reconfirmable = true
-
-  # Defines which key will be used when confirming an account
-  # config.confirmation_keys = [ :email ]
-
-  # ==> Configuration for :rememberable
-  # The time the user will be remembered without asking for credentials again.
-  # config.remember_for = 2.weeks
-
-  # If true, extends the user's remember period when remembered via cookie.
-  # config.extend_remember_period = false
-
-  # Options to be passed to the created cookie. For instance, you can set
-  # :secure => true in order to force SSL only cookies.
-  # config.rememberable_options = {}
-
-  # ==> Configuration for :validatable
-  # Range for password length. Default is 6..128.
-  # config.password_length = 6..128
-
-  # Email regex used to validate email formats. It simply asserts that
-  # an one (and only one) @ exists in the given string. This is mainly
-  # to give user feedback and not to assert the e-mail validity.
-  # config.email_regexp = /\A[^@]+@[^@]+\z/
-
-  # ==> Configuration for :timeoutable
-  # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again. Default is 30 minutes.
-  # config.timeout_in = 30.minutes
-  
-  # If true, expires auth token on session timeout.
-  # config.expire_auth_token_on_timeout = false
-
-  # ==> Configuration for :lockable
-  # Defines which strategy will be used to lock an account.
-  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
-  # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
-
-  # Defines which key will be used when locking and unlocking an account
-  # config.unlock_keys = [ :email ]
-
-  # Defines which strategy will be used to unlock an account.
-  # :email = Sends an unlock link to the user email
-  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
-  # :both  = Enables both strategies
-  # :none  = No unlock strategy. You should handle unlocking by yourself.
-  # config.unlock_strategy = :both
-
-  # Number of authentication tries before locking an account if lock_strategy
-  # is failed attempts.
-  # config.maximum_attempts = 20
-
-  # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
-
-  # ==> Configuration for :recoverable
-  #
-  # Defines which key will be used when recovering the password for an account
-  # config.reset_password_keys = [ :email ]
-
-  # Time interval you can reset your password with a reset password key.
-  # Don't put a too small interval or your users won't have the time to
-  # change their passwords.
-  config.reset_password_within = 6.hours
-
-  # ==> Configuration for :encryptable
-  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
-  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
-  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
-  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
-  # REST_AUTH_SITE_KEY to pepper)
-  # config.encryptor = :sha512
-
-  # ==> Configuration for :token_authenticatable
-  # Defines name of the authentication token params key
-  # config.token_authentication_key = :auth_token
-
-  # ==> Scopes configuration
-  # Turn scoped views on. Before rendering "sessions/new", it will first check for
-  # "users/sessions/new". It's turned off by default because it's slower if you
-  # are using only default views.
-  # config.scoped_views = false
-
-  # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes (usually :user).
-  # config.default_scope = :user
-
-  # Set this configuration to false if you want /users/sign_out to sign out
-  # only the current scope. By default, Devise signs out all scopes.
-  # config.sign_out_all_scopes = true
-
-  # ==> Navigation configuration
-  # Lists the formats that should be treated as navigational. Formats like
-  # :html, should redirect to the sign in page when the user does not have
-  # access, but formats like :xml or :json, should return 401.
-  #
-  # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists.
-  #
-  # The "*/*" below is required to match Internet Explorer requests.
-  # config.navigational_formats = ["*/*", :html]
-
-  # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :delete
-
-  # ==> OmniAuth
-  # Add a new OmniAuth provider. Check the wiki for more information on setting
-  # up on your models and hooks.
-  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-
-  # ==> Warden configuration
-  # If you want to use other strategies, that are not supported by Devise, or
-  # change the failure app, you can configure them inside the config.warden block.
-  #
-  # config.warden do |manager|
-  #   manager.intercept_401 = false
-  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
-  # end
-
-  # ==> Mountable engine configurations
-  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
-  # is mountable, there are some extra configurations to be taken into account.
-  # The following options are available, assuming the engine is mounted as:
-  #
-  #     mount MyEngine, at: "/my_engine"
-  #
-  # The router that invoked `devise_for`, in the example above, would be:
-  # config.router_name = :my_engine
-  #
-  # When using omniauth, Devise cannot automatically set Omniauth path,
-  # so you need to do it manually. For the users scope, it would be:
-  # config.omniauth_path_prefix = "/my_engine/users/auth"
-  
-  config.authentication_keys = [ :username ]
-  config.case_insensitive_keys = [ :username ]
-  config.strip_whitespace_keys = [ :username ]
-  config.secret_key = '70d0e9ef79907401ef043610c8bd4b3ed6c08bef3ae4f0f22afa6b3df930a891def63dc1d9d538446cc647086ca0c3f155cc94e161488b428d21b6a9e4621925'
-
-  
-  
-end
diff --git a/config/nginx.conf b/config/nginx.conf
index 1d49cf5..fde9a0c 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -4,7 +4,7 @@ upstream pic_vert_app_unicorn {
 
 server {
 	listen 80;
-	server_name www2.lepicvert.asso.fr lepicvert.org;
+	server_name new.lepicvert.org lepicvert.org;
 	root /home/web/pic_vert_app/current/public;
 	try_files $uri/index.html $uri @unicorn;
 
diff --git a/config/routes.rb b/config/routes.rb
index 28f94e9..0bec699 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,7 +1,20 @@
 # -*- encoding : utf-8 -*-
 Survey::Application.routes.draw do
+  get "evenements/:id.html" => "public/events#show", :as => "public_event"
+  get "evenements.html" => "public/events#index", :as => "public_events"
+  get 'blog/:id.html' => "public/articles#show", :as => "public_article"
+  get 'blog.html' => "public/articles#index", :as => "articles"
   
-  devise_for :admins, :controllers => {:sessions => "admins/sessions", :passwords => "admins/passwords"} 
+    
+  get "blog/archives/:year/:month.html"=> "public/articles#archives", :as => :archive_public_article 
+  get "blog/tags/:id.html"=> "public/articles#tags", :as => :public_tag 
+	get "categorie/:slug.:f"=> "public/articles#category", :as => :category_public_article, :f => "html"
+  
+  
+  get "sitemap.:f" => "public/sitemap#sitemap"
+  
+  
+  #devise_for :admins, :controllers => {:sessions => "admins/sessions", :passwords => "admins/passwords"} 
   get 'plaquettes/gaspillage.:f' => 'plaquettes#gaspillage', :f => "html"
   get 'plaquettes/:slug.:f' => 'plaquettes#show', :f => "html"
   
@@ -39,12 +52,13 @@ Survey::Application.routes.draw do
   namespace :admin do
     
     
+    resources :password_resets
+    
     resources :admin_auths do
         collection do 
           get :logout
         end
     end
-    
 		resources :categories do
 			collection do
 				post :reorder
@@ -195,7 +209,10 @@ Survey::Application.routes.draw do
   end
   
 
-  root :to => redirect("http://lepicvert.asso.fr")
+  get '*url.html' => 'public/menu_items#show', :as => :menu_item, :f => "html"
+  get '*url.:f' => 'public/menu_items#redirect',  :f => "html"
+  
+  root 'public/menu_items#show'
 
  
 end
diff --git a/db/migrate/0003_create_menu.rb b/db/migrate/0003_create_menu.rb
new file mode 100644
index 0000000..b110854
--- /dev/null
+++ b/db/migrate/0003_create_menu.rb
@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+class CreateMenu < ActiveRecord::Migration
+  def self.up
+  create_table :menus do |t|
+    t.string :name
+    t.string :max_levels
+    t.timestamps
+  end
+  Menu.create(:name => "Menu principal", :max_levels => 3)
+  end
+
+  def self.down
+  drop_table :menus
+  end
+end
diff --git a/db/migrate/0004_menu_items.rb b/db/migrate/0004_menu_items.rb
new file mode 100644
index 0000000..d7c1204
--- /dev/null
+++ b/db/migrate/0004_menu_items.rb
@@ -0,0 +1,46 @@
+# -*- encoding : utf-8 -*-
+class MenuItems < ActiveRecord::Migration
+  def self.up
+  
+  
+    create_table :menu_items do |t|
+      t.string :name
+      t.string :slug
+      t.string :permalink
+      t.string :section_name
+      t.integer :section_id
+      t.string :repertoire_name
+      t.integer :repertoire_id
+    
+      t.integer :parent_id
+      t.integer :position
+      
+      t.boolean :super_admin
+      t.boolean :enabled
+      t.boolean :visible
+      t.boolean :deleted
+    
+      t.references :menu
+    
+      #polymorphic
+      t.integer :menu_content_id
+      t.string :menu_content_type
+      
+      t.integer :archive_id
+      t.boolean :archived
+      t.datetime :archived_at
+      
+     
+      t.boolean :password
+      t.boolean :comment
+    
+    
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :menu_items
+  end
+end
diff --git a/db/migrate/0005_create_menu_aliases.rb b/db/migrate/0005_create_menu_aliases.rb
new file mode 100644
index 0000000..3a549f2
--- /dev/null
+++ b/db/migrate/0005_create_menu_aliases.rb
@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+class CreateMenuAliases < ActiveRecord::Migration
+  def self.up
+    create_table :menu_aliases do |t|
+      t.references :menu_item
+
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :menu_aliases
+  end
+end
diff --git a/db/migrate/0006_create_menu_urls.rb b/db/migrate/0006_create_menu_urls.rb
new file mode 100644
index 0000000..ccf34a5
--- /dev/null
+++ b/db/migrate/0006_create_menu_urls.rb
@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+class CreateMenuUrls < ActiveRecord::Migration
+  def self.up
+    create_table :menu_urls do |t|
+      t.string :url
+
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :menu_urls
+  end
+end
diff --git a/db/migrate/0010_create_pages.rb b/db/migrate/0010_create_pages.rb
new file mode 100644
index 0000000..da58057
--- /dev/null
+++ b/db/migrate/0010_create_pages.rb
@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+class CreatePages < ActiveRecord::Migration
+  def self.up
+    create_table :pages do |t|
+      t.text :title
+      t.text :description
+      t.text :keywords
+
+
+      t.timestamps
+    end
+
+
+  end
+
+  def self.down
+    drop_table :pages
+  end
+end
diff --git a/db/migrate/0065_create_blocks.rb b/db/migrate/0065_create_blocks.rb
new file mode 100644
index 0000000..51882f5
--- /dev/null
+++ b/db/migrate/0065_create_blocks.rb
@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+class CreateBlocks < ActiveRecord::Migration
+  def self.up
+    create_table :blocks do |t|
+     
+      t.string :block_name
+      t.string :blockable_type
+      t.integer :blockable_id
+      
+      t.text :content
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :blocks
+  end
+end
diff --git a/db/migrate/0070_create_portlets.rb b/db/migrate/0070_create_portlets.rb
new file mode 100644
index 0000000..daf118e
--- /dev/null
+++ b/db/migrate/0070_create_portlets.rb
@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+class CreatePortlets < ActiveRecord::Migration
+  def self.up
+    create_table :portlets do |t|
+      t.references :block
+      t.integer :content_id
+      t.string :content_type
+      t.integer :position
+      
+      
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :portlets
+  end
+end
diff --git a/db/migrate/0074_create_block_contents.rb b/db/migrate/0074_create_block_contents.rb
new file mode 100644
index 0000000..3339cfc
--- /dev/null
+++ b/db/migrate/0074_create_block_contents.rb
@@ -0,0 +1,20 @@
+# -*- encoding : utf-8 -*-
+class CreateBlockContents < ActiveRecord::Migration
+  def self.up
+    create_table :block_contents do |t|
+      t.integer :style
+      t.integer :nbr_columns
+      t.integer :row1
+      t.integer :row2
+      t.integer :row3
+      t.integer :row4
+      
+      t.timestamps
+    end
+  
+  end
+
+  def self.down
+    drop_table :block_contents
+  end
+end
diff --git a/db/migrate/0075_create_title_contents.rb b/db/migrate/0075_create_title_contents.rb
new file mode 100644
index 0000000..fadbb59
--- /dev/null
+++ b/db/migrate/0075_create_title_contents.rb
@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+class CreateTitleContents < ActiveRecord::Migration
+  def self.up
+    create_table :title_contents do |t|
+      t.text :content
+      t.integer :level
+      t.string :style
+
+      t.timestamps
+    end
+    
+  end
+
+  def self.down
+    drop_table :title_contents
+  end
+end
diff --git a/db/migrate/0076_create_text_contents.rb b/db/migrate/0076_create_text_contents.rb
new file mode 100644
index 0000000..8ea89f1
--- /dev/null
+++ b/db/migrate/0076_create_text_contents.rb
@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+class CreateTextContents < ActiveRecord::Migration
+  def self.up
+    create_table :text_contents do |t|
+      t.string :style
+      t.text :content
+
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :text_contents
+  end
+end
diff --git a/db/migrate/0077_create_image_contents.rb b/db/migrate/0077_create_image_contents.rb
new file mode 100644
index 0000000..168c6c5
--- /dev/null
+++ b/db/migrate/0077_create_image_contents.rb
@@ -0,0 +1,25 @@
+# -*- encoding : utf-8 -*-
+class CreateImageContents < ActiveRecord::Migration
+  def self.up
+    create_table :image_contents do |t|
+      t.references :image_file
+      t.integer :width
+      t.integer :height
+      t.string :alignement
+      t.boolean :expandable
+      t.string :style
+      t.string :alt
+      t.integer :cible_id
+      t.string :cible_type
+      t.boolean :with_cible
+      t.boolean :popup
+
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :image_contents
+  end
+end
diff --git a/db/migrate/0078_create_link_contents.rb b/db/migrate/0078_create_link_contents.rb
new file mode 100644
index 0000000..29bc592
--- /dev/null
+++ b/db/migrate/0078_create_link_contents.rb
@@ -0,0 +1,24 @@
+# -*- encoding : utf-8 -*-
+class CreateLinkContents < ActiveRecord::Migration
+  def self.up
+    create_table :link_contents do |t|
+      t.integer :type
+      t.string :name
+      t.string :title
+      t.boolean :popup
+    
+      t.string :url
+      t.string :style
+
+  t.integer :cible_id
+  t.string :cible_type
+
+      t.timestamps
+    end
+    
+  end
+
+  def self.down
+    drop_table :link_contents
+  end
+end
diff --git a/db/migrate/0079_create_break_contents.rb b/db/migrate/0079_create_break_contents.rb
new file mode 100644
index 0000000..07fa1f1
--- /dev/null
+++ b/db/migrate/0079_create_break_contents.rb
@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+class CreateBreakContents < ActiveRecord::Migration
+  def self.up
+    create_table :break_contents do |t|
+      t.boolean :line
+      t.integer :height
+      t.string :style
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :break_contents
+  end
+end
diff --git a/db/migrate/0080_create_html_contents.rb b/db/migrate/0080_create_html_contents.rb
new file mode 100644
index 0000000..ed02343
--- /dev/null
+++ b/db/migrate/0080_create_html_contents.rb
@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+class CreateHtmlContents < ActiveRecord::Migration
+  def self.up
+    create_table :html_contents do |t|
+      t.text :content
+      t.string :style
+      t.string :content_type
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :html_contents
+  end
+end
diff --git a/db/migrate/0081_create_download_contents.rb b/db/migrate/0081_create_download_contents.rb
new file mode 100644
index 0000000..7ecefaa
--- /dev/null
+++ b/db/migrate/0081_create_download_contents.rb
@@ -0,0 +1,20 @@
+# -*- encoding : utf-8 -*-
+class CreateDownloadContents < ActiveRecord::Migration
+  def self.up
+    create_table :download_contents do |t|
+      t.string :title
+      t.string :style
+      t.text :description
+      t.references :data_file
+
+
+      t.timestamps
+    end
+    
+
+  end
+
+  def self.down
+    drop_table :download_contents
+  end
+end
diff --git a/db/migrate/0082_create_gallery_contents.rb b/db/migrate/0082_create_gallery_contents.rb
new file mode 100644
index 0000000..3def9da
--- /dev/null
+++ b/db/migrate/0082_create_gallery_contents.rb
@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+class CreateGalleryContents < ActiveRecord::Migration
+  def self.up
+    create_table :gallery_contents do |t|
+      t.string :name
+      t.text :description
+
+      t.integer :style
+      t.integer :nbr_img
+
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :gallery_contents
+  end
+end
diff --git a/db/migrate/0090_create_external_links.rb b/db/migrate/0090_create_external_links.rb
new file mode 100644
index 0000000..344c489
--- /dev/null
+++ b/db/migrate/0090_create_external_links.rb
@@ -0,0 +1,21 @@
+class CreateExternalLinks < ActiveRecord::Migration
+    def self.up
+    create_table :external_links do |t|
+        t.string :title
+        t.text :description
+        t.string :url
+
+        t.timestamps
+      end
+
+
+  end
+
+  def self.down
+    drop_table :external_links
+  end
+
+
+
+
+end
diff --git a/db/migrate/0101_create_gallery_images.rb b/db/migrate/0101_create_gallery_images.rb
new file mode 100644
index 0000000..715309c
--- /dev/null
+++ b/db/migrate/0101_create_gallery_images.rb
@@ -0,0 +1,20 @@
+# -*- encoding : utf-8 -*-
+class CreateGalleryImages < ActiveRecord::Migration
+  def self.up
+    create_table :gallery_images do |t|
+      t.string :title
+      t.text :description
+      
+      t.string :tags
+      t.integer :position
+      t.references :image_file
+      t.references :gallery_content
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :gallery_images
+  end
+end
diff --git a/db/migrate/0102_create_dynamic_contents.rb b/db/migrate/0102_create_dynamic_contents.rb
new file mode 100644
index 0000000..4385b7c
--- /dev/null
+++ b/db/migrate/0102_create_dynamic_contents.rb
@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+class CreateDynamicContents < ActiveRecord::Migration
+  def self.up
+    create_table :dynamic_contents do |t|
+      t.string :name
+
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :dynamic_contents
+  end
+end
diff --git a/db/migrate/0105_create_map_contents.rb b/db/migrate/0105_create_map_contents.rb
new file mode 100644
index 0000000..fa285d4
--- /dev/null
+++ b/db/migrate/0105_create_map_contents.rb
@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+class CreateMapContents < ActiveRecord::Migration
+  def self.up
+    create_table :map_contents do |t|
+      t.string :address
+      t.string :name
+      t.integer :view
+      t.boolean :info_bule
+      t.integer :zoom
+
+      t.timestamps
+    end
+    
+  end
+
+  def self.down
+    drop_table :map_contents
+  end
+end
diff --git a/db/migrate/0110_create_table_contents.rb b/db/migrate/0110_create_table_contents.rb
new file mode 100644
index 0000000..b5df572
--- /dev/null
+++ b/db/migrate/0110_create_table_contents.rb
@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+class CreateTableContents < ActiveRecord::Migration
+  def self.up
+    create_table :table_contents do |t|
+      t.integer :style
+      t.integer :nbr_rows
+      t.integer :nbr_cols
+      
+      t.timestamps
+    end
+  
+  end
+
+  def self.down
+    drop_table :table_contents
+  end
+end
diff --git a/db/migrate/0112_create_table_rows.rb b/db/migrate/0112_create_table_rows.rb
new file mode 100644
index 0000000..c415836
--- /dev/null
+++ b/db/migrate/0112_create_table_rows.rb
@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+class CreateTableRows < ActiveRecord::Migration
+  def self.up
+    create_table :table_rows do |t|
+      t.integer :position
+      t.integer :style
+      t.references :table_content
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :table_rows
+  end
+end
diff --git a/db/migrate/0114_create_cel_tables.rb b/db/migrate/0114_create_cel_tables.rb
new file mode 100644
index 0000000..710be0f
--- /dev/null
+++ b/db/migrate/0114_create_cel_tables.rb
@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+class CreateCelTables < ActiveRecord::Migration
+  def self.up
+    create_table :cel_tables do |t|
+      t.integer :position
+      t.integer :style
+      t.references :table_row
+      t.references :table_content
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :cel_tables
+  end
+end
diff --git a/db/migrate/0200_create_albums.rb b/db/migrate/0200_create_albums.rb
new file mode 100644
index 0000000..a91a414
--- /dev/null
+++ b/db/migrate/0200_create_albums.rb
@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+class CreateAlbums < ActiveRecord::Migration
+  def self.up
+    create_table :albums do |t|
+      t.string :name
+      t.boolean :super_admin
+
+      t.timestamps
+    end
+  Album.create(:name => "Photos diverses", :super_admin => true)
+
+  end
+
+  def self.down
+    drop_table :albums
+  end
+end
diff --git a/db/migrate/0210_create_image_files.rb b/db/migrate/0210_create_image_files.rb
new file mode 100644
index 0000000..1836405
--- /dev/null
+++ b/db/migrate/0210_create_image_files.rb
@@ -0,0 +1,22 @@
+# -*- encoding : utf-8 -*-
+class CreateImageFiles < ActiveRecord::Migration
+  def self.up
+    create_table :image_files do |t|
+    t.string :file
+    t.string :name
+    t.string :slug
+    t.text :description
+    t.string :tags
+    t.references :album
+    t.string :photograph
+    t.string :cible_type
+    t.integer :cible_id
+
+    t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :image_files
+  end
+end
diff --git a/db/migrate/0300_create_file_folders.rb b/db/migrate/0300_create_file_folders.rb
new file mode 100644
index 0000000..3c41668
--- /dev/null
+++ b/db/migrate/0300_create_file_folders.rb
@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+class CreateFileFolders < ActiveRecord::Migration
+  def self.up
+    create_table :file_folders do |t|
+      t.string :name
+      t.boolean :super_admin
+
+      t.timestamps
+    end
+  FileFolder.create(:name => "Dossier principal", :super_admin => true)
+  end
+
+  def self.down
+    drop_table :file_folders
+  end
+end
diff --git a/db/migrate/0310_create_data_files.rb b/db/migrate/0310_create_data_files.rb
new file mode 100644
index 0000000..a7507a7
--- /dev/null
+++ b/db/migrate/0310_create_data_files.rb
@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+class CreateDataFiles < ActiveRecord::Migration
+  def self.up
+    create_table :data_files do |t|
+      t.string :file
+      t.string :name
+      t.string :slug
+      t.string :token
+      t.string :description
+      t.references :file_folder
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :data_files
+  end
+end
diff --git a/db/migrate/1010_create_tags.rb b/db/migrate/1010_create_tags.rb
new file mode 100644
index 0000000..8638ec2
--- /dev/null
+++ b/db/migrate/1010_create_tags.rb
@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+class CreateTags < ActiveRecord::Migration
+  def self.up
+    create_table :tags do |t|
+      t.string :name
+      t.string :slug
+      t.integer :parent_id
+      t.boolean :public
+      t.string :taggable_type
+      t.integer :taggable_id
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :tags
+  end
+end
diff --git a/db/migrate/1020_create_tag_taggables.rb b/db/migrate/1020_create_tag_taggables.rb
new file mode 100644
index 0000000..52efe65
--- /dev/null
+++ b/db/migrate/1020_create_tag_taggables.rb
@@ -0,0 +1,11 @@
+class CreateTagTaggables < ActiveRecord::Migration
+  def change
+    create_table :tag_taggables do |t|
+      t.string :taggable_type
+      t.integer :taggable_id
+      t.integer :tag_id
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/1030_create_categories.rb b/db/migrate/1030_create_categories.rb
new file mode 100644
index 0000000..cf28d3f
--- /dev/null
+++ b/db/migrate/1030_create_categories.rb
@@ -0,0 +1,19 @@
+class CreateCategories < ActiveRecord::Migration
+  def change
+    create_table :categories do |t|
+      t.string :name
+      t.string :slug
+      t.boolean :enabled
+      t.text :description
+      t.references :image_file
+
+
+      t.integer :position
+      t.integer :parent_id
+      t.string :permalink
+      t.boolean :front_page
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/1040_create_articles.rb b/db/migrate/1040_create_articles.rb
new file mode 100644
index 0000000..11a4fe4
--- /dev/null
+++ b/db/migrate/1040_create_articles.rb
@@ -0,0 +1,23 @@
+class CreateArticles < ActiveRecord::Migration
+  def change
+    create_table :articles do |t|
+    
+		t.datetime :published_at
+		t.string :title
+  		
+		t.string :slug
+		t.string :tag
+		t.text :description
+    t.text :keywords
+		t.boolean :enabled
+		t.references :image_file
+    t.boolean :title_cached
+		t.string :tags_cache
+		t.string :tags_cache_slug
+		t.integer :category_id
+	
+		t.timestamps
+    end
+   
+  end
+end
diff --git a/db/migrate/1050_create_comments.rb b/db/migrate/1050_create_comments.rb
new file mode 100644
index 0000000..57d8f77
--- /dev/null
+++ b/db/migrate/1050_create_comments.rb
@@ -0,0 +1,22 @@
+class CreateComments < ActiveRecord::Migration
+  def self.up
+    create_table :comments do |t|
+      t.string :pseudo, :default => "" 
+      t.string :email, :default => "" 
+		t.string :website, :default => "" 
+		t.boolean :enabled
+	  t.text :comment
+      t.references :commentable, :polymorphic => true
+      t.references :user
+      t.timestamps
+    end
+
+    add_index :comments, :commentable_type
+    add_index :comments, :commentable_id
+
+  end
+
+  def self.down
+    drop_table :comments
+  end
+end
diff --git a/db/migrate/20141208202946_add_infos_to_admins.rb b/db/migrate/20141208202946_add_infos_to_admins.rb
new file mode 100644
index 0000000..91f3164
--- /dev/null
+++ b/db/migrate/20141208202946_add_infos_to_admins.rb
@@ -0,0 +1,7 @@
+class AddInfosToAdmins < ActiveRecord::Migration
+  def change
+    add_column :admins, :avatar, :string
+    add_column :admins, :password_digest, :string, :null => false, :default => ""
+    add_column :admins, :remember_token, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1dd0fb1..e610566 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141121211542) do
+ActiveRecord::Schema.define(version: 20141208202946) do
 
   create_table "admins", force: true do |t|
     t.string   "email",                  default: "", null: false
@@ -30,11 +30,21 @@ ActiveRecord::Schema.define(version: 20141121211542) do
     t.string   "name"
     t.string   "firstname"
     t.string   "file"
+    t.string   "avatar"
+    t.string   "password_digest",        default: "", null: false
+    t.string   "remember_token"
   end
 
   add_index "admins", ["email"], name: "index_admins_on_email", unique: true, using: :btree
   add_index "admins", ["reset_password_token"], name: "index_admins_on_reset_password_token", unique: true, using: :btree
 
+  create_table "albums", force: true do |t|
+    t.string   "name"
+    t.boolean  "super_admin"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "answer_sets", force: true do |t|
     t.integer  "question_set_id"
     t.integer  "survey_item_answer_id"
@@ -59,6 +69,101 @@ ActiveRecord::Schema.define(version: 20141121211542) do
 
   add_index "archive_newsletters", ["newsletter_id"], name: "index_archive_newsletters_on_newsletter_id", using: :btree
 
+  create_table "articles", force: true do |t|
+    t.datetime "published_at"
+    t.string   "title"
+    t.string   "slug"
+    t.string   "tag"
+    t.text     "description"
+    t.text     "keywords"
+    t.boolean  "enabled"
+    t.integer  "image_file_id"
+    t.boolean  "title_cached"
+    t.string   "tags_cache"
+    t.string   "tags_cache_slug"
+    t.integer  "category_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "block_contents", force: true do |t|
+    t.integer  "style"
+    t.integer  "nbr_columns"
+    t.integer  "row1"
+    t.integer  "row2"
+    t.integer  "row3"
+    t.integer  "row4"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "blocks", force: true do |t|
+    t.string   "block_name"
+    t.string   "blockable_type"
+    t.integer  "blockable_id"
+    t.text     "content"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "break_contents", force: true do |t|
+    t.boolean  "line"
+    t.integer  "height"
+    t.string   "style"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "categories", force: true do |t|
+    t.string   "name"
+    t.string   "slug"
+    t.boolean  "enabled"
+    t.text     "description"
+    t.integer  "image_file_id"
+    t.integer  "position"
+    t.integer  "parent_id"
+    t.string   "permalink"
+    t.boolean  "front_page"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "cel_tables", force: true do |t|
+    t.integer  "position"
+    t.integer  "style"
+    t.integer  "table_row_id"
+    t.integer  "table_content_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "comments", force: true do |t|
+    t.string   "pseudo",           default: ""
+    t.string   "email",            default: ""
+    t.string   "website",          default: ""
+    t.boolean  "enabled"
+    t.text     "comment"
+    t.integer  "commentable_id"
+    t.string   "commentable_type"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "comments", ["commentable_id"], name: "index_comments_on_commentable_id", using: :btree
+  add_index "comments", ["commentable_type"], name: "index_comments_on_commentable_type", using: :btree
+
+  create_table "data_files", force: true do |t|
+    t.string   "file"
+    t.string   "name"
+    t.string   "slug"
+    t.string   "token"
+    t.string   "description"
+    t.integer  "file_folder_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "donates", force: true do |t|
     t.date     "paid_at"
     t.integer  "amount"
@@ -71,6 +176,36 @@ ActiveRecord::Schema.define(version: 20141121211542) do
     t.datetime "updated_at"
   end
 
+  create_table "download_contents", force: true do |t|
+    t.string   "title"
+    t.string   "style"
+    t.text     "description"
+    t.integer  "data_file_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "dynamic_contents", force: true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "external_links", force: true do |t|
+    t.string   "title"
+    t.text     "description"
+    t.string   "url"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "file_folders", force: true do |t|
+    t.string   "name"
+    t.boolean  "super_admin"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "followed_topics", force: true do |t|
     t.integer  "forum_user_id"
     t.integer  "forum_topic_id"
@@ -167,6 +302,77 @@ ActiveRecord::Schema.define(version: 20141121211542) do
     t.datetime "updated_at",  null: false
   end
 
+  create_table "gallery_contents", force: true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "style"
+    t.integer  "nbr_img"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "gallery_images", force: true do |t|
+    t.string   "title"
+    t.text     "description"
+    t.string   "tags"
+    t.integer  "position"
+    t.integer  "image_file_id"
+    t.integer  "gallery_content_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "html_contents", force: true do |t|
+    t.text     "content"
+    t.string   "style"
+    t.string   "content_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "image_contents", force: true do |t|
+    t.integer  "image_file_id"
+    t.integer  "width"
+    t.integer  "height"
+    t.string   "alignement"
+    t.boolean  "expandable"
+    t.string   "style"
+    t.string   "alt"
+    t.integer  "cible_id"
+    t.string   "cible_type"
+    t.boolean  "with_cible"
+    t.boolean  "popup"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "image_files", force: true do |t|
+    t.string   "file"
+    t.string   "name"
+    t.string   "slug"
+    t.text     "description"
+    t.string   "tags"
+    t.integer  "album_id"
+    t.string   "photograph"
+    t.string   "cible_type"
+    t.integer  "cible_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "link_contents", force: true do |t|
+    t.integer  "type"
+    t.string   "name"
+    t.string   "title"
+    t.boolean  "popup"
+    t.string   "url"
+    t.string   "style"
+    t.integer  "cible_id"
+    t.string   "cible_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "mail_archives", force: true do |t|
     t.integer  "newsletter_id"
     t.integer  "archive_newsletter_id"
@@ -184,6 +390,61 @@ ActiveRecord::Schema.define(version: 20141121211542) do
   add_index "mail_archives", ["person_id"], name: "index_mail_archives_on_person_id", using: :btree
   add_index "mail_archives", ["sheet_id"], name: "index_mail_archives_on_sheet_id", using: :btree
 
+  create_table "map_contents", force: true do |t|
+    t.string   "address"
+    t.string   "name"
+    t.integer  "view"
+    t.boolean  "info_bule"
+    t.integer  "zoom"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "menu_aliases", force: true do |t|
+    t.integer  "menu_item_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "menu_items", force: true do |t|
+    t.string   "name"
+    t.string   "slug"
+    t.string   "permalink"
+    t.string   "section_name"
+    t.integer  "section_id"
+    t.string   "repertoire_name"
+    t.integer  "repertoire_id"
+    t.integer  "parent_id"
+    t.integer  "position"
+    t.boolean  "super_admin"
+    t.boolean  "enabled"
+    t.boolean  "visible"
+    t.boolean  "deleted"
+    t.integer  "menu_id"
+    t.integer  "menu_content_id"
+    t.string   "menu_content_type"
+    t.integer  "archive_id"
+    t.boolean  "archived"
+    t.datetime "archived_at"
+    t.boolean  "password"
+    t.boolean  "comment"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "menu_urls", force: true do |t|
+    t.string   "url"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "menus", force: true do |t|
+    t.string   "name"
+    t.string   "max_levels"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "newsgroups", force: true do |t|
     t.string   "name"
     t.text     "description"
@@ -223,6 +484,14 @@ ActiveRecord::Schema.define(version: 20141121211542) do
 
   add_index "notes", ["admin_id"], name: "index_notes_on_admin_id", using: :btree
 
+  create_table "pages", force: true do |t|
+    t.text     "title"
+    t.text     "description"
+    t.text     "keywords"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "people", force: true do |t|
     t.boolean  "newsletter"
     t.string   "surname"
@@ -270,6 +539,15 @@ ActiveRecord::Schema.define(version: 20141121211542) do
     t.datetime "updated_at",  null: false
   end
 
+  create_table "portlets", force: true do |t|
+    t.integer  "block_id"
+    t.integer  "content_id"
+    t.string   "content_type"
+    t.integer  "position"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "question_sets", force: true do |t|
     t.integer  "survey_item_id"
     t.integer  "survey_set_id"
@@ -374,6 +652,48 @@ ActiveRecord::Schema.define(version: 20141121211542) do
     t.datetime "updated_at",  null: false
   end
 
+  create_table "table_contents", force: true do |t|
+    t.integer  "style"
+    t.integer  "nbr_rows"
+    t.integer  "nbr_cols"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "table_rows", force: true do |t|
+    t.integer  "position"
+    t.integer  "style"
+    t.integer  "table_content_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "tag_taggables", force: true do |t|
+    t.string   "taggable_type"
+    t.integer  "taggable_id"
+    t.integer  "tag_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "tags", force: true do |t|
+    t.string   "name"
+    t.string   "slug"
+    t.integer  "parent_id"
+    t.boolean  "public"
+    t.string   "taggable_type"
+    t.integer  "taggable_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "text_contents", force: true do |t|
+    t.string   "style"
+    t.text     "content"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "tiny_urls", force: true do |t|
     t.string   "url"
     t.string   "slug"
@@ -385,6 +705,14 @@ ActiveRecord::Schema.define(version: 20141121211542) do
     t.datetime "updated_at",  null: false
   end
 
+  create_table "title_contents", force: true do |t|
+    t.text     "content"
+    t.integer  "level"
+    t.string   "style"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "topics", force: true do |t|
     t.string   "title"
     t.text     "description"
diff --git a/public/logo_pic_vert.png b/public/logo_pic_vert.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bd117ee0cda2ff69851478fa800df0aa9bc283e
GIT binary patch
literal 31338
zcmY(r1yoeu_Xm21PC-H%Mx_KKBt)q}3{Vl27?6@i8p$Dt7L_nS1qlO`E&=IOknRwM
zM!I9@dFSHy_kZuXmbw=Ap0oGa`*U`D&bdTr-n&Ih#ZCo55UrZ(^#>3{MhrnjrW9o0
zC-#apA>cnsXH|Vy2r|40|3xspQBejzWOKWr=ceUk<>qPn#1c}ra5A$*syUciTRyNf
zwZORiwv>k;3|{TJvbNWsC0u}W;<lf_zL-RVlErxgO+%HMXM5_;mLUepgocg8Yu#3L
zFCV)O1zKsc|A|?~naO-fEHBi*K2%=l@OrX!WM~EV>bkwhs#K4RYydCLYW1!~TA_Nk
ze%_G7gG8DL`;chTs5}vaIFXjJSsyp17wdFtib_d5x#+*|!v|j_%^vtAo&Vi&;H#AU
z+{(&|2!i&sMNVajuFAYE$=T>P#!V8O6nYvp)YU5wlkkV#?pCKD2x%lLLkix!FLLU8
z_z*e4b$EZze}%(|lU>evye7ALR-xMB90GzK++>BI7}Gw_W6#)<mAsm8f-8{0Z|vtz
zD9F#xAG^pzRo*59L8yHSVAxA(?2sF}q%PDqJ3T$UtI`Kw6o>CPLlvr6NDZdB$1=|b
z{`3Dz0x8Tm+__lwcW!QC>HxnQV7;e=XQB#ivjWeNm02_pq?-OP2a@e;ZEdwkcY8EH
zH)lgbbhF+ba~3$~!ChFXOFt)3=yyg4dKGN{L;vNe#%LbQcHfb(06+iV<8PUof}EEY
z!OQdf@N9u*E-4DFiicy|XSztd6wUNgCMG6gdwP0Y1Gdy?gTYD*lsg~@OCo%R{O>-*
zwBY_itC=WqzcJs`Ia(M@6GK}E9*3mw5Y17#8<L98?ygTY!e-b2@7-XBVP)~+5`YdR
zFlht%ngrza?Q~;i9O*;<+xjUsPMzXFXQXQgkfg3Fa%wANC>AnccW<4T7^rJ%YLe49
zn9>vYW>EhKNLe}!;3=hi{thB>;rftpE{&1zL;aL1!_qY1=S}>kz}&>l&xw~!WuUnW
zPT7(2JA;ESHHBhD6|+S;KZr2{d!s3Uv;--7GROvd6HhE_R3y?lbiAJsdhO$|4uD9L
zs4&oY;hP@koY1Pb3h@ErgRQOY!gOb6=Bn%+ps>a}qg1eLRG2<+i6(iQ4V7=%`ue)K
z)Rry$Tu_E))KHL#%t!+0YhQQ?f>OdV&Z3-b9%+qBUh!Ic<aM+iJbRGm2rL4j6k%}K
zA}^e+`TbhJ+8ARw_vwewxV)miAk)6l6)=M@P!ux6ehGo@14VDl3Q|kW4qf}$IlBPt
zH65M={-uUNeX8&XDh?+Jfx6^dh;Ecqg<gA`304{-rVGZmYDtp}8si?mcD^T|kwkNV
ze_J;=IOwbBtASbc-~&@^+yXujr|WxylDl^88rH_l>=F$vZ76{1p6{*=X7K_ORk)!#
zQ0MSIKLs?-`Kp(3T>Jcarx1XZP~T=B>d-nzG!rmvGK^5!;4fhiwFuDkbr4u2)|V0J
z@ZntgS=9HM0+ef&HdvgYKKwun%!bsyhRxZ?5#tpnd3y8Kt@^b!J5z6O@3YA}_8&Fp
zT-<?rdBBQIMYa^32BXEi>xTfN#N=VZrZq&%7o3KTOo5DZz-d@Rp)=$%Z#}^hRIq|^
zq(ZT`XO0@KDM|B_FNa>6h!Lg*2Dh*TMiB-Z#OIw6<(lTJ4%e5KfkMd-N6ScnAn3zw
zV2J5!`LcOeTf?Ae{v$(k3h_&q3I;V+fep%yT);c`_`n)3WwR66=Q?JqDGmTD0p~B6
zH50Y%S$xzSoX-G0b-oJJiqQvx0A6VG6z6BJ%6NR~=6Q75GVrgw0c-(xFjxC^AkX4n
zzHFz?=yoU*a35(L=`%C>&Z%a25}7(+Q^{vP1KVbBQ5(g4w6i`N)4%gPSF5NmP%|x4
z7V^b_Nyf9l=0Po-0Kb^CQ|0lMSpdk}0a$85YNnsa6nMu!VF52Xi^B62b@y`aYLnA(
z)8tnBuU)Hd1r9z<0v?O=z>j0WW3PK6)LYHMDzQ2U7C|zE%Z(aGPa^Qf=2@`x2dRHJ
zWp_vi-=u9Oy?aNaqM~AIYnyS##IYO+UcrXKh)vgArUv2X+Mjkmi|I&ld3nQ3G5l{B
zw^87oM`vM$KP7gvj7NM=^bw){9uRQhMPy{(!X1A#dhkMxnW2=Vr1=>Ldp%=^^l2vI
zVUNd(v?w)`0<fI-2s3y^BupGcuMf5+*im4Z$XTVUSJ}hDO{hWSD%yW_vH|3P39&yP
z0F0@=uvJU>!7%<&Dk(sO+HJhXnUCh%M}?W}VI1&!&56npnjrXu4UIzCkL3w^XTE6*
z#o`%@4htkG=7a$JN6rGFh7`c7o!Wh`P<}HGeh(YPflnDodh<jynclK&QNSkpMhd^e
z^b<zdMM`beO<6N1?8}!g9|jDuk~A<Q%5fLKTfISKbr4EL=YYtb?t&;Kle)Tk=*N#}
zJEJo;?LMSHC#d&TEU-~M({tkd(~gD!L2Xm4JUqE12w;Z)HWp;74$#wURK%-kf*F3b
zlg}ydC0=p7U+e9+$4atQY7VO-4b;&@19hA*`0IZfT>yU8{(08@90(9liX-d`BOu4f
z)I+*v|9iA0*!@exCAr3yfuF4Z>GB%b`dd1%;UG&&Oz8TH7Zs<&!owFaPl1>pphSSa
z3BY0`fnkPQ4D9|iGPDpakC{-Jo11UTzd(W)uwgJPSh5~62<DItz6o7#C_w#(oTTs*
z^mU4}w6(UrBZVH_2Y~N0l_BvG6gFq);-amu&+RKzLVf?LDQNFO4vf<&2uHQ&4^FZL
zGDVttD#9}G6env=2*SPiYlVAhFpy}&3slNO_L0>BU)|CD#neI+dpmW*|I=uA1_=TV
z2y&D_ubbZCz#)G#{~&k2o>ft<0SP0|X-rWW%mBT&0@1?R_}>(Male>-h+n*TAvLKP
z1V4?3W5oxZGaMwh@|9{vD{1v<=_z3d*uZ<=`6jTrC)oR)@u@D6(b3_+z4cpLZs$)4
zz-C9D24=4@u*g?l`w&b{7dBv`H2AIlWVk8~7{2EEbFyY<Bj>V(y)^3oHY4qc%aHeB
zm(d_(!iV~xgaVo3h=||fQc_H5X=&{4swbL9oTq`XA3)0XZYdWikS%`s@^anUn)7+O
z3n#)~f(c@@fP$b*0MN2Ce|}=WQ=dP7j+D<r0{yTJ3}g_h9l#>9-rfXzt5CM;e|zG8
zZ(Ijq9TjDPkw!70iD>Am&!m0*%7M}QCtm=_=WN=y#R`T&=g*&yR9q^YarhS?zQE&t
zfoO#TfJ51xX}l~g%^VhH?BJ%KG6(0jsZ(I%B57eA@AvgVelyuIeG*a8(dZy7*;~?Q
zBnY72muCQymjo9x5ug5Nz85M=AZ>c%fX|>W5%6PPx=h5qBzZQFSHBeqrBI%v)se^W
z^GNvlIq;mHpTEAdQ!`Zq6&x8?l6383UQZ$b7mA&d7(&i$<gp{!*)Zp6=;$s_b^Z$l
z<v0g;hFCDe0}(L8zjRa&3Ngu3)c}1gRH4eA9N?A5puoa1WdOY2ALVY|kTus&d62F>
zsv$MCHbzsJ8hEO73cRH%2i*PTE=U2)R%qg^jt$wV+gP~x0br3lMMwo2;c&1<x}a7-
z@?~TqyjzAp>+{&rAa35g8SgTu_uR$@WJ=dYV3!!aI=H5*$Rc|eA5W#Ck}H!bqPaxZ
z`T0K37Si83r3FF1;VLW6bBvaaj_6loW4%Ve)xj*}_|Qf_-w8M}K@P`;z`67vz7+fa
zUkeLUgG7N6g*6ETyL7N(XFe->bNcsdQ^N5BRt^rkUlU-JE7v}X&qcvbT!fv71V97n
zmNt)X(LC{A#)wr!(4IjPF9|YHRj$Ya)i$ny%>-A7Zs9{<M=zRladBm5QP>0-nHH<9
zrO1KG94im1Kh$dg8~{lQ&8B@lAnK$LKn4FK-T}ol*T1P$!Bpy?C~^xOLO$~AZ)E@9
z&hHA3szglMVsZc8gZHmG97N(gHKt9o%*}5JDc1n2f2KS7G75BpkiZaOU=#f_#D@6j
zznWC_GaW|@5$tDwPfqY!$Qo?cNG&ka8_%P&<jSZeIygsLks!uIoR)*&sk~l;aNY@F
zY#BIz9zzE^%XT;QQyQfxfn%{H@P<g7Nmp~0y0meVm7Cjf%M>3rRDg;n0XD2*6J#WT
z+_fDT4skKTNMsx-JG*xgn=*(B-}UL?xvi}M<a?C?g17;K?0?sL{U6fyJDZ6BENbL|
z$5MU)kFAJvkbM7ZS^;*tsn>4NO*}a(ZJ}l0J`S#Ioc#fMzI`-vK~~*4>Z*8g`G0#i
zX`^39km(;@ANd2HY7+MqpyXPH)8t=V-XR|>_cW1gCh|)M0ooIWVND&7H%<gxr7&Y;
zcsk~J0cvV$D)wfrx*+xUN=?D76XZXd05j#Of<U(*&Os#q=B-5Zzr@1fH&|&}tOSY<
zE})f26u|D8k9wSgoK^`WvuPro$49B+GBW*hDyvk5%GhJr2F?h0E)+(XT1rBK?RM&`
zlb^<zfd%Pd!Gb_B_t*0Ov+Adc=}PdpUU>4qU~(I=RgbU_Z$R;-pTbHer6>RB?a36H
z24D)=XwW6eweFBN-Ox|@SMS+^1%m?YKk=I8tKy`Pv&YYqJZspbMlY_Y$nC%1Qwu=Q
zL8g2nDiT1zne1e_24`&U82^(0&)vU1@(43g$&J7jp{5cnPaRaCS6aysi!A%4>!$mG
z#Pxjy#kIKbMUKmkRKn=u5WCz;nfp@;m<@|mC6Kf9KGSg>5O0A_F>&Q8nB`k8-0`*&
zLE0xiz@a;~C0ywaO}rm#Sn?1EOTmPJzwR%J>~blR_gby%j689DTkH4k-VJ+@-ut2e
z<<nwNa<dl9)5%%~^2h~ukMD0im-`4DcP8u=XL2v23HJ96f4El4DJphyWgUBFZCCj?
zR<Do;j3pPBUN}R(-&`Jk@2F70$Cyg2`tZq2V8BTAR`(t0E4p{?-0@l|b&_(2eGv<p
zdwZ94h4%}Bod~gm<~0WKRbhNJV@1QSlZW8w$9T^H{qAB(p(~E=*k3$-6TM8=N!Vx+
zbBg!b<ta%%oEC6bSn;gdysXaQ`oC~!O&xkI8hsH=C>19TAt&x(I+gIwgx>H&m$CR)
zALT(0k$X@(CNPN`U$%5P?$0qgSU1@XHQ5~_3=sBBXqP`1n%0M{@f_DD%lM9*WcGvj
z`)35b3jl7tb-<29O@Z7HpVd3$vafQyqgA}k#^GqsI$Q*=f9>k}^768aV|m8#U#kuW
zr&UJURW=w4aDoF{-V0X(;)Y_b7tqfp>bW`sW&Y->Tv=TL-Qg_vvD5D%sRkXIe0xow
zO1j?BQSMnE$2-09P9s0^CzNZNnmA&s$kjC|u~JlU-1u8?32f>Nx})LD;gNvc%aTs{
zMRBxY!^6Yq@XI`hjSgB5$hkSl1D5Rw7qSdX3(huzG{3Vd77F+YE1JtPR4bxPRKboI
zSQWVIJv0C2;jz&~+lFF7YimWrl|_>!f#e4p){e>Xc{9`|yHjDL2u8-&AGL*~GnG*G
z++4v}6-Q5aw4x~pG1@$b9kKX%s(IUygzKB4Y?1?W_&22*4v$kCc?kADcK+CLJju$>
zKOc)sp*%u-I`Pvm96w*FutLu9TI~BCi3Rxa>f&}*GVPY54_EQ(PFn`T$-50sAwDam
zU(YtObNgR}3oy$MXk)gd)j4{&Ye98W5MxI&s}`$;EB5FgrYG-vd%$qX+m9k>%_>UL
z9cy^vah~BCzLSjZO81uN;PThh*SBK5TJuf7=RxP?yL#m^^2=w)fk~%9iYaw%t|yeL
zyN;1vQIwS2>*R16ks2K3UTm5*E4o2Lq=+wVT=f4i$n$8d%1<4%VZqo)4(n?z_QE0l
zp77q|jTVQR<mm{nr=ovFiEznF_*onODu*%kzC->2e(FV3RM^qM9d$PIJ9j8bDy;cM
z40QLZeg5>j*|CE53Zmqtfi8W0xLKW9=1xvWV4PT-YOE{a=YJwO%1YupK^?%Un`5Y7
zVh$>3@>4YEI;_=G<(gmWlCiM}oud^uFoP;!LSiWUJPDrYl8aWn`c(=Nr#(2Yyh>Ov
z{{FpJf#Sc~AS{BPRK#u|%(*^N@+-lmx*U$SujW6!f6rD3eR+^x_*uAu4f4VVT>Ht4
zz|auoRPOvK<2o-x5v7ch+$X+{Hj*9|*>!WUD-(Ot2=9wafD-v~JH60+Wg=kYVVi2f
zQ9`|WsSs`NQ{?z~ZSchQ0G*7(3m0jWA+s}C`N%pD7h_llA-giR2>|^pt*Tc!-@m7<
zR=Ub=EUOrsATc0E@$?8`_Iey3_U~bx^SV8~^N^+WQB2~BFT74suuj!JW=KI9in%Iw
zPd#)@PU;~g$;PKq<(h^D3&Ggi>Wg&r|2e4C0J&9u0J0OZbc+UJP@zn5drn74zT*A8
z`#e&kKd18C*3M4<MGDq`Er)cr66*gP<k3zyJY1Ysj>`mMp;s-<P)hpkM6QJTB`QcA
zt0j^{=C!b<Cn!B1=w4_)nD?>Z+@qQ1Soghs2@+N|w#R>V&FJ%7dhS|U)?l`L;Pw?&
zKuL@ZlS`!oMSk(`7heVf=jYe9UVfg~`~7<)@+hZ#l!rUua2>D`AOZoRD-?9}X^~<w
zlu-&qf7PmCEmUPqp-%DC_NW~3a;ovOg)bfRc{N4Iw`QlNN*8Fwt%r*pCM1(FUqnsh
zcF0-T*{QU&+U%+-YLLhUd<GbgwE%U8yN(fQC!-Y_AxQiNF_!d>qJxvG!$=L#SX5DG
zYZUM!T5ofC4v3e=Ol%ie%_->Xv820J!|^LB#(@2TV(jan6j5M^<ryQVP8wOs4Nju#
z+m1|}Dp-(1d(H)6zl~)AWI(SpSfO5RfQ%fLnlptjX)$z&Pu}>G!r`4@hii{Nn;=0Z
z&t>YajsD2m7NA5y;S3r^mZdjgHI>R2Qtm$WgR0!^&-oq=<{O4XT>^^h95c&|?t6bg
z0|lr#)3OLx-$3P>q+)4YurZ+Cpcvme=uub3*_xe&G$u_l&UZ;USww@<SKhb$s`>g1
zfJ#3_Jwc{_X7Rt8BSHQby^LdgItkHp3mq^X`Vt}z>E&tdBjhb)3eLt6?dxKECU)Qa
zrdUth;7|d9-Cg*EN$5Es?nP2O1?2}2%D~b#eVCYBb4ZCOnE9EWe)|G46B^A(vJ6aX
zcI9p%k_LS&Qv!+8kDZ`kY$ez^!?+V=Pl1MZmXD+<iYHn2zCL2@aC&_NPb7=`Q-lry
z(bEvuOvLw5sb)!5<;TRY_z)#sQXmcW3`D*{2BI$}zKsOx#%MJ6akaQKA0+#{e8oG!
z>u|ks@xd9v+t&iHbMf0}vrJ41b&!55aKu%mvkbzPoF@8WAVOfYBUFpK8`5DnpQ;C$
ztEC*Q4C}tlO@4C>-8ZDAN0atGWq`|<m`gxKCG^6Qp3$g-n3Kl4NVlh!0h8rNQ{~4~
z0Y1A*0UR>+6v+o8Qxkvea<f|oGynlL$b#G<|7J>0f8nIXzW};YA%K=jQyB^yX^!6v
zJR6Nql-556Jl?ku)IBDs(H)D`6gv#pSu1X;;;N4Sk+<=qJV-JG$L02rxIbv61y>ee
zX;c{~imw1|<^Ts4*q;#jH-he9N`)}l8=-miijiL<K~4JDP9%<WVR<>*;Pv?2|H6-7
zmOBm68<?rVGJ*8@B%^mIzqDfb{%G;L$X^MWi#%g9V3Fbb8J@4lL5TmatJ&8xczEr{
zjDn=;P(hh5hA#*h1Q{BFh>`58f+R>fIe!F7Z961+U#5%#{iLvEU_6fJkw?W@`w=NE
zeKt)2xe*vrF^Y9i)5{0ex0Wb7Ikrf@m6uvob?_u_tyM>W5GRnlL~Ca^qJY;{o2R2M
zDsIoA_-0O@_tilipCSkEh;BgAUeUZr*^3^Pc^|ot@qcouLR?yBln1>dfKXhI82gq*
z@$KuEE%K*kqb~K4?yJPTv+eLg-5AJFVLEq+w&O}}wcYe<fRKRh2jjY86i$P%_o<tA
z7k1gOgjoO<^iyyrd+paq3=-Kb2E;-SK%c~>158a-xH@U%Bx5Ta2kr0gN+3`~I6pk@
zB*r+Z2YvppE<Oh`!@wJpiN%4-(~2Xh*WniB%Uf}91X9MHl3T&tdUF|U##3YQ??jv!
zZ$o^V_6&!m9SYnlWs5mw+}0p5GmzXBnC1qo-@@Rj2{*qLDKLYom?>nT3R03>t72Xc
z^2be()9zD3QiyvwksO!9Mn?q}%Kooa7qA+kJw;@u!28cpKY^nVy2QP@hNNq=jZvXa
zTnU<Fg0-L#97OI`9TfL%%c?EXIlJr$;4hZ6hV=K*DlD~wKoWjZkjEI;L8@0O5w-#{
z#K-&j=DLV4HDR<ILY9FGL%g!L9|mAqN$f{t86WD(9CrGhRNty4&#fvJnIB{VaDA@u
z>Afpr>^mD^2o7YRN~qfu1m;-&+HD!osO&5czkPQMsnZbc6lc#ndd{9;8>G<-+6zmd
z-x*6U|7|Z4^#C=`*g~|uvl9l#tRuaAUbqJ$iBt$N7?os<yJ*)uaWLWs%oGDUIMw$6
zVj370G>HvE1%(8O*WWp>)C=PCE(1oZbkR!3UbqC3TM{IyV1EK`m*aAqwl0~JTCyDM
zsBRFaFWh%v00BI_^;cb`tTc1d6>n`NER*;2%UcVhyt2<CgYYXjSn2yjL0BUY!pL!<
z|C5Zc3_PPj5o2sOV0`}qwe~81?foS>Kuu{sX8rJCJv?vXPZ}BGtR9>Iq4ysH#d$vz
zpq`&6Q7yR%SZ}^Sz~A1v`*|E_b$MiPE4kw{m>pft0c?Wg$f5y9Q0^WL^yBv>B?7Kt
zx9qe5UG(3!=C?hhq$K*J=y@JYY!NOFF?{>O^T--AY$o&f7DbHz#fujwP6}Ai-+|Eo
z8LlU;x7F&P+v3P>Kjm7v4Td$HGKF~W7Ac`<h(J8qloMCrN@C|=B>FM}ds`WGzM1G}
z6$B_1{*3$1OlaZ;9R%e^7tlR|<1HZYdH{Cs`PmxDTaEQ43_GZ|q2&iF<@K|QcrTSG
zW)9NT;S#a?py~}FMchx8V+5lLZV;QQK7C-_xU;eHSklGuR`Xb)*_D*sXdX#6wmgU7
zVz^xFjxqmvvo>E!vzu3(qEi-blP)ziL#kNdViOEL=Dlo*7!Ma+fTE%?C5dYFNufQP
z<iq|X>p!ZZz#lS^=O8ik(4Q1lPcA<Z4C09Tm-}mnzCLE39x!}+lh-XOVw@d>J!#h}
zzYB26igN;bS2&>fiRGPCN|zD;`L~X=;dDIr3_p+m5A6IK8#bJ9xyr^%gXK>rLmbUG
zydIJ*WcivV#1|+<-X1r2e*9VxcDIwjG3F)eJ1aLvd8-BA`2G-2IQCQ`tQt5~78T$y
zvx&cVYZI1`;|c8Ka1AK~PD0f+Pr#2R$-2zp^!19fN4AmAjolulqn^AcGj+)!JXfCZ
z`hu?JiadVA_4!o~0|SE}t5pX=wWvZ~d5WjSU@NV7eg&ZqwL?LiQk$WS3c%P&b2u^k
zAR2zv>=RiGn6(gB9&WUJEGa2@a6q^Q`d{~nT5_JO5aP)1Zu%6frF>n=HKQN~EU$p0
z@sp!PsTkz=(iUk`xRdWx?wJZ9WE}B+9ZQv7&!%1#ND1^dy+VO;aVIrI7L9722CRhZ
zTUZI1%6g`MZC)^P+`->>^7?L~N_d@Ccq0jdtpqd%*GUjv`R0vvk{$Al$NRa2vX!ZO
zfI(oly7LxbA7V=l6qiDQ*!Q*KAmhE4mIyIZ0&!yjYP!Db^Q|*m>pnXb+HaBL+Jx=u
z;{kA5^+2CblkNi84^<~YEEP-<V^jxylT@x5{`m@}5zW=bg0wcPB!JVqJdfo+7(ZWo
zsSygL-C8=KgNNiq7pRCnajj^=>z1($N{J#tIJw)ZA(c^zep4JBZHrUKyV2G3{u{58
zrIsqpkZUH#Edl961LaEv+N6jvdxIW@xfRfvot%CyT&G{-=L>wdIpW%(qf0j8IaXZg
zf0u^ncsSs|iB_rPVK)6!Y97ZQ5;~@Db>PLu5VN#-d5ZRaK#r^5CUW5ighv($5%3Rs
zhS0d7?6b2(X>#yqKxif;{xJxoA2T!U?k6YIAs=ags<drI71kQGqrG~-UYQjKj-#_@
z<4FFvOsjf<;w>SlcW;((m>j;CQ|_po{JIW_+_wPZ6wz>1Q~-jXG>E%TSM!#|oU$>A
z#C(BGK{G9H!v&JOJ{2TKzac~T4EMX0l>dPhrDLa1iKHO9<^>Y5z1*&(GL-JQG?>2@
z>Evr}%#+X!@+W*g4m|;9e9|#^<ao`N+lk{>qq+Mzu&qyNLvP)@*}f++kfq^3FaB_J
z-w^P4P!pXgWS9ct!h-mL=0#6sl<yj0=JS;4aL3IpGURI*ANyGWEGpRTMJ*2hWgCMY
zzb0mw4mj+TghWx&6mw!u2^%sydJHy=FF${jQb_#0Ub*VGnz<xaxz+95a<Sy_u%jAZ
zxvH}R4q##<mkvA$D`S<}o*?j<VN#e3K#>M!^DP}@sv#X>dvb=P0bnLF($bc%rhIfe
z2Q<g{YQj<Mkq+qpRy&T4@zp%X6FkQs85rPAzW%H!<*l*zg%Pl`l?Vhj3Zf+DlQ#WW
zj}3YbtUD*X%H7=a4pf@fQQU2<Uj9b|0Sdl{Q#=7J!K2g?GBUc9BvpqqV&Oc;YvIPc
zY%Yu0C1K$_{y#Rxz+|61OS0#=-7MjpU=o7JqX7NS@(ivA!?qf&@qt2vi#v0v5N7)n
zb_RoVArWmuiM62)f87foX`b>0nWd+^AVIk3prSM3n=gBx1I0x&;i6(%km6}2;&_N7
z{L*QXhChV-vr8;hYoTRii2H^PYb5~(C8mJ0HI}*nd)RsXr;0vM#TY*FhBnk#A!;~a
z8IEqxSXRJ2RJD?~Ea&eUs!wBwZDTZJ$2%qUZI{PJI;Vb#k1v`Kyi-q0%u7pLc@=89
z^ne@Y+&AtJo4)&c;`3qgAJTMFk$~Q%eM4$;ILT6<d-Nyw;+*R#uB%M@2M6^l3gz`H
zxN>1aK>Odeg!+ZPOqGGSoX);J_t9KtG-U&7{P<v%4n*r6v)dmhYcfq2`we;&Ul^kq
zP6V++n=HZDZ4B$&b1kj+ltjmH(4eLw+TY*5Hdg3oI*?;zee|xh+Na>Ky1&1_6NlsS
zPM)I$q?Yy3hacxAI*yk*gaW}O3`6ElCw4F;vic2W5Ju45V@Yte7|`gTHd*CjZ)?z7
zDV<HajY-*inhE_G!*MI_B_zvR(>s@Sb#<*R6?TMqI(c~x9uMx6WFcjZ49|*>ZJyO9
zBQsV%p!YVq0VZy`Yzlq2Rb;yM88|m8|NQ&8)AV**jT@-Vt^*6F!To9nS|9vMWs14~
z{2dc2BZKmGHVSaz!+f9oOXuKVzEpD6NkGAhL+yM{w83<DHNu_L?^>9NtaI&V>SkYE
zZQS-P5Rl)Sel0DxlBD1RhBvqtT*Z<tN|OTd@VHNZ#D9oQe=&950(GOMl}Pe_@7MMN
ziF_rL$hwxD1pU*q^+Pap@kF2RXTgYqghCL`9{CzIY4WtYd%vgNv))=_b_R;9Cm!Vg
z3aIqmOc=}BIxG7+Gp9_bV$o=IgX;5XZ*@5E(NhwS(}3nkVFssyVRscdtu5rFzg7h{
zY6VZ>)EzmYwt&U-)uF1wW8B4(k;%}wbC*ZGbl5e9;a(mZp9O;BK~(?_T9{*UU6SSB
zzt69jRam{U+StILyj|=%+g^B_D2_DJ&3>5lt7pZ128_a9se`=AcS%a5oq|R0B{sF{
ziGmp6dh921`n%`qXj$?tLrk6z-Z57&zV@G(i{N(DS{jh!)TEz`y>iRS>XKw!f>YJr
zhk&sr@+}Fkadly_GC_O&GAUo1dAa&BzB_f>EGC8*?(4|AeCjToG+<<mkY62M{UPe0
zg<Eul$pLVo0-FJ*L}TzF?^UZoZMG>x?^q0CmQQIJzXZwdS7F_d1GGr)AwJ#T<@c-R
zosX$^gaZf%pTi}4sz0gyv;64I_ehFZ<Rf>?fHi-?M7YwSsabn!W#!R}07WUOHwlZU
zdDfIX_bey0E((vHA^9Mh!?dg6VAp=&66tZPOqXnHR}?nnhkLA0Avj^%m)EFqSgqid
zG{54z>wK>Lb5YUu3)7lt|E<r4A&7jM&T5mwtM(?PPn7BKQ;o-63)A11^-6Lss`nh*
zgN&j))(xDB?V%)Ys<g$V+-ke-aagZ(Sbv33m6@4&cD4(L^ZTVlcwW8xywxOFZ$qG}
zo>2K#MAYJ0GQP{Qg+U^Y!>K|@U2AMn4%W(<zYcn$j!C)9mo3r~`c6aPSUq83OrQ)O
zF<Nq@zhu4kHem1V`>MBq)ljmp+zMJv4>!=|HIu(UMf}e??YCJ`quXI0-jc^N+7(&f
zpdp@A!Mmp87qH>n-g7Vbf|C6A=NsNgWQ2E^lw~|P^X<&vc&f|8%ky(AATt#o+yfZ~
z`Vc9O9eKblINXkYW_|E^+sBa|&9&s^-8g)FcrZrr-)%-$y&Ad_tz47a|Koc{T<WU*
z{*MRU@?N)27^6KfMa>WeaZ@2z+IV(B@AX|@I^0zG4v*jW9equE_7QwvRi5|uLdoG?
zW^NU`|6+;1a3TJl0$`Dbgoz!0oMq+<y6L9`L#F)}D@ru>svJ1pR<}A=9u^kX&Oy--
ze_XW0m1o%!C%)TLn}^x_TXKjI(FX)=RvdW-nx6h=6>*!0Y3wT<MCA#A0?nSML3+aU
zm9oRK;b6Y`t=+C@f4BbX=+)6xf+K;HoM>?%m(Jv<87*wGxW$ZE-z7{ZAHH6z=Q$RC
z?P}P8eAG^>PD5N)JQ}}sC$Gdoz2qe1)L?+yKUZz^+p-skRWT9@laH3JBv5vc5<S1b
z2IwCpeB`VUILGz&9^Ju9yx5I3*<%(a5{-#P%=RwEf}>8Tweg0eq@-2g2#Bk0Z#_HS
zM@SyPH6wN7*Grdk3>-`O4u_JD^nWa5xDEvHaB|Yfd9KhLmG8rup?<W|C*as~9Y@IT
zK%vp-!HUPOb1N%~ivxR^)%%%iTRj@++su}IJF&v`N5XNJr}bdwG+^iEROYywJC6N$
zdR~KX@6wX3K@V<54!$=8UkrMZ+B+nnH=2E!(K@bA99agAbLv^DcYitqZhc^8v5~Ac
zV4Wr4^znum;Zo08)D{47U3Hn8PJNW;Bk!yB2Scj$jY9|1#1o@Fa<6?aoYd&}M3~oj
z7Y&X<F!vqUMJSrm^)dux*8Ro~Mp?Lhmhzov6FrUB23{a);7qDbgw5I^k;R3_i8|QO
z(;rQ~;!|f^?6<&E51yP{Lual5RM@b~E9o0CJ7>W0V*<{FtKI|Ub%4rbR6LxZ>yTsJ
z1tp6KW`Hnugd5YTy4R0}K8W_O5PXA!u~wx=JBxK0IxVk#pH(HpVVU|I4N}ZIIIVVe
zYl=}|!T&`|uHI=;lk&-n0mZ8VpG^;Krc|EpA_>AKd$%p0o5|9bNJgygci1wH?>)qH
z-I$1eD3-mHV2XRi2TCzq-jtun&`e;GgF#Q_uqS*-1>c3TFg__(eVXom7#3cAOnaH@
zA;a-{0JmZ1Y@5P(^sv~Q66T9<L+oT)|B6=U?JUy~I{3+md`!5rLx`2U=O1}Z_@stK
zDTNVZe7+K{9Ue$$Cg|n}JS>^!qNOEfFh2KffD2r8fkfVjW98?hNoPwYN*qrSHa1dY
z2~l*@(cJGd<Wr&v3IdAL(R2r&L*?g^qj%k%M!hhW2hRASiSaeB-GoH3@anz4Eu!~c
z|LjKPU)MASP>G*rP<GL&Nhya*3q3(o=)JBHbKXy|iU~Ty(`lgZlESwi&+XuI?V7Lr
zOqr<F7-LuT!b?w#9UqU$q`sj)>+3dDu$DP<QKRf%n7TB_m4<z>C`mf&@nr9nc(<Rr
zS%(-IBVmJ1X>F64QtF-|?ON`WZgH>n=Gd0H%HPW@k50(iJexY`5};eUv|xnJ?i4x<
zR9Nbu7=EJ0yE?|^&7?K$nK%zfrrY|nIbQpESFYTJO`i`;ub+ECwnUG6u2TV>Hfd-s
z7D#uvAuaka_^@lC|28t_GM)Up!3?v1;ezElD~eyA+1X!$g4KU_UpsNrk8X6jPPzu(
zN<L!0P4v?^9DfLncunc3DO4JJ@&h5xuzz)cka8(dOxg?CyQBR4Z05V23D0IC<Z|<0
zOS&tCokR^(9Ecj6nMCau<4A9t(~HlZ#|@M{buV!I{c3G5M26;gJ%Z8wXg}X&tv|bj
zf4h6DOb$*l)O<9^=ichI!-<AfUl@ogj%&)b6ru+2$~yLr@)R4#w<sdID)FOiaNcjw
zDii`bLEk8Wugr96-Y5RBf6ThC<dpq}yg7)DCF|6;qCtW2{pVus%e#z*05~`pIK4sQ
z*sOVJQYZJV;^I7fdYkD+d|c~``JM9q(mZLmVL3513s4Mfi=OW7bGQ4k(Ok@X3U^X3
zq*#H~gXK9fw-ABW^B@5K*ZIkf;?ecWPcsaWA$GiRr2F;#7H^HNUeX%-TT5xo+&Oy+
zuD)z<u%hC&;)C>Gqf4{_^I}!2?|yKQed=52pt$V3AJMOSNm*llZU^oYQF1wVCi6Ut
z;GRDmwA)b8ll%)v>MSa+9#wqbgf(s`V8EA#ShU*ghV1U2AJ3~)^QAgL2vI-89Pc)`
z;i`5TSC;QC<oVz}g2AYZ`fMm&`;G&WhCb-v_>rq<5cUdBg+Y4C&xa)zYF<D1xcqp3
zSuGS^dW0)0c6Pc{kNq!~6!Fs_w?Qs3n!%;XcPN7^dt&D5L9<i!xB+j3NH^??-3^rM
zLLX|kC)$@cU1i1npSoZi^^<ZTWHh*}l=^aQ5?m4-F!_)q<dQo7CznQbEd$#H`gp$+
zA|j<f1o7n|h!&L<!qYBG7$aKevS>Z7JS3=+v|FCJRknY%8<RxVW)gY)xC5iZyA$>9
z`(oQLR>QDZYAImr??^c0nlseN?pU_Hu@+6(O!@r|PWeJQvj>yC+HKWVL1@zJb-)tf
zU?+<PSp-&;*;2kDAGx<io<rf2P3DzAC&Vlz_E?xs8<RL|r&Ci1SUS2=trKbVWHDCY
zTBWpDFc;V$%^pueNfo{xjN=AEK-e@r*M2r~Ch*fkJayg)44Z^ap~rF0f7RxT02Y`N
zP3r6+K|j9Kt;=oGPOa5wx4+F$A#~E%<5sj`jf}zS;d9B%3WMZrmwU#zPa>W27nt2V
z9*fXPeU)|pWM$HFf;(gfcvDBCpPUs<wB%!3Sb*Ae+xx>jQH;-)JpEN4cv7f^_y&2}
z*ZP<5-^cq^lH^jcf|!h(b%epUpvH<?(B>dldNU)zT{hc%I{-R!Gd-o`jvXfDo7cI^
znMC^|>EJz7C8kB<aqsJy+Mo2O0PN4wqoc*TXK{DxcDpXTzV88c_(bJf!&iSc157hK
z1|)!2&YdvQ*s{V)SgB_FsYl8+p*?bs`kSANW^7TZ7P3SQ@YDPNDd-hgHySP@Jw<>V
zO{Y3=>lTp7S1i7}<RMdJ6i58B)hG&Q0?m*yy7}muXgh6w!3kKcY*?-H6vV0tcXO!d
zNqX<u^ZNE=zn%3y<>)iZH=%OpZJIZY7^jl)>s&@O>4;0CyBb&8uUdFiJv?e9i&m9h
z(+4BQytSv3`9LY`;Wo9`1|7HRhWJ6nL)gbRPm{&4gRYyE<h#}5yFu9fUEp4AcFNiN
zON?vJ@5Fua=Pa6IS<8=h4-?L{zw`ea$FHEz{sNg&wejQXBajg%j+tAul%gJPQR|gH
z(f2xZ9eyR>ssP~R>5~fY<VcWvng0Rsn(nXj6yK`lWf(@Q3i$fegJ<QHu3&0SrfSK{
zLB5VSb#uSs_KA87WHD#n&oevEB?*%vXz4j9$9AgROWB;x#FKRlNn=dgf(NqgsFVGt
z&#UoRC8I9@Ii0F?Q1>}TQ*fu!IA9!?V-?&miooRi%`~^Zm<gR?IYY)<A+NdB2GeO3
z*ZwEPOaH=Yx23fH+ZZJKEXZ-xZ%y*gZB8A|6<AKd5wt<iEFxu4@=@2oA*d<fnC<sY
zuJY>1a7MBivUC$>ag6(&K|=ZE(pTy++oOp5TQxg6L;B2XhZcX)q%U9wakCjFPuSI2
zQS4u?(#V$jstGE1yULbMnxP9Q0i6Nr0t*jcg4@q$cco~P3Kxmu$(7b>;+&@<(R_YS
z|D`SUvoy%AZsT)+S63m-W}7Z-q>5U-Za|I)SAS?5MJ&dNP~vm-lHRWysz#*53cpSL
z_}CfTK>&Z^K|$5+p1L<}65y=zt|INHj(tH^9F_MEK7&l6D(U=P9Yl1%N>!e%&SdaQ
zy>sxzJ8<nLR2=)|jzdJs%azP}PzX#=@z>1Qp+o2_K<=|=J<M#0v$T>2cgi=Pi=1Xk
zARF^>vStrExtI#Y-vk0vFVV<)8yM{B<E3+qgGTU=irHnA;y$L;c9le_i|o5<bxL``
z*S5gL6LwQ50vt^N?xiSgxk4b<k&>LdYLxWuyB}A_!Cr4^&^v*B<y(u)3mXH`Tn4?f
zsb3yDe>pjo>eQ}-US$b52yk+c(GmK$C#Ii0H>xCQzP*YKHz?=}p9BZEn(;}-YqQw~
z195R_wJ(t;LWN8rwf@**#wcZMSnY53&0j6`>LtcW3lbKf7?QjdExND?6KTL7CsZ1I
zQ5ba&G%LDqJrla!+Vf4<UJi@8t}{3qH2aX-o4n69M!=B>)b?i%G5L?-^qyw<?luWP
z3ZyPTgG_(WC%ZeSp3P47^|~R~TA<0j*`ob_C@a(nT6q6?iu(8i@LQ+=VLVWZR*N3i
zQYsO6Vc~X5L=s5xCm1uk@WkXcnp}RQ;GEXL*&M3f{)UDirPY_W{P_$qmIm=*e^zzC
z9T-R|;lGh90b5qI!CHSeiiGRJspoC^L4-a8Mfdx%QyM(_Ub$Gf*pXiwkNZyB*9^-{
znGZqm-aE-o2FYQren)|xcB~&B4Es-|<$dB)i1b=D$(PsK1gEsxfHZwloBXz51J#vt
zvaKe;c&ruJ7uSs*%l`gcQWUC!H=MUk)utip?!LQQ>}mX})EEJ{YyGuZ-~ApQN|^ol
z6J~o-{>4xLPks}g7hpXg;q=<|Mhne=5b5y4O2uxnV{;<TK3j2br{Vf8sGz9#Ke#Xc
z>DJ>GT)^LkTgg`_RuqFf-x0|+WmDAHF-r;G{^4W>7H|AS&Fb$#Q)}xdUDAdPRHklf
zj&?VEBv4)nFBZ!Sa-HDgIhGU+RB=NrLQRzAO_2_wgHr)qKshrRNM0NwxAH?YvVIv)
zbs`4dN^X36(_55HX{=<t`G%c<8@W^j&JoDKX=;9GTWwkK+WalWSN&%f;ie1X4Fi4{
z`q0ZLSLz#~h+vCr09->!R#PwMs_d%-P)h7q7Ql*p0g6Z&sVPYK5fxm_q48QPaZ+#H
z%c_|Bw05%9{F9SEfRLa3uygjy4|&b+nczhEY%ZKvkQacz+R}KFdf`e5AS~zJFTWoL
zf1HO8`uQdekLRB)Wl=p<AOd%X%2GPiFd+Ml2~&ZAstjP?-3MIm?MaNfF^<8%-!GE-
z4P*7u&@e-n()j0=I4i4r=E>OZt*szMff<nV{d3`B7^wyXs!i^bHYg%eZ#j8bKC!sb
z!e@FgyPCC>Faw5#niv-FGHzl(%XqlAyZdjj5V#tJ_mPITgBr*PY78u7702UY;_iD7
z(EQe*7dv;@qI8JrAqtEZ?YNhV{Tj`g{f06=m*x%mGY<^&$vDvHt1&Q>aaLwu<UFon
z&bfW>=L6+73X=Yd`V6B!zxm$3tA|gnB7<4Z5ud1wgw=fvt7{fd4oF8ht}y>DwIU(H
zi<u<7-}6~m8w^rB?nypYU1%ZJ+4k8610XdZ=k%+7c`w4}%i*tuMLkSyypS=m49X^o
zSF2LeYA=sC>zrvO)|va~;g`U}HX6+loS?{XUP{wNha^7_tf}6sF45iDX5t{v1y1bk
z7%+<`0~)Y>G=W9LfMoUR-035td!V8_%sQ||2ba9J6FLkusY-Kf-0kf4v@**%^G9lT
zy|E+|CXs|oZdaq>Mmq-7bzr1vP2gCWF$UQ#6i2nc9N=Q$wYBNlUtzClczO*GYg$UT
zs2$jS50(c)$+<^fr4Cz^pkbe%jQ%ulirql94lJ*lupEC`P0CxYO|U&fWs!=mxfV~B
zYgj6BXD0CPmQN_GsTwa$%KX3dou(Ly=6)Lb>@13g*p`{9!5{Isq%*Bn;~3luYZe|Z
za5Go}<(FU6$z>tcbK9D#L20>EUPrZ_!gLLvT0@Ck4tN648TN$T?po)yqIFEbvBRQ4
z{Wf_IPF7Zi*8lHZ7bf7aQL&$`*s)UDt|a*6&I-y5v#-V=B~9}*H85(#<9%ig>GPT3
z$up5WiBzC_rX>$=96Li}=>PNCZIwwAJ-Kp|qr{`Lht*2z+k?sM2?3ZC5Gv}Xl857d
z8l;S6!fR56gMVJxdvYFs5N5FP&sTS=F;g>}`-8D!FTQwZ!Sp}aYw`HTMny!X?!}Ht
z%aThc14R^wRfBS@xV*j`ESx|W``3?=Tj_KhVamp~gV5A^*UNjUsY2=af1%^`K!Jn0
zXSEzmvY&|Ud=rZhcq>NfG~${%^fkS^N@zU2-aHodND-tP4W*5jS;ox@D^}oj<Zl4n
z+B7T9t!?tlHtctMQZYI;fbWNImtg{Y!$9r(FTF(Y)0|vnQwLq`WI^f#sPUZ<Hf6Dd
zDeH9k)gSE09IAJ@IXMQB2Hf9lJ8^JP!24btYc)LbBDm^!yu3|by~J&-Yc0yWCtV&7
z4s>W!=l2p1;N~1Q+jh&)Y81>IzPihbDlEFZk8O0crM=}?-rCyZ_W0syrWRs9zr#VW
zXt<1vMHgEhJrM%8-GP*NAjQsU3lY%oSEMg+da@b&Jz^%%f3@>a<puaeGLXE);^;vX
zD3KJW|6d8x->t#jLi)?9LCi|G$C|N&0!T8V&F!Z1)vspKYF+<v3=A4T7w{%l2f_O{
zVRbjcdA);Q%e}or<DPEu-b29Q(t$$V6et13cmd+ed}HBECXwok@39nD#TAV7ne*uB
z{+_3JN`~tKub{dqiEWC*6fVkdO$fKiM7%5(A5YH@jU|6pNu=oEWNj?^H5QIQs7cV>
zhcdpsNE@!?92$X?h<lN&+E(hnH|GUTCVPVvXGeWjTUBylN*=;uY@M7;j7DV=C?T5)
zK##ROSXi=g>dha`6T*h*A4i94xg^1?opqF`FLOQd-i6alAV~5&xkU`MD$dar`c0Hg
z5)>>A0>Yvdj-q$ol<fNSt&}=AJ9j3Cf)7$d5K`NoKW}nQPjB$)lGdC9;keq<#;rDa
z;J^O8;%<+qCspae#L?g2ByWxvPh_i&Rth#pS&!Jt|1L-FSN^zp%JK-|K%A@QJLo4!
zyvZEE55C-m9`%s=rk8f$o-_|cRlnFlmn32iOJllMrPKG=Mw^n$w|Dn+{Eo6c!Uym^
z4pafU)+_i_{zC)aLO>IYPSEAh3ZQ@Vsl}!GMDreV1~_f41?`ix&j0bYOA<}hK}_F2
zoH;0`m2H1LlYKdS^T4QN5M%Tve|_ssiNJ#$y7f}Rh`}gX{Zjc4;e!|QzBawmL+n;O
zPrlyUuGQ0UH!x{bDT*t(=I&GGJGguEMb(C1|Ez)Or|JRU^a=-!TECILn&fhc!Hh<g
z1FnyOm8@DBXU6P$4hyedb)V7s6JYFg%HO04nH1A~*C<l9>7&mZigTDz7yGMSvv{Xd
z(V;xadR`{MgR;A$hf=3bDT6zj8xDT%a@&a`E-XBQD>S3O6R-4ze^r=S{>Yzrtzw|~
zO~-jfDBE6N&*)|Cm_g4*4z7<aF+djgUf1}i5e?=3tjw6krZTbVrDc$s;i{dV=*;*q
zBjbd@jDtk6Bko<vJiA*XR5RQVPOI^@B)PbxWL4B@IJ0G6EqzD-$aDwyj*f5q&E&Jd
zT~S=^24=ggngQ=)_plCoGs(KzAco}G+1k%D%cUDTH}`zz+c)~n9~OW{BW<1;qTW25
zwg6XJ2R|t(S@Q+4A4Lm6s-JgL&XN(YpH(qAU@QCe%5eRx&$iL7676r18&7NnJC~m&
zPQC5_wX<)du7>Jq60fP|Pz~05wVXLKuzFV6&I90oiOx7O*whr9Qc#2I32=SnNyvFJ
z3)NKo^n63m7K}Lsz93vjY<#{Ti({pdNBf~O!_n3y!oq~n+&+iV8uJT`*W+7Bvn86w
zCJt<iDTr;-%KRlGB7+0>B9v>Ce5N`-v6FTDkHdA9b~?G9qyXhTa{Y+)<l@(M2OrZ>
zepj^o%01R+8(T9Zz2P~q!_?ZC7N+iNj<!NwRCst)Rff~H2o}e-cFVrweSReJ>Kqva
zx|L9HNu&QTmV(_~fVhS<V)g0^1yY%WXBOW8Ti0TXEqrgl*SYwtO8q>KYKg$1vC}j@
zQNdB+fvCTU-_@O{`~tBfu<NvNqoh(8cR+cF(@8*2g^561qjvW>zD<Jhq=O89?6z;R
zDEx4!TBz@;?X2;<Gcd%M&l@W|{C&)%{FQ&pfhVzu-V#^g@Is~=BU$HN_XEDoHS%pL
z<WLmO?Qu`X$2et_8)*GX^S~#x3ip@!QtUMuwZVrW;X|GQR=-tTQiBf`X0vF#UjMDl
zlXcC^eM5Wu0-yrFxQIs(F8c0Y*NQe-L?U;nn?Cw`UII6Em-sqYYaPsEXUhe^*Dp40
zbM%)>bFFAko#Lj76n1~V<<A&NLwr~sDB}GGs03Q?E4Q5Ns0Gl5_UBZy{FK;e2?NQ5
zxgfhOF<ly{nCno#EeJaY7&})}1oq+DcyVBcat#`XE-fez#G}zcv!?E6W;xlH&IZE2
zHlgXm`4S^52Gy+K`l%DjIBfm1)`USLKfC|otbl;9Fp(|S^^uqk2Ib%t8|WJ~og+ue
zpYxAywXb9*=J=|Nr6x@eti_RWS${7(M_jP*(KheyZ2*~P@KIxB)y~V|KX=6=n251l
z8h+IU(N+FSdMapgUl5RYkGksJul$V!kvOGTC=mPjTeK}b{cMS}waVC}Q5NkHmxt@M
zRl*J#cY6l3F`h|jLfLQuM6hQJ%Dg%>(Bw0$-Z`6lkG-$@`W@=wqWw~QKa5>*6O?z|
zvN5VUhLd9~nrZ^V#t%=|IxOp;4I3~HZSzdiM@CtZzOt29(#3+wxHHE*xt^GPW%ip#
z(jc`!tchr6B594Fo2yp1U;RW`!hW}*iDM#kO3PjDSLEfY7NswM?Yr-vva?^e)cjoj
zz}DUU`U=gdQ!*Q#gF7MjRM6+Yj+AgdIY-udJ3kdGj=g)uLn~7a>2f^9Vj>IE&7hW$
zrXw-_5TB7nHV7`v;O?BBDZ)4p$2%4&AyOnfrnhSyvSVjmd@yKnMrMpZ%VH84mq7YQ
zEg$0O8QSa9Y9c@T9oS!i2x4^?^aN?5Cbs8P-w<{M#6noA(BQcJCkolW8O`S>+F(dQ
zpFlF;DqWNA*zp*U22yu@8#_+*IGbj;cl)$8bYyp|`_jm)RoyX*85qrra9p}gqZ-83
zOv(pZQ>*m7%VD2OGWG8j01Cs2Q0=#QybIt^Uz{ANeJ$|EgGW`XbI}NtA;Q^Y&y|CX
zsP*^b&GE_=XUOK;#XirXLNC9w)qX_nf4e@&RJQu0r(C4H+RiN|@kEd;+uvB=-Mvhy
zJ8ffJDJGEGX&;iqS;B09s33)`4h`w#nL0f^KpkRyZv9w(<ykdj{!HLr$azTtj^lBH
z8(iA!71?6A#WqvqxFGhN%Q8&doSfPjPJtPg9L4V<B*)Mn^QEU>r&L!cbkzhLtlsUk
z`&bzmUMPgE_+#v!zPz@1^*umQT|`S<*l)XscS+PebF6Bg-;Ynqv2XLA3y|>?1lOpg
z?)jp9d`nDo)AhtH<Jv`YuFkV@axS%Wy(8!F%GwEutW@~CNuzdv!A)6fTmk`;|HYVn
zk#L)*vsXo$GK$@IY4jcoH)Qi=+4i*9UEfYFs}>n&k4g;t(j$G$z_)<!-v#V<BbQ7&
zS5t2!1sEp;S%7U#+33hX)@djK?V<^dp03O!S%484@JGCyiGn&gT{DT_RU2zL8!u*l
zR7;Y|2vP5D)+(}gjyjt@hAvlE*#LVv<b26v?z^sl$Onf<Nh1lXItc%Ka_ryJWUX4;
z$}e;fn>|zbp)y?fG9|m`XI-)v8E;Q1v&Nvj$zr_089>Nu;gM#k4#IBvgB)Fw>%wSJ
zYC8FE<XqrW`|K-O>s5LRlvkpSOm`+W)9G%Rmww%SBy*u!``0KUp#`sFJi67@<Wd|y
z-P<wtp>{9y3j-N%jKH@qqY_6%HU+F?(`~_Y9-%s!apk)Zs<45a#xHGRDWj5^N?ksb
z6<T8D<Q%yY?HV~CnX_x-A>PTjQMh4|7udK!Mfok+#7|vn0dXw=GV>Z!NKPh}iW0~6
z%6asp@&~3piwxf6-Jt?xH?nVsjPAZ#^)=tTuQZKUwx!m6?i!YMDUE4-QxyE8UzKJw
za|C|DL%Q0mBFk+H;|fLEtkIsN7}LuIn6*d09N!D{_?92IbZW03cwel??z#q`i94!K
z(<zyyM}%eb0|$9e#gnV39R2P|E&$SSWG&w6Dl76Fwv0q=u^th0>X)T4cXi1>7@%LT
z6fQrfeVl=)`@6HV<7LESTep|np`V_@IwJMy>vf-NzlNK{ky`keF%I^>`Rt=|Mtwet
zD+zn!S((4^lPfomeT4~k-#u=?Ki~MlE(1O^N>4L^q;ywb(}jR$v-vvsg*P;!(}{m(
zPmfIu7&uV<VYC`k!@VG<UFT`{6J6GqF1y}YIOCJ`_2y+ejlG>`_(gPrxRZoMv(^~)
zW(XpI@zUrHnSXtsB=$xnzuj)({;bK@->HK#rCGl>PHCay)pMLAD5Y>0IdYqRg0SVh
zTA3*7wT<`Df>0{~tnCZ5g>?H>Lm^t7@76>zW<1!_t(0pn;L#=^9>2=r#0f=uKf*oC
z9vHKaq~hDz6}?{PZ@ijSwdrg3&gk@;?PRqNAoFX>rCq02@84+en;1~se|b0BWu_T?
zFd=!UXh{X7?5nuw`ihUuk(XpI(~5W}T{5DT@6UNij`%uaQ2B9PSt}{tTzUhysHVr&
znN*7j4fWMnCJ=_ohgnP8>lL>&uKzI%E%r#)<L~1iJ+HTRr+^t9bwl=sLDX;pQuU*)
z9nO%+gDA(8xQ(2}D)0AztzY$sm_s&^OlSY4ikxMc!1JD*%C9G>io#FX5?>dNsEE^9
z5Ssb;#)>chUEd|EO1qb4v-+o)t6V*;+a+gb@Wj7Vv|1D-39f&a4`(q+wdNA;rqaSk
z8=7RA^OwIau1Z|Ot`DwD%GKjMM>tmYN{7~J>8h;F@8hll-`t5lV!QzkG4BL3mQ*Kr
z72XqP+Qrzt{>ylH-1lbUr#mtGlMhnaH1F<xPaM&r=kw3@_giCsSwP>!Yr@?O34wzr
zPeEeV=d$eMm7adGha)S=0gJ20>#My^ZZ(Zc{^EzVJjYeiL=aZJW%IDh+2!<*_8Y{&
zTfRT-vy*u-LDA`6leYP3dyxn0@t65}8hYNiDUjaZX!Q3rPQ*XN-321-{Pwx7A=6uK
z5m)#%HZT(|`nw*3%P^x4M>@Qej{l#Yt~-#*@Bcs7y|}o_o|TbVvQm_FRrcr_8JQ_j
zcBSllt;&dGXWcSFWpCk<QB+7Gdn9{jkNZ21KHr}|@AI5<-sipFulG5RuL(-b{!5$W
z8=h10t`!pq!uzmrmh6`?m4b_NTI=-FS-}IE7cLSth4Uk21iHn>%5|8p%+Rw{>0KMX
zs`)`77Gd=Bs*>9i294XZ8-8PcO9!7=GZ6V3Rpi|X?zK6SYbi|A>E!UMArgukNy}qL
zM;zZEp#kY^*L!E5yM-mYzS+6GJ(_s;O+=CA(O*{v?r3oqUX-(XMQc!Nyu|L|C4$Tm
zGekvSN?{U-L~U*79t}QTvG8H0<Djhmp}YTn9xH{r09Fi<How=s+!b{|55fw^^|UE%
zzOS-XN40jja_a(q>H5~kBAPYU&un~_8tE|px*Dwi!FY;q-?lL#Nt)1h9UpZkP~_Xd
zL!IDyrS*Vk{Jd-w$*fbo1zLQ|qe0Y-_2i(D5e^z6sJUqi1p=>Y`+YAty?PfM8e7}2
zF7av=wJ?$Inowr;xB!UFtn^&wUg{S_tBL2+EiXR0HMYNWpwV}Kx6XM#QagmSJ8V)H
z@@T^O`rcsc$LOVfW$tb+vtt~P2u`+Htyt_V`%0X_WOOM;a$W1p#?A9ByGeJCKO5u=
z>7D(qcu@64j}fO@FfY&J-{-@(*C@YuB*qp02Fr0>3^DEvt=xM%LpVQS%eS1gTtM!@
zW5A)+<D7GT;gnd5(aQC%`XZ?~MhMG4bY&okzV4Zi$BB@)+n={v#CVTw-i)_%Z&+dx
zZZB~kY;8Kp1cclpcbi*{lT?XWZ;?t@Vn3MwqRpL9F;sqbaKB_}(Rz_qS+>Z2g8cDz
z^9*4eP0){n5`2IP9j)KoB}@A5F;mNG1qi3fy`1-N_JGEJC<BDd#)3+ibD|m%^POn>
z^5K_1e7c;ST;2QH=e={tAEug4UGsg<b|py8v8}R+{nL~3-KY+o+U=j|Bc5v(o-?iZ
zBKOeYb463{ZAm!@7lC+a$=|+wA(v3jpB52ixVkqnvc2B9zer{Whp(d^vs-QPoE%cy
z+aNzt_I2HwJP@>M<qvFB{`8<3f|9*QT%)Z;DqLQ--Z`JWn{YStNr-8{cS9<i=37H{
zm#vY5ss6SW!JS{J71sJkIL?udGcWaXP!`6i2B-_hQ@F=sKkPMI|82x?OGrFs*V~J7
zvz=I-8f#Uys+nARD!e}tdLT!yzXy)jkelI?A2!LWfaxc|R<BWUuwt*Ja!pLcG^KE6
zy|DT=Jouwyzu>+yjl}+zu<J9frza`JS&>BoM9y&$g0>)OU>7eQ<jJr6Z33@YbZo1=
ze($q6dE~P{$h@(i^=$3U&dWc}eNcR5;PY`UBO`@}aR~ZX7~;KegSU)G@82E#m5>!r
z_~3}66``ILWrGYWmIf;GUu?a{0}O>_{PTA3{l~5JS>nhI;eNf|E>vtPFbT8cuQ8SV
zlZLda32gyBi=P??Tx)duSXr*_)tBI_ZuZuw)$xMv5>~f)d(kjOCdzQ5)Nm+Qj*0Ka
z<7^rVt&Sw=Q}!i>DCgF!dp6s`r^n9nTu0mEcf93l4!lj}Hz%IWt+9Xmg%HdHtbsVR
z6rxk}FdCxTrKvp%9oCOH5O!1VIO9r`++Qs_zsoQ9D^c*|v!$Vln9OeXnj<%5LqE6j
zaAlKn%y4A-FRzu~crw#w6a_&lkqMwk=U#w)#BceVDR7KRe<SK&C|K}0`}v_>>IKfl
znz@712jb#NyBh<WA#S_Y`<7yq{`VGJX#**mW5_ks%{m`+J}ex+bYt)~@aWiQ4|WsO
znVjtL<GbgQC6x)VdR(y278m&Sjjoo*(vZsHs)AIl`@NmKK;B6HN~0r9%Jp6Kg%?~0
zq!?Y6>}P)~gGrdY^5~nr_9k98hn|<cR<Q>?hJ|Cy3~);CjwkDDjyHNEL(h;0v?*0m
zTK?Q~WkpW?JpYrg(uhOmR~9pwS$?EwWr6JJ+|L8#^<cG5tlfAQpQ2M(6>I2nLZ|e2
zHwqCq8o?cR?_w8=N<zwYMb6<zQ`G7kyXWg>{8Q`eW$ulxz8>96p1OPPHE;Y$?(Y4+
zXFUhLg+3Ea5Vwv33?meU36~nCD7c28x@T|s<pyfYeMi`cfVg4j%)hWPK26Y%N5~cz
zv8gCr@DC!N2oEr2xMJTck+11?&{$QW#%gge<zD%~K-oV-*}nuovGmY#Pk!X@o9rWD
zVDgum*QjoVE?&)BICg&;x;BP69{0lg7HOsX>J#glDcSOK*E&U-V`dWcDqa5!{7p!p
zPN<PtwK*-G`lEhufNGKw=to)f?7)KA>xI(0@!X_N5O3Q0Ild{kb|I3@G%9t(C60<$
z4DbQxOj@4|Eswby>ug*y2t9t7jLvz{%M^uq8d<+lIvU{k*SNpL0N9N9s=`uszwzts
zy^<@B-poxS@-A^=v))~`(5U-rXs`FUr$J#KN+_Z@4?!OHPjx*kMh$43qiB#(!P)`;
z9^1QN$<h9Bq8|n<arbleoGQZhCPURuTzTu2w!6WL;{=Rbr@DFUB=U7e`$$DAA(O`j
zta>WFr{dMLe!1D#RSFIoJ7}VK@{g~DDz@~Y%b8=!`w_JO0>-9hU93_xUm3w`_VOW(
zJ_BdZI`NW!`bFjQWxq#5uIf<2Eq(xW3wNxgM_(G7HK5A$E=ZHVMK~oT4V@Pi7uYi(
zQ#{{7f~f?eHwF8D+={nT)nkpldy8-<kf5bch2wm)S$kn)z-9p&l{N%Z5g$hi^nY_w
z#c!IgDwt3~aj!8%>7PO^cy7JFX-D7A6%24<ORWKKf8f#_<U>*lc_QQzb=-ENE*KH=
z^r=W}eoK=}XjqA=wbq?C-w{U~!*~hYAaCN7u%FU)myb;M@1KTjF1uz8y`TWbX}GQ$
zY#4{Ax=fkFWd}J0b-`@>Vbr4zl*9$!`-;NonKV?+7kR{U=8L8ZbcPWyS=cMB_0{ql
zCa1gAVE&i9eJ@2BWu5>p<>@>UVlZ?f0|~jl1P8Wq72pW!$hzXlJovXq<qm~Mp*89&
zur}$R!fn^6QZC;A4oERZL8E0%cXN^*<joNE_b)aqoIeHS2-rcGu_)`kcn0DxX-0@d
zZzWJ77D-IjDHIi+Bvwbgjjl@<cgSp5e{h`t$M3R>*Y3Cq=xPFe2rhm`TY1aFPw<%K
zLBMg;*K=nmpvqUqVb2otkYQd9*Zz9(zco|BCG_5H_WSq#dv>=f<^44>%g>I2Uz(k`
z+PLzWqtNKiA10@p*S<)4(_9^V=1re3*0u1^Hm2GklxX%a40>Dw^klDISbnU*M_CBt
zkp1Nef_S&X+%H_P>dcTrN6kacGe?U(10_^BN6&GD-4|o2FPzT7<4>zf>h8vuY|^j$
zUGA&*7HP<i)TjYDn<Pc+RpsLw^}7elY4VGVR5DkOadxsHaeVG!CF)uae0*~X-hAZy
z>W!$%c_q0L{HV*0)RHoJQlTnM@YAFzGKzAEd-jf0*F&8t6aH+PK*rE;nq+Y_*Jl|O
z$StYCHaJ)B7$+yx{Mk^^Ib!)ymT7nU+7S=W_b%%NN4(y<oUnu9+`LDUv+AF*vojym
zrBc%S@(5Bu93MoiQcgICjtQmO5XK)cJKGCb=X0hE>hL{s7%i)g?GSVdlqP7ICg-#)
z><zb%&=jQkH6IDO{Y!!Z@@zL~>s7n2e)*L_oO1@(9r?KF4e#Ms#Z;<Tg~x9Uox2@9
zszi`BO=(*ttsxM7xA~pqQ)q%(xG?)pLgnLcmuX}jRW6C((x%+gmU>vO@}1mK%pH#5
zj=o}N{q|!sKkp=a{|DoQ2x&-dzNe&pEce4nv;&(RIDm7`^dyn{I~zjZd<R#_B3!5L
zVJqG2v)ZGgNdeLsy<(Bd-r0MGR9M7#KSCn)f+*Ud)8{lJ)LF@1AD)3=+r|3|McDT%
z2y+lUHR~ux@Zy}!yEE^^y+|TF=6>2iy|Xh?gQ$WYK@d-k8g`mO+J^qPrfsQheR<+9
zG2btBgZk2b87L{4F?xMvR0)@Feh^h(Rq{d6Cd~eR<m<w@A(i?%cK)J3PN(C#g@*Fo
zrF*SlA5nmfz<iS9YQ8#7{cL2GP&#qYv59Xy61;O(mjSYqO}8_1e2PyGS@F$SR*RoE
z(BQvXn!2_3V`zi<N3$qyHkSJ9Uk9@3iQ8OxTXKnF-TOt_?dqHm<;5-^C146Fa&DUi
zXymMOamDv<i-TvUJ|ZBybI02}r12c?-xdXHSi*Yo?>yAc26ddVyLqsgZ1<8kth8Qj
zv)R!@)9frnyJ2*2%X5AHG&nqU_9D1+yR3UzW6m_t`PMa0iL|LIY3PHo$xCU7X=^9y
z1l`<JFAA~#6NG;jmveFrQ0^p6xx3pZeEMsQ+&B&@=(+X=T#X&yL5%FVj(`(i$<g5R
zOdr(O6!4aq=SDAFKiYr%sxA{ZD)i?F<??k)4{&?*_m8BQLm}rB1o1-z+Ytlm5t(3j
zjdSPpj8`|uv(bUNpoZ|O6M4L9K!v@eo>0#Ne4QEt&Jfr$@M^e}k9Bv@H=}0-w#tXK
z?L&>_j<i925nhb3$$)B~@#fYuBAE3anB?&Rue6G0Xl9+q$LqDOT_}0TSQI(>v!KUP
z3cL)|Jw2y)Ka`HPAb;0@`NwlWyQH@}U!#{4$u!GU;Ze;}mN|{ffauAX(LYg)1wB1P
zjEzNkX=R7w?(n;w)DctMR+DVw&h|NViXYnAC`j_&eZ9tpzN{_dy@%}tu?FY%;}pQS
zj>IA&v?uBncV~Z1E|*Q!&1(?6lNR5Xo|S?~pZ4-asfjGBsDZ>U#ZGs*$>Pnst{s=%
zZl=%I8z-y1<p&N$t%$*MyxEn8Vm1r5<j{gYUI#fGM3%M>PnR3GhVVJ#j_WTt@-A~i
zHy`f(?WRTKB*dd38wd4Og>-ggteR*$;hjX+Lfdf)w`T?3@AH9=h{cMbBE`vA2Ha5)
z2uQfdb&317gjJ3&l>Vn0vdb^(;^L<dxH%yc1C&v$G^912yZ6~`@9)__!fc5P_(Zd{
z7{zrqzF>nkW~Yp@=JcyYC&n0SPUI8OIg%g%e`jhaOY>ZD4}m-*k%a6p;XxJz&T0rX
z@QL<dd*Rc9w`aSQDz;1%Nxa2Efun;dh;MS`JVikqG|-7VTicwT{{Hj+<GfE-aL)3o
z&?GZmz;s>BB0H5)j8|lUbohNGiMZe84;GH>_{(;zsW(Ge32*u|;_Zq!2IuF3q<Nop
zc#V)qx5!c#9gjZ)u^g)@iX!&AKKDMo@JoL4i&qdTR-e3PUME7O#mi=RUrz*UXQhz#
zwOFh<`+QmSfpcg${Z*k##g6{XVOh73_*PYqB%!D77eoTh&)P8<9ndpDZhquq{L0r$
zIcYa(%A=iErwk%!<?ME(m(42lViCA|Kn7xlln7GUcxY49A20ttn)5lCER@6ZPw_4s
zRhCD3LGY;tFCxH;nL)L28?hW9l!JOc#w)GE<%YN$(HE%1C$+u%AD4Y8d;3jgv6!Ar
z3~$vW@@Q#hp$8Zy(D4Y88H#o*LVemv5Ol{*dN4cPBn#ocjW>*zh?{3(2(<cW>|`Qv
z#X?~j(D+Me^S9Tq0R{HGz=aESpIwjJ)3|84Bz*KJyMoh|S0!;Ip1+AMVvsBImR9gw
zY7IsV^CGaEO)=yZ)D2lHF<Q(zYwymdVy7~4>*qk(xDa#pqun%%1yg6io{fQq2YEF=
zegM>uyO$OrQadxO<+Jfk@xIa(NYZ5`*iY&A(o?zvD{tL)>IC~UD9khFbm}8)AD(#*
z6a6yCiFRhE8}=1!O=9|r8XOl2qf$SETVeU!oyA9R>mo?vYg@iT{{vwVp?QwfJk&v>
z+8pcf7sRNb7N=ZtfS*2wgw8yLbP>{aQ@&sGvgycCpL>e!#ip+nW2ZOD169jUt8<d%
zO0P(A!G%F@`tH501?!#IOOOKi;=zyW@peN-17UNP8heioBD`yR{x+KFE(%9n_f69=
zqryqGK{=Hs9pX<46gMZAM*#&skCvFxu^k7)TJkmbJ1oR$A;PO;EGnYE1^as6qbgK5
zv8*17!uQWsghH;Pc@k_C*5t06`*SA2h)Ee?kgCn{_8c2C8~J*0KQNhyA%;bDcn;=g
z_glSQm*?QKgR(a7ZDcc?zp*fQ-E)46y>X?x1C4C6w}NxUPenj0TvkW2>4rB%!!rzT
z3<VF|4XwEzix4RD9YtJaqJ;h5M?)`l2AnvzA!R56)Cr$}k$TkD>-^RIJt&^tSWQ#W
z!}O?31gYVyg=&_s-rHYR7p`LjITH=C?W2(jSVlEW^g%KAo?qA+tz}Ijt+v<ROWF^%
zv53s`rvqg`{yJi6>gh4`Nlhfw3r-`MVbgY5-W2_I+Ejwj#`TW-d4vZtPn8pUw~Y`y
z-q`4VJRsp)3JX<4dTt;{C&LvQ&b$15Hu3A_pt8vK=))~s1hdCGuk(Ov;dws;JSLdb
zHOYfUwsgQG8CeY{*vgy5Te@ly#Txd{N)z(tc2e4ba%eb{jmZs;yRnFjWut>k50uT`
zAGpNS&D{F4vaW`hFKE~geC@&P;z*_slh@MV#7ehQpO94TOtieNKH5_PVrk1sJ=Wh<
z3=rX>#>&F>>0x<$v)f_3eP2{kriPl5oiuB?0CA=7*%uN@)?RSGs*EJ{;{Te;`R{Pv
zAbEZX2RS+y;PJ_tX0k+}XkZTA9F-fr9VF^Jr#c{`lEL1~2;6t;Zh~vldGz<Q>7Y39
zc<y@(t5M=vC{3uI78*3x9t5F<H|vbDR7z5{4PuPqxblAKogiM=j0U&`!NtxqT`~e7
z%GJ3vI-AK7K~%_m;P#e0IytYK%lf5MMUrg|OiQHFW8K>oF1XlW`uB5-p;ubHON9aT
zPx?`BpdUp;%|T@HQBw)t5bbWN{jN~gL_kjB-1|~LM*xB5wKF?Stgg{eJG$X{1;Gv|
z?VwzzD$LVvWNi*cWA@6@_Hx!uYZ+$-7FTIga4nE9J15kqR=%R_cdknLxk1~Vg6rer
z%0PYnE_tpXv(a2nde-BX`&J}^K}x=aMuwdOsU&ntyg9UGK5s5>ghwMc+0FbXeGUW`
zDlOkRs>3K_HR7`^KUOqhjd?qltsNYAZ2mAxLbw}VfzGA*)%iR70kPGg6}?PeRia3d
z!PNlj;)9;Q#s^=ML=91KDi#)UkxX*cd&nDDsUxsl^4iuu7@tHk4e@Afb37YaR)}|t
z$^Lle0+0^8<iVW!H_i6~<KvB2C$By(P~Nl)rwfwR0+4grYj%;^zmtvc#sP$#1qeOk
zo&Yk2?~05~AwhUKM<eVnQ1wXrj?LiNtfmzuFdSpl$-`Rad_eQ!CRJT|+l!6Kvo<|T
z)DfDpllFsG!u?8g+aQC!@1gnRo#-|05D?bXX?)i}0>QH`p+-acbf`$QKnyp}H=NgD
zykhCW>{=kW3X&jP4siQT?DL<$9{7qObQq2Nfgb~Ek+Jq1d<F>0DRc>R&g9U2iy_9h
z6uMxwXD72TL?eklHA<t_$qbZnuQfXwbLc>fjKX53)u^x@kxTKF?b@8!uJe`vHN)w;
z$C7Tg)-%940Y{<V6JS6_n(=mq=jwdk%#VHL_MP)A8~v)oR@*_niJZ+l6r6~Z9TZ}w
zw2bu~T^gD1z;E`BNS-3T9v2CCvnu=%c-dloio&l)WkGcNzyT2$r-eX0+$JBl)nu?J
z*<YN8e><$y>iE&2?246M8x&SLqmKYJG^f9ukCiR!quDQ?pOv8w{&v)##Pn6eZiZFb
zd~KoVoMi=1+vz2`JL-yMnTG>q>VNU<eJiNvd(X8ES1#6`JLyjj-Hp?51F)Yb77+1a
z`li|~z28~!CVLy^5(J@tMmL#>Au^aJ@lVf0rO-*(yVAbDZQN_p*qgR{&-2t$FhGzf
z0=^bK1XmE>83~`;eDku}zEG*bg8uBgn8Af7-{*t|<2{gCTAWz@KeB6=0elrq9xQfn
z1GjJv{I|Xr0r=9pgAVDkfOE}K6r_S|YM3Mfs}mjMSLm2yXqFN}I?MeBJx=@YvSMXa
zW?OR^Ed>EVB5TRpuauK^b5(=5c_W#&{)D;)E6-X-FcEb9`Y0iemZB>I7h>(qUUeTk
zQfKyZXJ5aU&uDhS<ws<nhfIJ6@+pYLuwje``Ry1h+j|rLT<G%gzZpv?Lycy`o)IHD
zS&@=J)xE{Cv3t2+AECd<aM#FXL)MBXtc&T<wg^(BaqqqV=-)b7-J?HnKbZ*TFF~?8
z)eJ`RO@2<RG#<=Q-5VEckKZw&HpJiJ^!16q$MeWV*6FJ3Sh-O63B{J5qDYQhpt3rt
zBa8<H$@@AfY|~f&3`;8FJ~o%3Y(<x6e}Q1wD}9Xtl8kT}UpUT{QpuCluq6M3Fn{dP
z#2XB0qEzlobV9f^K|guKU1`w2glB89pq|lcz}}np5-48o9Y)5(_>f;(U-5k-n+EEO
zZ?MgI8!F397hq3)f6vuC<z5bc=J5&(Lcf=>bpLX}>k4yDLhqCDEemsLkno7qdYNz4
z4!GP)BUk-e8+)=(XR!#<+~w~{<P#@8Y>pK=wgzKIU#q&N5CWU-dxWzdFw{7(H)fY!
z-eI0~ZzGzb#Wr}}nx|dNAus*;*ev=)s5OOqz{mgFllj1wF(dNrdY7f4)grUW-eEyQ
zyk*8fy+W*mxl(t0gft-<*bQmWnQw2Mdw;W1kCgsp-w0=6VqvircheeEzkP5uxVC1K
z26aiU&-{-4qs64Pmbh&1Omf3oH0{vv$^DL`YuklqkFUL7E-IQHLnKQ_O7n&ZuPTq=
zk3@B!5N{rk+7g=ep#Kw-M#tWpmVDy=?bZ~TV+ZS!nbuP`I5swgMiQ=pQ|${=bGKjQ
zVfsvEM{gG(GqW%@u`Y709u_>KNB^)Q1}%U;)#GMSM-M*g-KPi$7yj@EXo1tUw5bKL
z_HiSIiJkcUtnroThK0)EP~tDiVSUKN{N8WOnZ>D7aR|$r2r4bV!HU3{O0ADC5fM#5
zDX+_VH$<tDc)pQ;1U5MJgW`C&-dCG}q4Aa6MJxs)osY9?Oa9z2)%;c>W;HMMgKb4G
zjn>Oe-ZB?#22iRv?nqh(az^@f$;31A;L120ULFH8Z6waH0nPU0(XT9c$?qVL_we43
z(wp3WnGR@larDEH!Y!z(<zQm)>c{pZe!_wm(4wuzZt^?)ewd^~aTQ2dwEzXi^m;Bl
z(M{Q6p*8}o78QViPteO#lSMqe^bVmPjsfFp9A7_>W<w~aC`ufETnxY?-+lF{kcl_x
zj8wX;Pda$mkdS0shoi-qMvtCt!eDOR{G*yMD((Fg5Vb%bi=)lPi1g|$*@}@Q(tL?G
z|D@Z4ZR$p1?h$VA0ZgaXQGv}0LHD)I>--!GH>Mt5613trxT{$U7RETP%+}*jxLDv`
z&xq+5a)S3UA9tT}@8;#&s^yzU58SEmejuvedW_`}Sf{TX4jQhxb>~jm_>EuMs;Do?
zM-y@GH^xlSrlyHP{!e8=_1_oS(2q!uX*y>d^g0vWQJspT8H(jDalyirw#;WKH>n2R
zWL)l73a2#uV2bu#sFFC1a^M2MAi=qP&9?~ep~Ga7xHPp|&7p>`y!QLyDWpR+FzK=@
zO8#w7`NH(b#Yc<HM^i=;*`|+9^?scFLHX+Wm$&u_tQ0cQpqM8~{!v|ycb)PYX8SmO
z?N)!5VHmH1@q6yhEAVI^aw~Vb3;E<6Qc{T)!S!hxw0j1qgzw-@n8u875iAQDzj%&3
zWE8-^yDm#a#Uh;AFWG0aiknM7EvkH2B+MZv^R%g`je@%VQS|sl#Qi!}tG!pos{_4d
z;k^4d8>$h&+t}2cU`5!yVj$j#0Jq;CznI$gby(a%tg$AwWY4B~?2>M-U;J}L$qG>9
z^y)10h}>cV%I@|5Uhkp(dK#s4CzWuk&A(W&BHZTkBTRu}M6@*FjM?;;rkJa0lsGLw
zd=pH(NYI^o*I!)-!HQAD&u`yKJF~swdJEd?aa3vR4cIq}-?km#5JmRonWA*U0*b>z
zNV4PsS(FMh2Q2F>l@J2IjY8|syPB@Uj6Uf6PTdc+@t;~jag%K(lb9#x@#oedP!L!R
z13Mhok+cX^(pK#Hz-E;t(qvj_*h>5NL<Yvjkg6N$g;ccz==cK==+OVY-)|Q}s&ITz
zF<$XqIS<Y8)<x4bK{U|jLsZYdMQ)$jkm$B0YDJ3Um0@6=H>X7IBI%+yMC!EV>#YB>
zPTs2G8cdaIyHSqES8vRF9)0^_SlkY>Sl{D$$KA=%2D#jkRP3}DRAE(I8J`$~bML^5
z@;`uwvxOivzK*r#gC6zW1Vh$ZI#6EUSzl6jag7`*abY)7lU>=k&d+ny4wAL==A9j#
zQ}z~nmu}6B@+cRffNYGYMsm^@tn047N<Q8mE_bGLtf9h!lk9HP60`W`7>}D}E>FRk
z=qP|}n}>E^O+4{b%Ur&Kt!`s5fl?*4xeHMOuWu*m-052>r$zh{PS;w782_P`O?m1~
z@p1VoON!pOo$V6A)fF6-+hw}cBsuHfe404wf;7u=qNIoY0+8(Qahi<-LI0W2m{-1r
z)XmX!MJUt1&P%H&E(z8sTGpWQcP-L|{Ua+}NQolI%KVUTI&3;euY7Hy46z33BYJk$
z1_1d?NC+3K(2=l{uysKyo<hCF(@^{ws!}-8qVPO+MsaQfYxjWJ)m88J%mNESwsX;1
zs2Mw?uwoze<m%FaPU2t|Av=D28tSIhFIBKmp!rx<6%pv<x18Tj?Yk>5w5HZCT%%w;
zYkkJfZ-4IN*!brZ7Q=Rbd4Ij*PU*8E0|(yakGH-3B@U{}MGNS(LtQVkT2U*TR2=jF
z(-=aR##Y&Q$zCW;XXl+j&f6LJMVk6`?Q|xT$NFc0scb*TKmun)sBA?$Y1!)&CByFV
zMk+lOcA1b-brwaEmSYhXHwyJg_~$5(&9}csj#4iku&UtH-P2lOL?%g=9pVUYQ0OdT
z`9zhF;}OKu@zL7vbn!raQ%Jb(Bn3o?qgsv+`SxXg^lQRQKu&FFD)U(PW|H{R{++>8
zpFeCMEP?-zVvD$OUhKi`an7zRBAUqe^V|CnVJlw?h95m+AT{r%1n+!M<s=EZrxNyU
ziJEZZ@(@}4(e-=O3s@Lr6C_QLJ2mP?o_#Lh@ET5I0k{Xqd;*Xo9r*eIHWTAe*$@cs
zj-hl}-_Y%Ve3KF7Q6>N?8;I9{N~X`IVN_7F^8pN6!f7|k<3VA?cNb8GgEE;)CYCa2
zOv}BRHz!vRB(xCJM))&JMMw3~9PSAnBG|JI)fL~B0I~tD7oNAnBF{Xy9UsUK<=<F<
z?m87!d`|-^0!}O@NE2_cT|67U|Mv0=f@A7o|7G@+9?fPBd<l|R6^o!R?o3KrvR34$
zsg%k<<`i89Y52Rthe_aJQD@Sf^@2L^uuATtjmN%+3eH3gzJ7<jEQ;i^0bZ`2ravC#
z6xoIN(Fc-fA1iqGoeFJ)m)tCfAvgCr2ODN9(`|iI<$59XY@2N({21Ft;4+7Oo}#u2
zBV-Q8#$!GUoM7(m{q`GD@bo1j$h&uODA4}h|4w)hzz07*oP88%ASNBsb|DsVE)z`{
zd!JtrY|>H3kDhhX1h@w{<<~~=zD^qkarA@!CSAbA@Nk-rL$1D5;l!N<CYg2616VPZ
z3XBOgyQmMd7kd^gb_<6(_5v00I5*IN0E1Hc@J4WWun`;zE2YDF1$nGI5x&m(BVC$E
z1#rp~(5a*is7}UY(*dax`VFa!24TG?>7%eJR*E&pV4x(h+9&6Ka-G%Y#N7ZCY#;R4
z3nH2?mfd{-Ju5s^i5v+#tSWsNp+JKo%s!8otMQOexSMSRS_2gJdK<*m^zRqLHbNMf
z-`jl%azKZJ54;2XLKJ!G3L`YJ_M!_R^8|cF6z(a;B3NIc2`k=y`yPCq0^0n5ZgA|D
z%80-ZwYYltsiI{<|GjxT79scsO}HmlcK0POSL?r3PPP%4fPBO#RiW6%{_S&ooigrH
zV}gf*Q4~RH0l@%X#eM|gIRwjm92DPEO<)D6=M6@L59C*Zs}BDv8Gzvc<@_u{LHuB)
zxEsdc@OtK8vhYxX{b1qOU}1A*GBaPNQIx3;{BxczCyog;t+oD>jK=~?gD24KafL4n
z2a`k@NTdk1v7f+}t6#&Lnw65ai2w~IS>WDt9v@l@_M9lP<u~}Yb-fIc%c_VVsk3R^
zA8vd2wmwxv06&!XnWC|9tneQP0Ok=2R=B-u(m|yP8GZYEd=rhhl!##i-<^gCZTeIK
zG9nb!`|YJNpn!hX9DL|PdR}2P;3W*WpdX|c@W;`J7h@4Lz^VKJR!Hy$%{Vx}1J!Ym
zG|}dt(D7)nv03~7H_lj~NZ26$(bF#o-hDN@E_|do+pby>*rY|2?XW7a-2(F{D+cui
z!|3(&h4-cQhl@{UV?;=o>~H7d*PjXym4qIiq8JqdsR<Yex)nA}RH`ICO>FJ_zL_Da
zK^MkG{)uO@%n+3UEIO1<q<l9a=sRI2X|PNk?RG!vh!r&$O<<Ciwn6=4Cb2wQC_5OE
zl^rs_^KU1yG14{~U?*Z0ViX(N$k}!ol|s>Q&}#VuTMEF-B!hwDbt2FHBBBZXpoQhM
z`09JTSQt!Jn>uHqZV*3_TRd$Gy6dvE=y!?mb=%1`EA`Me+f+FV>0u^;ku8aJ6DRmc
zKg9sEz(DXs73L9O#IvGD73&l>;YZeu`_CNeBFNawfe*Sb2S_4Nfew7Roj&XZa3|Ub
zy4QgMuNNpu&^VkpiL^04!Ua2SXz~@NFIa`qO@paZA*N>IuY_SBNb!vhM;(z@b-M}3
z@T4jnsGm=ul8FIXjmWOg>4j|&d(MOcGlyE*KY`{t3hLTj+9NX9$b}!8)(SX?(h4L}
zj$d~I?qWjsDi<g8Q7Hn%SeQ_frzkRC`adlq{u*adfx&5t#}z<nLH;FSN3sLLe(zR<
zPK>2mu9L^>qb0cx-7G0l6iEf1t?j>E0@^8QQwwqAs=`i-v?YRUG*=~=2p}wq!M_f;
zaj!R)*X9A7nL-4qyS|)-ok?cE5sseP99rk&BTb(<WN1qU=pz%+a=#^^e1Khw1cTff
z;1)vi$)0c6FP?Q@jLJHg<a+{uEmKq?Kbp2g&XXS2NT$1kp9m_9o%CQvDsa3-f)){W
z^8t7OMW|%75#TgMoDH$N;63Us^iVH&cd^=<0rw7uV<7DHXQD{3hm!rb_MnkhNkd0{
znTZ;3H6FHj-c+?%1W=8EdY%4B($`~^yRNi|@1`s;S(%2r(m=jvc~}r6AyYYy7hxGl
z=|jnLm5C#PnwtP)>qBKw@Kzo21j|)+1}T1;0_2bPdeaWu>Zr_fz2<kgBVk*l`B989
z{pZ#SDe+V62l))VwQ~1d4`UYYLw_8gWAwQtos;n~R<{w$O*)E}iNZtM_LQHyrw+E@
z{xU!vY@v@ogTm%rHrPTHP>eEFnAYap=KnFsCOm?cV2}uZ0UTm^y9%VMO7gE^?mLx1
zL1Z~G`wyywu<oZUsYECUH#k_KENK|?ghcf0+5szp5uG|31`e#j(<J?y=FJOOY||SO
zF%S6)kE>B)XPQES&27OTf~`?L254l)^3lcpL<XWSjNJfwa*SXVxC4B+WG0-2EzMXH
zz9#_~_syZN&M-+j<n2iPjtdxld8cQ7i4M^wTG#R~UaA!^!7FZs4N+p|>S~l&HWr74
z(IOId@Z>DSzjh#$aKyp+Rqx_9y$ZHU@m3x$c*Id_kbnTh#~y5SkZWOVgqOJYPb(Qu
zJ0EH#20Xs9u~;V$gl&RC07x5*BQTz}JA688t!TRmWvqe@3LAyd6Sxro*)(aHP+`Id
zmmktgo&qUhG8_HlSt(GvfOI^^=#Z4M&z3%oBikYMr_niSpsfi8J<u|Q8O*;I<fDAM
z%O*$YB&-EC!QdDU{BzSx!0`Q6@ZGk%FM*5v$IC7bA5J0~3bXO%&7lOvD|r1%%XRqm
z*NG?4cVB_ND%j$)qByWcqDVG%V1M6;`JJnWUhJ`Kyfl^(VzFBSpHwcmUC)QkiTX!~
z=jV1v6~e{B+-lfV5<?$0Ucua+nuiZE>-X3267xf~R~c{;@PQkMv<&{S9#}$SseUbJ
zj5JiwkIvzlgAI{{77#_UAh6Lwj}~Z-4m$!ui_8v(xY0_$54!x<_S4aa4rcc4KYI0E
z*@1ZR#|_AtGVCP9J7%b?7e1&5Vcrz}PYFIe4R{UUn<qO7yOfA^`<J}nF^2))KOOK4
zcs)Pl_h_rk$Nw@zCnlyg?x7G&OkZ6zENr3!v%D~v_3J;6fVq(guP5Y>GeJQiVXCCx
z`JyUtMh8aNpiiC#mWwsX#72(?HY`<5oKV58{qK<|Y`sFNv@Fem4V?~2hf>^qEDn1Q
z_xwnZtV6Uieyxg!CveaX`TP7}M#2Jj9)^PjVad}Oz`p=f`SqypC5BEn5SsoePx9mA
zoP{iaH36_|q8{0G>npo?iGvUaPDB7JE4QQqaT}nNM?)DzzPs*^zxg;kw2MMq`6r1D
zr?;@zIJRhgoQVgQNxkG}3bPx6P8Lr7Kl7#u{LTEMaPJxAR`pNlKIKO6yyK02QDO8V
z-~Ar>Y5X^?bOs*B%)T%O%-I$h#uQGVUfNIOCCnuq263m3>^7h;&l}+w0~{vj(q*um
zP4anpX<j}0QfmvWKCm92o2d{Xc?Q^XCQOa_qjq@K`;~YP4I`|+E#vY){oh>J{v-+J
zQUE~(5XVPd*uChy#jkrwAyf}TC4^mZF@@<YKDcIn1*?DPccJGkU)89Z_(_-iuzdgV
ztPr@pQ{bc{(7^K+6);CkB{@WN#3=md*ugO-;2bbEZ^d|FQyy^Bg)KR0&f3pd2Fv*0
zl*6ocB%4%%U=gGW^bq`!JS`NZNf!}VzJG5>D!IlXK=^I8Nri~eVYGrc3ZB8c>IP1M
z|A@^G5C@)ulQ!Vbyy89x46H!uSZrW>3;KVt+$=A_o6TEit0E!{0Cl?wN~{kT5*c81
eg(7~D*=(TSuc+2Vg>$>$Uo=(quH;{`3H(1~Zh71Q

literal 0
HcmV?d00001