diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.12.4
+current_version = 4.13.0
 message = release: Bump version {current_version} to {new_version}
 
 [bumpversion:file:rhodecode/VERSION]
diff --git a/.release.cfg b/.release.cfg
--- a/.release.cfg
+++ b/.release.cfg
@@ -5,25 +5,20 @@ done = false
 done = true
 
 [task:rc_tools_pinned]
-done = true
 
 [task:fixes_on_stable]
-done = true
 
 [task:pip2nix_generated]
-done = true
 
 [task:changelog_updated]
-done = true
 
 [task:generate_api_docs]
-done = true
+
+[task:updated_translation]
 
 [release]
-state = prepared
-version = 4.12.4
-
-[task:updated_translation]
+state = in_progress
+version = 4.13.0
 
 [task:generate_js_routes]
 
diff --git a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -26,6 +26,8 @@ recursive-include rhodecode *.mako
 # 502 page
 include rhodecode/public/502.html
 
+# robots
+include rhodecode/public/robots.txt
 
 # images, css
 include rhodecode/public/css/*.css
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -7,8 +7,9 @@ About
 
 ``RhodeCode`` is a fast and powerful management tool for Mercurial_ and GIT_
 and Subversion_ with a built in push/pull server, full text search,
-pull requests and powerfull code-review system. It works on http/https and
+pull requests and powerful code-review system. It works on http/https and
 has a few unique features like:
+
  - plugable architecture
  - advanced permission system with IP restrictions
  - rich set of authentication plugins including LDAP,
@@ -78,10 +79,9 @@ Listed bellow are various support resour
 
 - Official issue tracker `RhodeCode Issue tracker <https://issues.rhodecode.com>`_
 
-- Search our community portal `Community portal <https://community.rhodecode.com>`_
+- Official Slack Community Channel `RhodeCode Slack <https://rhodecode.com/join>`_
 
-- Join #rhodecode on FreeNode (irc.freenode.net)
-  or use http://webchat.freenode.net/?channels=rhodecode for web access to irc.
+- Search our community portal `Community portal <https://community.rhodecode.com>`_
 
 - You can also follow RhodeCode on twitter **@RhodeCode** where we often post
   news and other interesting stuff about RhodeCode.
diff --git a/bower.json b/bower.json
--- a/bower.json
+++ b/bower.json
@@ -3,15 +3,15 @@
   "description": "User interface for elements for rhodecode",
   "main": "index.html",
   "dependencies": {
-    "webcomponentsjs": "^0.7.22",
-    "polymer": "Polymer/polymer#^1.6.1",
-    "paper-button": "PolymerElements/paper-button#^1.0.13",
-    "paper-spinner": "PolymerElements/paper-spinner#^1.2.0",
-    "paper-tooltip": "PolymerElements/paper-tooltip#^1.1.2",
-    "paper-toast": "PolymerElements/paper-toast#^1.3.0",
-    "paper-toggle-button": "PolymerElements/paper-toggle-button#^1.2.0",
-    "iron-ajax": "PolymerElements/iron-ajax#^1.4.3",
-    "iron-autogrow-textarea": "PolymerElements/iron-autogrow-textarea#^1.0.13",
-    "iron-a11y-keys": "PolymerElements/iron-a11y-keys#^1.0.6"
+    "webcomponentsjs": "^1.2.3",
+    "polymer": "Polymer/polymer#^2.6.0",
+    "paper-button": "PolymerElements/paper-button#^2.1.2",
+    "paper-spinner": "PolymerElements/paper-spinner#^2.1.0",
+    "paper-tooltip": "PolymerElements/paper-tooltip#^2.1.1",
+    "paper-toast": "PolymerElements/paper-toast#^2.1.2",
+    "paper-toggle-button": "PolymerElements/paper-toggle-button#^2.1.1",
+    "iron-ajax": "PolymerElements/iron-ajax#^2.1.3",
+    "iron-autogrow-textarea": "PolymerElements/iron-autogrow-textarea#^2.2.0",
+    "iron-a11y-keys": "PolymerElements/iron-a11y-keys#^2.1.2"
   }
 }
diff --git a/configs/development.ini b/configs/development.ini
--- a/configs/development.ini
+++ b/configs/development.ini
@@ -2,7 +2,6 @@
 
 ################################################################################
 ##                 RHODECODE COMMUNITY EDITION CONFIGURATION                  ##
-# The %(here)s variable will be replaced with the parent directory of this file#
 ################################################################################
 
 [DEFAULT]
@@ -46,10 +45,9 @@ debug = true
 host = 127.0.0.1
 port = 5000
 
-##################################
-##     WAITRESS WSGI SERVER     ##
-## Recommended for Development  ##
-##################################
+###########################################################
+## WAITRESS WSGI SERVER - Recommended for Development  ####
+###########################################################
 
 use = egg:waitress#main
 ## number of worker threads
@@ -67,15 +65,15 @@ asyncore_use_poll = true
 ## run with gunicorn --log-config rhodecode.ini --paste rhodecode.ini
 
 #use = egg:gunicorn#main
-## Sets the number of process workers. You must set `instance_id = *`
-## when this option is set to more than one worker, recommended
-## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
-## The `instance_id = *` must be set in the [app:main] section below
+## Sets the number of process workers. More workers means more concurent connections
+## RhodeCode can handle at the same time. Each additional worker also it increases
+## memory usage as each has it's own set of caches.
+## Recommended value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers, but no more
+## than 8-10 unless for really big deployments .e.g 700-1000 users.
+## `instance_id = *` must be set in the [app:main] section below (which is the default)
+## when using more than 1 worker.
 #workers = 2
-## number of threads for each of the worker, must be set to 1 for gevent
-## generally recommended to be at 1
-#threads = 1
-## process name
+## process name visible in process list
 #proc_name = rhodecode
 ## type of worker class, one of sync, gevent
 ## recommended for bigger setup is using of of other than sync one
@@ -103,6 +101,11 @@ use = egg:PasteDeploy#prefix
 prefix = /
 
 [app:main]
+## The %(here)s variable will be replaced with the absolute path of parent directory
+## of this file
+## In addition ENVIRONMENT variables usage is possible, e.g
+## sqlalchemy.db1.url = {ENV_RC_DB_URL}
+
 use = egg:rhodecode-enterprise-ce
 
 ## enable proxy prefix middleware, defined above
@@ -148,12 +151,12 @@ gzip_responses = false
 ## autogenerate javascript routes file on startup
 generate_js_files = false
 
-## Optional Languages
-## en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
+## System global default language.
+## All available languages: en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
 lang = en
 
-## perform a full repository scan on each server start, this should be
-## set to false after first startup, to allow faster server restarts.
+## Perform a full repository scan and import on each server start.
+## Settings this to true could lead to very long startup time.
 startup.import_repos = false
 
 ## Uncomment and set this path to use archive download cache.
@@ -167,23 +170,23 @@ startup.import_repos = false
 ## SSH calls. Set this for events to receive proper url for SSH calls.
 app.base_url = http://rhodecode.local
 
-## change this to unique ID for security
+## Unique application ID. Should be a random unique string for security.
 app_instance_uuid = rc-production
 
-## cut off limit for large diffs (size in bytes). If overall diff size on
+## Cut off limit for large diffs (size in bytes). If overall diff size on
 ## commit, or pull request exceeds this limit this diff will be displayed
 ## partially. E.g 512000 == 512Kb
 cut_off_limit_diff = 512000
 
-## cut off limit for large files inside diffs (size in bytes). Each individual
+## Cut off limit for large files inside diffs (size in bytes). Each individual
 ## file inside diff which exceeds this limit will be displayed partially.
 ##  E.g 128000 == 128Kb
 cut_off_limit_file = 128000
 
-## use cache version of scm repo everywhere
+## use cached version of vcs repositories everywhere. Recommended to be `true`
 vcs_full_cache = true
 
-## force https in RhodeCode, fixes https redirects, assumes it's always https
+## Force https in RhodeCode, fixes https redirects, assumes it's always https.
 ## Normally this is controlled by proper http flags sent from http server
 force_https = false
 
@@ -230,7 +233,7 @@ gist_alias_url =
 #    GistView:*
 api_access_controllers_whitelist =
 
-## default encoding used to convert from and to unicode
+## Default encoding used to convert from and to unicode
 ## can be also a comma separated list of encoding in case of mixed encodings
 default_encoding = UTF-8
 
@@ -277,8 +280,8 @@ allow_repo_location_change = true
 ## allows to setup custom hooks in settings page
 allow_custom_hooks_settings = true
 
-## generated license token, goto license page in RhodeCode settings to obtain
-## new token
+## Generated license token required for EE edition license.
+## New generated token value can be found in Admin > settings > license page.
 license_token =
 
 ## supervisor connection uri, for managing supervisor and logs.
@@ -308,65 +311,66 @@ celery.max_tasks_per_child = 100
 ## tasks will never be sent to the queue, but executed locally instead.
 celery.task_always_eager = false
 
-####################################
-###         BEAKER CACHE        ####
-####################################
-# default cache dir for templates.  Putting this into a ramdisk
-## can boost performance, eg. %(here)s/data_ramdisk
+#####################################
+###         DOGPILE CACHE        ####
+#####################################
+## Default cache dir for caches.  Putting this into a ramdisk
+## can boost performance, eg. /tmpfs/data_ramdisk, however this directory might require
+## large amount of space
 cache_dir = %(here)s/data
 
-## locking and default file storage for Beaker. Putting this into a ramdisk
-## can boost performance, eg. %(here)s/data_ramdisk/cache/beaker_data
-beaker.cache.data_dir = %(here)s/data/cache/beaker_data
-beaker.cache.lock_dir = %(here)s/data/cache/beaker_lock
-
-beaker.cache.regions = super_short_term, short_term, long_term, sql_cache_short, auth_plugins, repo_cache_long
+## `cache_perms` cache settings for permission tree, auth TTL.
+rc_cache.cache_perms.backend = dogpile.cache.rc.file_namespace
+rc_cache.cache_perms.expiration_time = 300
 
-beaker.cache.super_short_term.type = memory
-beaker.cache.super_short_term.expire = 10
-beaker.cache.super_short_term.key_length = 256
+## alternative `cache_perms` redis backend with distributed lock
+#rc_cache.cache_perms.backend = dogpile.cache.rc.redis
+#rc_cache.cache_perms.expiration_time = 300
+## redis_expiration_time needs to be greater then expiration_time
+#rc_cache.cache_perms.arguments.redis_expiration_time = 7200
+#rc_cache.cache_perms.arguments.socket_timeout = 30
+#rc_cache.cache_perms.arguments.host = localhost
+#rc_cache.cache_perms.arguments.port = 6379
+#rc_cache.cache_perms.arguments.db = 0
+#rc_cache.cache_perms.arguments.distributed_lock = true
 
-beaker.cache.short_term.type = memory
-beaker.cache.short_term.expire = 60
-beaker.cache.short_term.key_length = 256
-
-beaker.cache.long_term.type = memory
-beaker.cache.long_term.expire = 36000
-beaker.cache.long_term.key_length = 256
+## `cache_repo` cache settings for FileTree, Readme, RSS FEEDS
+rc_cache.cache_repo.backend = dogpile.cache.rc.file_namespace
+rc_cache.cache_repo.expiration_time = 2592000
 
-beaker.cache.sql_cache_short.type = memory
-beaker.cache.sql_cache_short.expire = 10
-beaker.cache.sql_cache_short.key_length = 256
+## alternative `cache_repo` redis backend with distributed lock
+#rc_cache.cache_repo.backend = dogpile.cache.rc.redis
+#rc_cache.cache_repo.expiration_time = 2592000
+## redis_expiration_time needs to be greater then expiration_time
+#rc_cache.cache_repo.arguments.redis_expiration_time = 2678400
+#rc_cache.cache_repo.arguments.socket_timeout = 30
+#rc_cache.cache_repo.arguments.host = localhost
+#rc_cache.cache_repo.arguments.port = 6379
+#rc_cache.cache_repo.arguments.db = 1
+#rc_cache.cache_repo.arguments.distributed_lock = true
 
-## default is memory cache, configure only if required
-## using multi-node or multi-worker setup
-#beaker.cache.auth_plugins.type = ext:database
-#beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
-#beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
-#beaker.cache.auth_plugins.url = mysql://root:secret@127.0.0.1/rhodecode
-#beaker.cache.auth_plugins.sa.pool_recycle = 3600
-#beaker.cache.auth_plugins.sa.pool_size = 10
-#beaker.cache.auth_plugins.sa.max_overflow = 0
+## cache settings for SQL queries, this needs to use memory type backend
+rc_cache.sql_cache_short.backend = dogpile.cache.rc.memory_lru
+rc_cache.sql_cache_short.expiration_time = 30
 
-beaker.cache.repo_cache_long.type = memorylru_base
-beaker.cache.repo_cache_long.max_items = 4096
-beaker.cache.repo_cache_long.expire = 2592000
+## `cache_repo_longterm` cache for repo object instances, this needs to use memory
+## type backend as the objects kept are not pickle serializable
+rc_cache.cache_repo_longterm.backend = dogpile.cache.rc.memory_lru
+## by default we use 96H, this is using invalidation on push anyway
+rc_cache.cache_repo_longterm.expiration_time = 345600
+## max items in LRU cache, reduce this number to save memory, and expire last used
+## cached objects
+rc_cache.cache_repo_longterm.max_size = 10000
 
-## default is memorylru_base cache, configure only if required
-## using multi-node or multi-worker setup
-#beaker.cache.repo_cache_long.type = ext:memcached
-#beaker.cache.repo_cache_long.url = localhost:11211
-#beaker.cache.repo_cache_long.expire = 1209600
-#beaker.cache.repo_cache_long.key_length = 256
 
 ####################################
 ###       BEAKER SESSION        ####
 ####################################
 
 ## .session.type is type of storage options for the session, current allowed
-## types are file, ext:memcached, ext:database, and memory (default).
+## types are file, ext:memcached, ext:redis, ext:database, and memory (default).
 beaker.session.type = file
-beaker.session.data_dir = %(here)s/data/sessions/data
+beaker.session.data_dir = %(here)s/data/sessions
 
 ## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
@@ -502,10 +506,7 @@ appenlight.log_namespace_blacklist =
 ################################################################################
 #set debug = false
 
-
-##############
-## STYLING  ##
-##############
+# enable debug style page
 debug_style = true
 
 ###########################################
@@ -514,6 +515,9 @@ debug_style = true
 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
+# pymysql is an alternative driver for MySQL, use in case of problems with default one
+#sqlalchemy.db1.url = mysql+pymysql://root:qweqwe@localhost/rhodecode
+
 sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
 
 # see sqlalchemy docs for other advanced settings
@@ -533,6 +537,9 @@ sqlalchemy.db1.convert_unicode = true
 ## which defaults to five.
 #sqlalchemy.db1.max_overflow = 10
 
+## Connection check ping, used to detect broken database connections
+## could be enabled to better handle cases if MySQL has gone away errors
+#sqlalchemy.db1.ping_connection = true
 
 ##################
 ### VCS CONFIG ###
@@ -547,15 +554,18 @@ vcs.server.protocol = http
 
 ## Push/Pull operations protocol, available options are:
 ## `http` - use http-rpc backend (default)
-##
 vcs.scm_app_implementation = http
 
 ## Push/Pull operations hooks protocol, available options are:
 ## `http` - use http-rpc backend (default)
 vcs.hooks.protocol = http
 
+## Host on which this instance is listening for hooks. If vcsserver is in other location
+## this should be adjusted.
+vcs.hooks.host = 127.0.0.1
+
 vcs.server.log_level = debug
-## Start VCSServer with this instance as a subprocess, usefull for development
+## Start VCSServer with this instance as a subprocess, useful for development
 vcs.start_server = false
 
 ## List of enabled VCS backends, available options are:
@@ -638,7 +648,7 @@ custom.conf = 1
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper, celery
+keys = root, sqlalchemy, beaker, celery, rhodecode, ssh_wrapper
 
 [handlers]
 keys = console, console_sql
@@ -694,9 +704,12 @@ level = DEBUG
 formatter = color_formatter
 
 [handler_console_sql]
+# "level = DEBUG" logs SQL queries and results.
+# "level = INFO" logs SQL queries.
+# "level = WARN" logs neither.  (Recommended for production systems.)
 class = StreamHandler
 args = (sys.stderr, )
-level = DEBUG
+level = WARN
 formatter = color_formatter_sql
 
 ################
@@ -715,5 +728,5 @@ datefmt = %Y-%m-%d %H:%M:%S
 
 [formatter_color_formatter_sql]
 class = rhodecode.lib.logging_formatter.ColorFormatterSql
-format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
diff --git a/configs/production.ini b/configs/production.ini
--- a/configs/production.ini
+++ b/configs/production.ini
@@ -2,7 +2,6 @@
 
 ################################################################################
 ##                 RHODECODE COMMUNITY EDITION CONFIGURATION                  ##
-# The %(here)s variable will be replaced with the parent directory of this file#
 ################################################################################
 
 [DEFAULT]
@@ -46,10 +45,9 @@ debug = true
 host = 127.0.0.1
 port = 5000
 
-##################################
-##     WAITRESS WSGI SERVER     ##
-## Recommended for Development  ##
-##################################
+###########################################################
+## WAITRESS WSGI SERVER - Recommended for Development  ####
+###########################################################
 
 #use = egg:waitress#main
 ## number of worker threads
@@ -67,21 +65,21 @@ port = 5000
 ## run with gunicorn --log-config rhodecode.ini --paste rhodecode.ini
 
 use = egg:gunicorn#main
-## Sets the number of process workers. You must set `instance_id = *`
-## when this option is set to more than one worker, recommended
-## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
-## The `instance_id = *` must be set in the [app:main] section below
+## Sets the number of process workers. More workers means more concurent connections
+## RhodeCode can handle at the same time. Each additional worker also it increases
+## memory usage as each has it's own set of caches.
+## Recommended value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers, but no more
+## than 8-10 unless for really big deployments .e.g 700-1000 users.
+## `instance_id = *` must be set in the [app:main] section below (which is the default)
+## when using more than 1 worker.
 workers = 2
-## number of threads for each of the worker, must be set to 1 for gevent
-## generally recommended to be at 1
-#threads = 1
-## process name
+## process name visible in process list
 proc_name = rhodecode
 ## type of worker class, one of sync, gevent
 ## recommended for bigger setup is using of of other than sync one
 worker_class = gevent
 ## The maximum number of simultaneous clients. Valid only for Gevent
-#worker_connections = 10
+worker_connections = 10
 ## max number of requests that worker will handle before being gracefully
 ## restarted, could prevent memory leaks
 max_requests = 1000
@@ -103,6 +101,11 @@ use = egg:PasteDeploy#prefix
 prefix = /
 
 [app:main]
+## The %(here)s variable will be replaced with the absolute path of parent directory
+## of this file
+## In addition ENVIRONMENT variables usage is possible, e.g
+## sqlalchemy.db1.url = {ENV_RC_DB_URL}
+
 use = egg:rhodecode-enterprise-ce
 
 ## enable proxy prefix middleware, defined above
@@ -123,12 +126,12 @@ gzip_responses = false
 ## autogenerate javascript routes file on startup
 generate_js_files = false
 
-## Optional Languages
-## en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
+## System global default language.
+## All available languages: en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
 lang = en
 
-## perform a full repository scan on each server start, this should be
-## set to false after first startup, to allow faster server restarts.
+## Perform a full repository scan and import on each server start.
+## Settings this to true could lead to very long startup time.
 startup.import_repos = false
 
 ## Uncomment and set this path to use archive download cache.
@@ -142,23 +145,23 @@ startup.import_repos = false
 ## SSH calls. Set this for events to receive proper url for SSH calls.
 app.base_url = http://rhodecode.local
 
-## change this to unique ID for security
+## Unique application ID. Should be a random unique string for security.
 app_instance_uuid = rc-production
 
-## cut off limit for large diffs (size in bytes). If overall diff size on
+## Cut off limit for large diffs (size in bytes). If overall diff size on
 ## commit, or pull request exceeds this limit this diff will be displayed
 ## partially. E.g 512000 == 512Kb
 cut_off_limit_diff = 512000
 
-## cut off limit for large files inside diffs (size in bytes). Each individual
+## Cut off limit for large files inside diffs (size in bytes). Each individual
 ## file inside diff which exceeds this limit will be displayed partially.
 ##  E.g 128000 == 128Kb
 cut_off_limit_file = 128000
 
-## use cache version of scm repo everywhere
+## use cached version of vcs repositories everywhere. Recommended to be `true`
 vcs_full_cache = true
 
-## force https in RhodeCode, fixes https redirects, assumes it's always https
+## Force https in RhodeCode, fixes https redirects, assumes it's always https.
 ## Normally this is controlled by proper http flags sent from http server
 force_https = false
 
@@ -205,7 +208,7 @@ gist_alias_url =
 #    GistView:*
 api_access_controllers_whitelist =
 
-## default encoding used to convert from and to unicode
+## Default encoding used to convert from and to unicode
 ## can be also a comma separated list of encoding in case of mixed encodings
 default_encoding = UTF-8
 
@@ -252,8 +255,8 @@ allow_repo_location_change = true
 ## allows to setup custom hooks in settings page
 allow_custom_hooks_settings = true
 
-## generated license token, goto license page in RhodeCode settings to obtain
-## new token
+## Generated license token required for EE edition license.
+## New generated token value can be found in Admin > settings > license page.
 license_token =
 
 ## supervisor connection uri, for managing supervisor and logs.
@@ -283,65 +286,66 @@ celery.max_tasks_per_child = 100
 ## tasks will never be sent to the queue, but executed locally instead.
 celery.task_always_eager = false
 
-####################################
-###         BEAKER CACHE        ####
-####################################
-# default cache dir for templates.  Putting this into a ramdisk
-## can boost performance, eg. %(here)s/data_ramdisk
+#####################################
+###         DOGPILE CACHE        ####
+#####################################
+## Default cache dir for caches.  Putting this into a ramdisk
+## can boost performance, eg. /tmpfs/data_ramdisk, however this directory might require
+## large amount of space
 cache_dir = %(here)s/data
 
-## locking and default file storage for Beaker. Putting this into a ramdisk
-## can boost performance, eg. %(here)s/data_ramdisk/cache/beaker_data
-beaker.cache.data_dir = %(here)s/data/cache/beaker_data
-beaker.cache.lock_dir = %(here)s/data/cache/beaker_lock
-
-beaker.cache.regions = super_short_term, short_term, long_term, sql_cache_short, auth_plugins, repo_cache_long
+## `cache_perms` cache settings for permission tree, auth TTL.
+rc_cache.cache_perms.backend = dogpile.cache.rc.file_namespace
+rc_cache.cache_perms.expiration_time = 300
 
-beaker.cache.super_short_term.type = memory
-beaker.cache.super_short_term.expire = 10
-beaker.cache.super_short_term.key_length = 256
+## alternative `cache_perms` redis backend with distributed lock
+#rc_cache.cache_perms.backend = dogpile.cache.rc.redis
+#rc_cache.cache_perms.expiration_time = 300
+## redis_expiration_time needs to be greater then expiration_time
+#rc_cache.cache_perms.arguments.redis_expiration_time = 7200
+#rc_cache.cache_perms.arguments.socket_timeout = 30
+#rc_cache.cache_perms.arguments.host = localhost
+#rc_cache.cache_perms.arguments.port = 6379
+#rc_cache.cache_perms.arguments.db = 0
+#rc_cache.cache_perms.arguments.distributed_lock = true
 
-beaker.cache.short_term.type = memory
-beaker.cache.short_term.expire = 60
-beaker.cache.short_term.key_length = 256
-
-beaker.cache.long_term.type = memory
-beaker.cache.long_term.expire = 36000
-beaker.cache.long_term.key_length = 256
+## `cache_repo` cache settings for FileTree, Readme, RSS FEEDS
+rc_cache.cache_repo.backend = dogpile.cache.rc.file_namespace
+rc_cache.cache_repo.expiration_time = 2592000
 
-beaker.cache.sql_cache_short.type = memory
-beaker.cache.sql_cache_short.expire = 10
-beaker.cache.sql_cache_short.key_length = 256
+## alternative `cache_repo` redis backend with distributed lock
+#rc_cache.cache_repo.backend = dogpile.cache.rc.redis
+#rc_cache.cache_repo.expiration_time = 2592000
+## redis_expiration_time needs to be greater then expiration_time
+#rc_cache.cache_repo.arguments.redis_expiration_time = 2678400
+#rc_cache.cache_repo.arguments.socket_timeout = 30
+#rc_cache.cache_repo.arguments.host = localhost
+#rc_cache.cache_repo.arguments.port = 6379
+#rc_cache.cache_repo.arguments.db = 1
+#rc_cache.cache_repo.arguments.distributed_lock = true
 
-## default is memory cache, configure only if required
-## using multi-node or multi-worker setup
-#beaker.cache.auth_plugins.type = ext:database
-#beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
-#beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
-#beaker.cache.auth_plugins.url = mysql://root:secret@127.0.0.1/rhodecode
-#beaker.cache.auth_plugins.sa.pool_recycle = 3600
-#beaker.cache.auth_plugins.sa.pool_size = 10
-#beaker.cache.auth_plugins.sa.max_overflow = 0
+## cache settings for SQL queries, this needs to use memory type backend
+rc_cache.sql_cache_short.backend = dogpile.cache.rc.memory_lru
+rc_cache.sql_cache_short.expiration_time = 30
 
-beaker.cache.repo_cache_long.type = memorylru_base
-beaker.cache.repo_cache_long.max_items = 4096
-beaker.cache.repo_cache_long.expire = 2592000
+## `cache_repo_longterm` cache for repo object instances, this needs to use memory
+## type backend as the objects kept are not pickle serializable
+rc_cache.cache_repo_longterm.backend = dogpile.cache.rc.memory_lru
+## by default we use 96H, this is using invalidation on push anyway
+rc_cache.cache_repo_longterm.expiration_time = 345600
+## max items in LRU cache, reduce this number to save memory, and expire last used
+## cached objects
+rc_cache.cache_repo_longterm.max_size = 10000
 
-## default is memorylru_base cache, configure only if required
-## using multi-node or multi-worker setup
-#beaker.cache.repo_cache_long.type = ext:memcached
-#beaker.cache.repo_cache_long.url = localhost:11211
-#beaker.cache.repo_cache_long.expire = 1209600
-#beaker.cache.repo_cache_long.key_length = 256
 
 ####################################
 ###       BEAKER SESSION        ####
 ####################################
 
 ## .session.type is type of storage options for the session, current allowed
-## types are file, ext:memcached, ext:database, and memory (default).
+## types are file, ext:memcached, ext:redis, ext:database, and memory (default).
 beaker.session.type = file
-beaker.session.data_dir = %(here)s/data/sessions/data
+beaker.session.data_dir = %(here)s/data/sessions
 
 ## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
@@ -484,6 +488,9 @@ set debug = false
 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
+# pymysql is an alternative driver for MySQL, use in case of problems with default one
+#sqlalchemy.db1.url = mysql+pymysql://root:qweqwe@localhost/rhodecode
+
 sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
 
 # see sqlalchemy docs for other advanced settings
@@ -503,6 +510,9 @@ sqlalchemy.db1.convert_unicode = true
 ## which defaults to five.
 #sqlalchemy.db1.max_overflow = 10
 
+## Connection check ping, used to detect broken database connections
+## could be enabled to better handle cases if MySQL has gone away errors
+#sqlalchemy.db1.ping_connection = true
 
 ##################
 ### VCS CONFIG ###
@@ -517,15 +527,17 @@ vcs.server.protocol = http
 
 ## Push/Pull operations protocol, available options are:
 ## `http` - use http-rpc backend (default)
-##
 vcs.scm_app_implementation = http
 
 ## Push/Pull operations hooks protocol, available options are:
 ## `http` - use http-rpc backend (default)
 vcs.hooks.protocol = http
+## Host on which this instance is listening for hooks. If vcsserver is in other location
+## this should be adjusted.
+vcs.hooks.host = 127.0.0.1
 
 vcs.server.log_level = info
-## Start VCSServer with this instance as a subprocess, usefull for development
+## Start VCSServer with this instance as a subprocess, useful for development
 vcs.start_server = false
 
 ## List of enabled VCS backends, available options are:
@@ -608,7 +620,7 @@ custom.conf = 1
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper, celery
+keys = root, sqlalchemy, beaker, celery, rhodecode, ssh_wrapper
 
 [handlers]
 keys = console, console_sql
@@ -664,6 +676,9 @@ level = INFO
 formatter = generic
 
 [handler_console_sql]
+# "level = DEBUG" logs SQL queries and results.
+# "level = INFO" logs SQL queries.
+# "level = WARN" logs neither.  (Recommended for production systems.)
 class = StreamHandler
 args = (sys.stderr, )
 level = WARN
@@ -685,5 +700,5 @@ datefmt = %Y-%m-%d %H:%M:%S
 
 [formatter_color_formatter_sql]
 class = rhodecode.lib.logging_formatter.ColorFormatterSql
-format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
diff --git a/default.nix b/default.nix
--- a/default.nix
+++ b/default.nix
@@ -1,41 +1,40 @@
 # Nix environment for the community edition
 #
-# This shall be as lean as possible, just producing the Enterprise
+# This shall be as lean as possible, just producing the enterprise-ce
 # derivation. For advanced tweaks to pimp up the development environment we use
 # "shell.nix" so that it does not have to clutter this file.
+#
+# Configuration, set values in "~/.nixpkgs/config.nix".
+# example
+#  {
+#    # Thoughts on how to configure the dev environment
+#    rc = {
+#      codeInternalUrl = "https://usr:token@internal-code.rhodecode.com";
+#      sources = {
+#        rhodecode-vcsserver = "/home/user/work/rhodecode-vcsserver";
+#        rhodecode-enterprise-ce = "/home/user/work/rhodecode-enterprise-ce";
+#        rhodecode-enterprise-ee = "/home/user/work/rhodecode-enterprise-ee";
+#      };
+#    };
+#  }
 
 args@
 { pythonPackages ? "python27Packages"
 , pythonExternalOverrides ? self: super: {}
-, doCheck ? true
+, doCheck ? false
 , ...
 }:
 
 let
-
   # Use nixpkgs from args or import them. We use this indirect approach
   # through args to be able to use the name `pkgs` for our customized packages.
   # Otherwise we will end up with an infinite recursion.
-  nixpkgs = args.pkgs or (import <nixpkgs> { });
+  pkgs = args.pkgs or (import <nixpkgs> { });
 
-  # johbo: Interim bridge which allows us to build with the upcoming
-  # nixos.16.09 branch (unstable at the moment of writing this note) and the
-  # current stable nixos-16.03.
-  backwardsCompatibleFetchgit = { ... }@args:
-    let
-      origSources = nixpkgs.fetchgit args;
-    in
-    nixpkgs.lib.overrideDerivation origSources (oldAttrs: {
-      NIX_PREFETCH_GIT_CHECKOUT_HOOK = ''
-        find $out -name '.git*' -print0 | xargs -0 rm -rf
-      '';
-    });
-
-  # Create a customized version of nixpkgs which should be used throughout the
-  # rest of this file.
-  pkgs = nixpkgs.overridePackages (self: super: {
-    fetchgit = backwardsCompatibleFetchgit;
-  });
+  # Works with the new python-packages, still can fallback to the old
+  # variant.
+  basePythonPackagesUnfix = basePythonPackages.__unfix__ or (
+    self: basePythonPackages.override (a: { inherit self; }));
 
   # Evaluates to the last segment of a file system path.
   basename = path: with pkgs.lib; last (splitString "/" path);
@@ -46,7 +45,7 @@ let
       ext = last (splitString "." path);
     in
       !builtins.elem (basename path) [
-        ".git" ".hg" "__pycache__" ".eggs"
+        ".git" ".hg" "__pycache__" ".eggs" ".idea" ".dev"
         "bower_components" "node_modules"
         "build" "data" "result" "tmp"] &&
       !builtins.elem ext ["egg-info" "pyc"] &&
@@ -54,18 +53,20 @@ let
       # it would still be good to restore it since we want to ignore "result-*".
       !hasPrefix "result" path;
 
-  basePythonPackages = with builtins; if isAttrs pythonPackages
-    then pythonPackages
-    else getAttr pythonPackages pkgs;
+  sources =
+    let
+      inherit (pkgs.lib) all isString attrValues;
+      sourcesConfig = pkgs.config.rc.sources or {};
+    in
+      # Ensure that sources are configured as strings. Using a path
+      # would result in a copy into the nix store.
+      assert all isString (attrValues sourcesConfig);
+      sourcesConfig;
 
-  buildBowerComponents =
-    pkgs.buildBowerComponents or
-    (import ./pkgs/backport-16.03-build-bower-components.nix { inherit pkgs; });
-
-  sources = pkgs.config.rc.sources or {};
-  version = builtins.readFile ./rhodecode/VERSION;
+  version = builtins.readFile "${rhodecode-enterprise-ce-src}/rhodecode/VERSION";
   rhodecode-enterprise-ce-src = builtins.filterSource src-filter ./.;
 
+  buildBowerComponents = pkgs.buildBowerComponents;
   nodeEnv = import ./pkgs/node-default.nix {
     inherit pkgs;
   };
@@ -77,133 +78,145 @@ let
     src = rhodecode-enterprise-ce-src;
   };
 
-  pythonGeneratedPackages = self: basePythonPackages.override (a: {
-    inherit self;
-  })
-  // (scopedImport {
-    self = self;
-    super = basePythonPackages;
-    inherit pkgs;
-    inherit (pkgs) fetchurl fetchgit;
-  } ./pkgs/python-packages.nix);
+  rhodecode-testdata-src = sources.rhodecode-testdata or (
+    pkgs.fetchhg {
+      url = "https://code.rhodecode.com/upstream/rc_testdata";
+      rev = "v0.10.0";
+      sha256 = "0zn9swwvx4vgw4qn8q3ri26vvzgrxn15x6xnjrysi1bwmz01qjl0";
+  });
 
-  pythonOverrides = import ./pkgs/python-packages-overrides.nix {
-    inherit
-      basePythonPackages
-      pkgs;
+  rhodecode-testdata = import "${rhodecode-testdata-src}/default.nix" {
+  inherit
+    doCheck
+    pkgs
+    pythonPackages;
   };
 
   pythonLocalOverrides = self: super: {
     rhodecode-enterprise-ce =
       let
         linkNodeAndBowerPackages = ''
-          echo "Export RhodeCode CE path"
           export RHODECODE_CE_PATH=${rhodecode-enterprise-ce-src}
-          echo "Link node packages"
+
+          echo "[BEGIN]: Link node packages"
           rm -fr node_modules
           mkdir node_modules
           # johbo: Linking individual packages allows us to run "npm install"
           # inside of a shell to try things out. Re-entering the shell will
           # restore a clean environment.
           ln -s ${nodeDependencies}/lib/node_modules/* node_modules/
+          echo "[DONE]: Link node packages"
 
-          echo "DONE: Link node packages"
-
-          echo "Link bower packages"
+          echo "[BEGIN]: Link bower packages"
           rm -fr bower_components
           mkdir bower_components
+          ln -s ${bowerComponents}/bower_components/* bower_components/
+          echo "[DONE]: Link bower packages"
+        '';
 
-          ln -s ${bowerComponents}/bower_components/* bower_components/
-          echo "DONE: Link bower packages"
-        '';
+        releaseName = "RhodeCodeEnterpriseCE-${version}";
       in super.rhodecode-enterprise-ce.override (attrs: {
-
       inherit
         doCheck
         version;
+
       name = "rhodecode-enterprise-ce-${version}";
-      releaseName = "RhodeCodeEnterpriseCE-${version}";
+      releaseName = releaseName;
       src = rhodecode-enterprise-ce-src;
       dontStrip = true; # prevent strip, we don't need it.
 
-      buildInputs =
-        attrs.buildInputs ++
-        (with self; [
-          pkgs.nodePackages.bower
-          pkgs.nodePackages.grunt-cli
-          pkgs.subversion
-          pytest-catchlog
-          rhodecode-testdata
-        ]);
-
-      #TODO: either move this into overrides, OR use the new machanics from
-      # pip2nix and requiremtn.txt file
-      propagatedBuildInputs = attrs.propagatedBuildInputs ++ (with self; [
-        rhodecode-tools
-      ]);
-
-      # TODO: johbo: Make a nicer way to expose the parts. Maybe
-      # pkgs/default.nix?
+      # expose following attributed outside
       passthru = {
         inherit
+          rhodecode-testdata
           bowerComponents
           linkNodeAndBowerPackages
           myPythonPackagesUnfix
-          pythonLocalOverrides;
+          pythonLocalOverrides
+          pythonCommunityOverrides;
+
         pythonPackages = self;
       };
 
+      buildInputs =
+        attrs.buildInputs or [] ++ [
+          rhodecode-testdata
+          pkgs.nodePackages.bower
+          pkgs.nodePackages.grunt-cli
+        ];
+
+      #NOTE: option to inject additional propagatedBuildInputs
+      propagatedBuildInputs =
+        attrs.propagatedBuildInputs or [] ++ [
+
+        ];
+
       LC_ALL = "en_US.UTF-8";
       LOCALE_ARCHIVE =
-        if pkgs.stdenv ? glibc
+        if pkgs.stdenv.isLinux
         then "${pkgs.glibcLocales}/lib/locale/locale-archive"
         else "";
 
+      # Add bin directory to path so that tests can find 'rhodecode'.
       preCheck = ''
         export PATH="$out/bin:$PATH"
       '';
 
+      # custom check phase for testing
+      checkPhase = ''
+        runHook preCheck
+        PYTHONHASHSEED=random py.test -vv -p no:sugar -r xw --cov-config=.coveragerc --cov=rhodecode --cov-report=term-missing rhodecode
+        runHook postCheck
+      '';
+
       postCheck = ''
-        rm -rf $out/lib/${self.python.libPrefix}/site-packages/pytest_pylons
+        echo "Cleanup of rhodecode/tests"
         rm -rf $out/lib/${self.python.libPrefix}/site-packages/rhodecode/tests
       '';
 
-      preBuild = linkNodeAndBowerPackages + ''
+      preBuild = ''
+
+        echo "Building frontend assets"
+        ${linkNodeAndBowerPackages}
         grunt
         rm -fr node_modules
       '';
 
       postInstall = ''
-        echo "Writing meta information for rccontrol to nix-support/rccontrol"
+        echo "Writing enterprise-ce meta information for rccontrol to nix-support/rccontrol"
         mkdir -p $out/nix-support/rccontrol
         cp -v rhodecode/VERSION $out/nix-support/rccontrol/version
-        echo "DONE: Meta information for rccontrol written"
+        echo "[DONE]: enterprise-ce meta information for rccontrol written"
+
+        mkdir -p $out/etc
+        cp configs/production.ini $out/etc
+        echo "[DONE]: saved enterprise-ce production.ini into $out/etc"
 
         # python based programs need to be wrapped
+        mkdir -p $out/bin
+        # rhodecode-tools
+        ln -s ${self.rhodecode-tools}/bin/rhodecode-* $out/bin/
+
+        # required binaries from dependencies
+        #ln -s ${self.python}/bin/python $out/bin
         ln -s ${self.pyramid}/bin/* $out/bin/
         ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
         ln -s ${self.supervisor}/bin/supervisor* $out/bin/
-        ln -s ${self.PasteScript}/bin/paster $out/bin/
+        ln -s ${self.pastescript}/bin/paster $out/bin/
         ln -s ${self.channelstream}/bin/channelstream $out/bin/
         ln -s ${self.celery}/bin/celery $out/bin/
+        echo "[DONE]: created symlinks into $out/bin"
 
-        # rhodecode-tools
-        ln -s ${self.rhodecode-tools}/bin/rhodecode-* $out/bin/
-
-        # note that condition should be restricted when adding further tools
         for file in $out/bin/*;
         do
           wrapProgram $file \
-              --prefix PATH : $PATH \
-              --prefix PYTHONPATH : $PYTHONPATH \
-              --set PYTHONHASHSEED random
+            --prefix PATH : $PATH \
+            --prefix PYTHONPATH : $PYTHONPATH \
+            --set PYTHONHASHSEED random
         done
 
-        mkdir $out/etc
-        cp configs/production.ini $out/etc
+        echo "[DONE]: enterprise-ce binary wrapping"
 
-
-        # TODO: johbo: Make part of ac-tests
         if [ ! -f rhodecode/public/js/scripts.js ]; then
           echo "Missing scripts.js"
           exit 1
@@ -213,31 +226,33 @@ let
           exit 1
         fi
       '';
-
     });
 
-    rhodecode-testdata = import "${rhodecode-testdata-src}/default.nix" {
-    inherit
-      doCheck
-      pkgs
-      pythonPackages;
-    };
-
   };
 
-  rhodecode-testdata-src = sources.rhodecode-testdata or (
-    pkgs.fetchhg {
-      url = "https://code.rhodecode.com/upstream/rc_testdata";
-      rev = "v0.10.0";
-      sha256 = "0zn9swwvx4vgw4qn8q3ri26vvzgrxn15x6xnjrysi1bwmz01qjl0";
-  });
+  basePythonPackages = with builtins;
+    if isAttrs pythonPackages then
+      pythonPackages
+    else
+      getAttr pythonPackages pkgs;
+
+  pythonGeneratedPackages = import ./pkgs/python-packages.nix {
+    inherit pkgs;
+    inherit (pkgs) fetchurl fetchgit fetchhg;
+  };
+
+  pythonCommunityOverrides = import ./pkgs/python-packages-overrides.nix {
+    inherit pkgs basePythonPackages;
+  };
 
   # Apply all overrides and fix the final package set
   myPythonPackagesUnfix = with pkgs.lib;
     (extends pythonExternalOverrides
     (extends pythonLocalOverrides
-    (extends pythonOverrides
-             pythonGeneratedPackages)));
+    (extends pythonCommunityOverrides
+    (extends pythonGeneratedPackages
+             basePythonPackagesUnfix))));
+
   myPythonPackages = (pkgs.lib.fix myPythonPackagesUnfix);
 
 in myPythonPackages.rhodecode-enterprise-ce
diff --git a/docs/.howto b/docs/.howto
--- a/docs/.howto
+++ b/docs/.howto
@@ -1,4 +1,9 @@
+# generating packages
+nix-shell pkgs/shell-generate.nix
+cd docs
+pip2nix generate
+
 # building the docs
 cd docs
 nix-build default.nix -o result
-make clean html
\ No newline at end of file
+make clean html
diff --git a/docs/admin/indexing.rst b/docs/admin/indexing.rst
--- a/docs/admin/indexing.rst
+++ b/docs/admin/indexing.rst
@@ -88,17 +88,21 @@ want to index:
    (venv)$ rhodecode-index --instance-name=enterprise-1
 
    # Using default installation
-   $ /home/user/.rccontrol/enterprise-4/profile/bin/rhodecode-index \
-       --instance-name=enterprise-4
+   $ /home/user/.rccontrol/enterprise-1/profile/bin/rhodecode-index \
+       --instance-name=enterprise-1
 
    # Using a custom mapping file
-   $ /home/user/.rccontrol/enterprise-4/profile/bin/rhodecode-index \
-       --instance-name=enterprise-4 \
-       --mapping=/home/user/.rccontrol/enterprise-4/mapping.ini
+   $ /home/user/.rccontrol/enterprise-1/profile/bin/rhodecode-index \
+       --instance-name=enterprise-1 \
+       --mapping=/home/user/.rccontrol/enterprise-1/mapping.ini
 
 .. note::
 
-   |RCT| require |PY| 2.7 to run.
+   In case of often indexing the index may become fragmented. Most often a result of that
+   is error about `too many open files`. To fix this indexer needs to be executed with
+   --optimize flag. E.g `rhodecode-index --instance-name=enterprise-1 --optimize`
+   This should be executed regularly, once a week is recommended.
+
 
 .. _set-index:
 
diff --git a/docs/admin/tuning-user-sessions-performance.rst b/docs/admin/tuning-user-sessions-performance.rst
--- a/docs/admin/tuning-user-sessions-performance.rst
+++ b/docs/admin/tuning-user-sessions-performance.rst
@@ -12,7 +12,7 @@ if there are lots of session files.
 
 Therefore, in a large scale deployment, to give better performance,
 scalability, and maintainability we recommend switching from file-based
-sessions to database-based user sessions or memcached sessions.
+sessions to database-based user sessions or Redis based sessions.
 
 To switch to database-based user sessions uncomment the following section in
 your :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file.
@@ -41,14 +41,20 @@ and make sure you comment out the file b
       #beaker.session.data_dir = %(here)s/data/sessions/data
 
 
-To switch to memcached-based user sessions uncomment the following section in
+The `table_name` will be automatically created on specified database if it isn't yet existing.
+Database specified in the `beaker.session.sa.url` can be the same that RhodeCode
+uses, or if required it can be a different one. We recommend to use the same database.
+
+
+
+To switch to reds-based user sessions uncomment the following section in
 your :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file.
 
 .. code-block:: ini
 
-      ## memcached sessions
-      beaker.session.type = ext:memcached
-      beaker.session.url = localhost:11211
+      ## redis sessions
+      beaker.session.type = ext:redis
+      beaker.session.url = localhost:6379
 
 
 and make sure you comment out the file based sessions.
diff --git a/docs/api/methods/pull-request-methods.rst b/docs/api/methods/pull-request-methods.rst
--- a/docs/api/methods/pull-request-methods.rst
+++ b/docs/api/methods/pull-request-methods.rst
@@ -83,7 +83,7 @@ comment_pull_request
 create_pull_request 
 -------------------
 
-.. py:function:: create_pull_request(apiuser, source_repo, target_repo, source_ref, target_ref, title, description=<Optional:''>, reviewers=<Optional:None>)
+.. py:function:: create_pull_request(apiuser, source_repo, target_repo, source_ref, target_ref, title=<Optional:''>, description=<Optional:''>, description_renderer=<Optional:''>, reviewers=<Optional:None>)
 
    Creates a new pull request.
 
@@ -104,10 +104,14 @@ create_pull_request
    :type source_ref: str
    :param target_ref: Set the target ref name.
    :type target_ref: str
-   :param title: Set the pull request title.
+   :param title: Optionally Set the pull request title, it's generated otherwise
    :type title: str
    :param description: Set the pull request description.
    :type description: Optional(str)
+   :type description_renderer: Optional(str)
+   :param description_renderer: Set pull request renderer for the description.
+       It should be 'rst', 'markdown' or 'plain'. If not give default
+       system renderer will be used
    :param reviewers: Set the new pull request reviewers list.
        Reviewer defined by review rules will be added automatically to the
        defined list.
@@ -368,7 +372,7 @@ merge_pull_request
 update_pull_request 
 -------------------
 
-.. py:function:: update_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, title=<Optional:''>, description=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>)
+.. py:function:: update_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, title=<Optional:''>, description=<Optional:''>, description_renderer=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>)
 
    Updates a pull request.
 
@@ -382,6 +386,9 @@ update_pull_request
    :type title: str
    :param description: Update pull request description.
    :type description: Optional(str)
+   :type description_renderer: Optional(str)
+   :param description_renderer: Update pull request renderer for the description.
+       It should be 'rst', 'markdown' or 'plain'
    :param reviewers: Update pull request reviewers list with new value.
    :type reviewers: Optional(list)
        Accepts username strings or objects of the format:
diff --git a/docs/conf.py b/docs/conf.py
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -32,6 +32,7 @@ import common
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
+    'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
     'sphinx.ext.imgmath'
@@ -42,13 +43,6 @@ intersphinx_mapping = {
     'control': ('https://docs.rhodecode.com/RhodeCode-Control/', None),
 }
 
-if tags.has('dev'):
-    intersphinx_mapping.update({
-        'enterprise': ('https://ci.rhodecode.com/documentation/Momentum/', None),
-        'control': ('https://ci.rhodecode.com/documentation/Control/', None),
-    })
-
-
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -65,11 +59,12 @@ master_doc = 'index'
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 
-# TODO: johbo: Move into common package for documentation utilities
+
 def _get_version():
     with open('../rhodecode/VERSION') as f:
         return f.read().strip()
 
+
 # The full version, including alpha/beta/rc tags.
 release = _get_version()
 # The short X.Y version.
diff --git a/docs/contributing/dev-setup.rst b/docs/contributing/dev-setup.rst
--- a/docs/contributing/dev-setup.rst
+++ b/docs/contributing/dev-setup.rst
@@ -47,7 +47,7 @@ Switch nix to the latest STABLE channel
 
 run::
 
-   nix-channel --add https://nixos.org/channels/nixos-16.03 nixpkgs
+   nix-channel --add https://nixos.org/channels/nixos-18.03 nixpkgs
 
 Followed by::
 
diff --git a/docs/default.nix b/docs/default.nix
--- a/docs/default.nix
+++ b/docs/default.nix
@@ -5,249 +5,215 @@ let
 
   pkgs = import <nixpkgs> { inherit system; };
 
-  inherit (pkgs) fetchurl fetchgit;
+  inherit (pkgs) fetchurl;
 
   buildPythonPackage = pkgs.python27Packages.buildPythonPackage;
   python = pkgs.python27Packages.python;
 
-  Jinja2 = buildPythonPackage rec {
-    name = "Jinja2-2.9.6";
-    buildInputs = [];
+
+  alabaster = buildPythonPackage {
+    name = "alabaster-0.7.11";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/3f/46/9346ea429931d80244ab7f11c4fce83671df0b7ae5a60247a2b588592c46/alabaster-0.7.11.tar.gz";
+      sha256 = "1mvm69xsn5xf1jc45kdq1mn0yq0pfn54mv2jcww4s1vwqx6iyfxn";
+    };
+  };
+  babel = buildPythonPackage {
+    name = "babel-2.6.0";
     doCheck = false;
-    propagatedBuildInputs = [MarkupSafe];
+    propagatedBuildInputs = [
+      pytz
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/be/cc/9c981b249a455fa0c76338966325fc70b7265521bad641bf2932f77712f4/Babel-2.6.0.tar.gz";
+      sha256 = "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc";
+    };
+  };
+  certifi = buildPythonPackage {
+    name = "certifi-2018.8.24";
+    doCheck = false;
     src = fetchurl {
-      url = "https://pypi.python.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
-      md5 = "6411537324b4dba0956aaa8109f3c77b";
+      url = "https://files.pythonhosted.org/packages/e1/0f/f8d5e939184547b3bdc6128551b831a62832713aa98c2ccdf8c47ecc7f17/certifi-2018.8.24.tar.gz";
+      sha256 = "0f0nhrj9mlrf79iway4578wrsgmjh0fmacl9zv8zjckdy7b90rip";
+    };
+  };
+  chardet = buildPythonPackage {
+    name = "chardet-3.0.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz";
+      sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
+    };
+  };
+  docutils = buildPythonPackage {
+    name = "docutils-0.14";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
+      sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
     };
   };
-
-  MarkupSafe = buildPythonPackage rec {
-    name = "MarkupSafe-1.0";
-    buildInputs = [];
+  idna = buildPythonPackage {
+    name = "idna-2.7";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/65/c4/80f97e9c9628f3cac9b98bfca0402ede54e0563b56482e3e6e45c43c4935/idna-2.7.tar.gz";
+      sha256 = "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8";
+    };
+  };
+  imagesize = buildPythonPackage {
+    name = "imagesize-1.1.0";
     doCheck = false;
-    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
-      md5 = "2fcedc9284d50e577b5192e8e3578355";
+      url = "https://files.pythonhosted.org/packages/41/f5/3cf63735d54aa9974e544aa25858d8f9670ac5b4da51020bbfc6aaade741/imagesize-1.1.0.tar.gz";
+      sha256 = "1dg3wn7qpwmhgqc0r9na2ding1wif9q5spz3j9zn2riwphc2k0zk";
+    };
+  };
+  jinja2 = buildPythonPackage {
+    name = "jinja2-2.9.6";
+    doCheck = false;
+    propagatedBuildInputs = [
+      markupsafe
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
+      sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx";
     };
   };
-
-  Pygments = buildPythonPackage {
-    name = "Pygments-2.2.0";
-    buildInputs = [];
+  markupsafe = buildPythonPackage {
+    name = "markupsafe-1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
+      sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
+    };
+  };
+  packaging = buildPythonPackage {
+    name = "packaging-17.1";
     doCheck = false;
-    propagatedBuildInputs = [];
+    propagatedBuildInputs = [
+      pyparsing
+      six
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
-      md5 = "13037baca42f16917cbd5ad2fab50844";
+      url = "https://files.pythonhosted.org/packages/77/32/439f47be99809c12ef2da8b60a2c47987786d2c6c9205549dd6ef95df8bd/packaging-17.1.tar.gz";
+      sha256 = "0nrpayk8kij1zm9sjnk38ldz3a6705ggvw8ljylqbrb4vmqbf6gh";
+    };
+  };
+  pygments = buildPythonPackage {
+    name = "pygments-2.2.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
+      sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
     };
   };
-
-  Sphinx = buildPythonPackage (rec {
-    name = "Sphinx-1.6.5";
+  pyparsing = buildPythonPackage {
+    name = "pyparsing-2.2.0";
+    doCheck = false;
     src = fetchurl {
-      url = "https://pypi.python.org/packages/8b/7e/b188d9a3b9c938e736e02a74c1363c2888e095d770df2c72b4c312f9fdcb/Sphinx-1.6.5.tar.gz";
-      md5 = "cd73118c21ec610432e63e6421ec54f1";
+      url = "https://files.pythonhosted.org/packages/3c/ec/a94f8cf7274ea60b5413df054f82a8980523efd712ec55a59e7c3357cf7c/pyparsing-2.2.0.tar.gz";
+      sha256 = "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8";
     };
+  };
+  pytz = buildPythonPackage {
+    name = "pytz-2018.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/10/76/52efda4ef98e7544321fd8d5d512e11739c1df18b0649551aeccfb1c8376/pytz-2018.4.tar.gz";
+      sha256 = "0jgpqx3kk2rhv81j1izjxvmx8d0x7hzs1857pgqnixic5wq2ar60";
+    };
+  };
+  requests = buildPythonPackage {
+    name = "requests-2.19.1";
+    doCheck = false;
     propagatedBuildInputs = [
-        six
-        Jinja2
-        Pygments
-        docutils
-        snowballstemmer
-        babel
-        alabaster
-        imagesize
-        requests
-        setuptools
-        sphinxcontrib-websupport
-        typing
-
-        # special cases
-        pytz
-        sphinx_rtd_theme
-
+      chardet
+      idna
+      urllib3
+      certifi
     ];
-  });
-
-  alabaster = buildPythonPackage rec {
-    name = "alabaster-0.7.10";
-    buildInputs = [];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/54/1f/782a5734931ddf2e1494e4cd615a51ff98e1879cbe9eecbdfeaf09aa75e9/requests-2.19.1.tar.gz";
+      sha256 = "0snf8xxdzsgh1x2zv3vilvbrv9jbpmnfagzzb1rjmmvflckdh8pc";
+    };
+  };
+  six = buildPythonPackage {
+    name = "six-1.11.0";
     doCheck = false;
-    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/d0/a5/e3a9ad3ee86aceeff71908ae562580643b955ea1b1d4f08ed6f7e8396bd7/alabaster-0.7.10.tar.gz";
-      md5 = "7934dccf38801faa105f6e7b4784f493";
+      url = "https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
+      sha256 = "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h";
+    };
+  };
+  snowballstemmer = buildPythonPackage {
+    name = "snowballstemmer-1.2.1";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/20/6b/d2a7cb176d4d664d94a6debf52cd8dbae1f7203c8e42426daa077051d59c/snowballstemmer-1.2.1.tar.gz";
+      sha256 = "0a0idq4y5frv7qsg2x62jd7rd272749xk4x99misf5rcifk2d7wi";
     };
   };
-
-  babel = buildPythonPackage {
-    name = "babel-2.5.1";
-    buildInputs = [];
+  sphinx = buildPythonPackage {
+    name = "sphinx-1.7.8";
     doCheck = false;
-    propagatedBuildInputs = [pytz];
+    propagatedBuildInputs = [
+      six
+      jinja2
+      pygments
+      docutils
+      snowballstemmer
+      babel
+      alabaster
+      imagesize
+      requests
+      setuptools
+      packaging
+      sphinxcontrib-websupport
+      typing
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/5a/22/63f1dbb8514bb7e0d0c8a85cc9b14506599a075e231985f98afd70430e1f/Babel-2.5.1.tar.gz";
-      md5 = "60228b3ce93a203357158b909afe8ae1";
+      url = "https://files.pythonhosted.org/packages/ac/54/4ef326d0c654da1ed91341a7a1f43efc18a8c770ddd2b8e45df97cb79d82/Sphinx-1.7.8.tar.gz";
+      sha256 = "1ryz0w4c31930f1br2sjwrxwx9cmsy7cqdb0d81g98n9bj250w50";
     };
   };
-
-  certifi = buildPythonPackage {
-    name = "certifi-2017.11.5";
-    buildInputs = [];
+  sphinx-rtd-theme = buildPythonPackage {
+    name = "sphinx-rtd-theme-0.4.1";
     doCheck = false;
-    propagatedBuildInputs = [];
+    propagatedBuildInputs = [
+      sphinx
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/23/3f/8be01c50ed24a4bd6b8da799839066ce0288f66f5e11f0367323467f0cbc/certifi-2017.11.5.tar.gz";
-      md5 = "c15ac46ed1fe4b607ff3405928f9a992";
+      url = "https://files.pythonhosted.org/packages/f2/b0/a1933d792b806118ddbca6699f2e2c844d9b1b16e84a89d7effd5cd2a800/sphinx_rtd_theme-0.4.1.tar.gz";
+      sha256 = "1xkyqam8dzbjaymdyvkiif85m4y3jf8crdiwlgcfp8gqcj57aj9v";
     };
   };
-
-  chardet = buildPythonPackage {
-    name = "chardet-3.0.4";
-    buildInputs = [];
+  sphinxcontrib-websupport = buildPythonPackage {
+    name = "sphinxcontrib-websupport-1.1.0";
     doCheck = false;
-    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz";
-      md5 = "7dd1ba7f9c77e32351b0a0cfacf4055c";
+      url = "https://files.pythonhosted.org/packages/07/7a/e74b06dce85555ffee33e1d6b7381314169ebf7e31b62c18fcb2815626b7/sphinxcontrib-websupport-1.1.0.tar.gz";
+      sha256 = "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x";
     };
   };
-
-  docutils = buildPythonPackage {
-    name = "docutils-0.14";
-    buildInputs = [];
+  typing = buildPythonPackage {
+    name = "typing-3.6.6";
     doCheck = false;
-    propagatedBuildInputs = [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
-      md5 = "c53768d63db3873b7d452833553469de";
+      url = "https://files.pythonhosted.org/packages/bf/9b/2bf84e841575b633d8d91ad923e198a415e3901f228715524689495b4317/typing-3.6.6.tar.gz";
+      sha256 = "0ba9acs4awx15bf9v3nrs781msbd2nx826906nj6fqks2bvca9s0";
+    };
+  };
+  urllib3 = buildPythonPackage {
+    name = "urllib3-1.23";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/3c/d2/dc5471622bd200db1cd9319e02e71bc655e9ea27b8e0ce65fc69de0dac15/urllib3-1.23.tar.gz";
+      sha256 = "1bvbd35q3zdcd7gsv38fwpizy7p06dr0154g5gfybrvnbvhwb2m6";
     };
   };
 
-  idna = buildPythonPackage {
-    name = "idna-2.6";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/f4/bd/0467d62790828c23c47fc1dfa1b1f052b24efdf5290f071c7a91d0d82fd3/idna-2.6.tar.gz";
-      md5 = "c706e2790b016bd0ed4edd2d4ba4d147";
-    };
-  };
-
-  imagesize = buildPythonPackage {
-    name = "imagesize-0.7.1";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/imagesize-0.7.1.tar.gz";
-      md5 = "976148283286a6ba5f69b0f81aef8052";
-    };
-  };
-
-  pytz = buildPythonPackage {
-    name = "pytz-2017.3";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/60/88/d3152c234da4b2a1f7a989f89609ea488225eaea015bc16fbde2b3fdfefa/pytz-2017.3.zip";
-      md5 = "7006b56c0d68a162d9fe57d4249c3171";
-    };
-  };
-
-  requests = buildPythonPackage {
-    name = "requests-2.18.4";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [chardet idna urllib3 certifi];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/b0/e1/eab4fc3752e3d240468a8c0b284607899d2fbfb236a56b7377a329aa8d09/requests-2.18.4.tar.gz";
-      md5 = "081412b2ef79bdc48229891af13f4d82";
-    };
-  };
-
-  six = buildPythonPackage {
-    name = "six-1.11.0";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
-      md5 = "d12789f9baf7e9fb2524c0c64f1773f8";
-    };
-  };
-
-  snowballstemmer = buildPythonPackage {
-    name = "snowballstemmer-1.2.1";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/20/6b/d2a7cb176d4d664d94a6debf52cd8dbae1f7203c8e42426daa077051d59c/snowballstemmer-1.2.1.tar.gz";
-      md5 = "643b019667a708a922172e33a99bf2fa";
-    };
-  };
-
-  sphinx-rtd-theme = buildPythonPackage {
-    name = "sphinx-rtd-theme-0.2.5b1";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/59/e4/9e3a74a3271e6734911d3f549e8439db53b8ac29adf10c8f698e6c86246b/sphinx_rtd_theme-0.2.5b1.tar.gz";
-      md5 = "0923473a43bd2527f32151f195f2a521";
-    };
-  };
-
-  sphinxcontrib-websupport = buildPythonPackage {
-    name = "sphinxcontrib-websupport-1.0.1";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/c5/6b/f0630436b931ad4f8331a9399ca18a7d447f0fcc0c7178fb56b1aee68d01/sphinxcontrib-websupport-1.0.1.tar.gz";
-      md5 = "84df26463b1ba65b07f926dbe2055665";
-    };
-  };
-
-  typing = buildPythonPackage {
-    name = "typing-3.6.2";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/ca/38/16ba8d542e609997fdcd0214628421c971f8c395084085354b11ff4ac9c3/typing-3.6.2.tar.gz";
-      md5 = "143af0bf3afd1887622771f2f1ffe8e1";
-    };
-  };
-
-  urllib3 = buildPythonPackage {
-    name = "urllib3-1.22";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/ee/11/7c59620aceedcc1ef65e156cc5ce5a24ef87be4107c2b74458464e437a5d/urllib3-1.22.tar.gz";
-      md5 = "0da7bed3fe94bf7dc59ae37885cc72f7";
-    };
-  };
-
-
-  sphinx_rtd_theme = buildPythonPackage rec {
-    name = "sphinx-rtd-theme-0.2.5b1";
-    buildInputs = [];
-    doCheck = false;
-    propagatedBuildInputs = [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/59/e4/9e3a74a3271e6734911d3f549e8439db53b8ac29adf10c8f698e6c86246b/sphinx_rtd_theme-0.2.5b1.tar.gz";
-      md5 = "0923473a43bd2527f32151f195f2a521";
-    };
-
-
-  };
   # Avoid that setuptools is replaced, this leads to trouble
   # with buildPythonPackage.
   setuptools = pkgs.python27Packages.setuptools;
@@ -255,7 +221,7 @@ let
 in python.buildEnv.override {
   inherit python;
   extraLibs = [
-    Sphinx
-    sphinx_rtd_theme
+    sphinx
+    sphinx-rtd-theme
   ];
-}
+}
\ No newline at end of file
diff --git a/docs/known-issues/known-issues.rst b/docs/known-issues/known-issues.rst
--- a/docs/known-issues/known-issues.rst
+++ b/docs/known-issues/known-issues.rst
@@ -37,6 +37,7 @@ To convert the old version into a curren
 |repo| into a local machine using a recent |git| client, then push it to a new
 |repo| inside |RCE|.
 
+
 VCS Server Memory Consumption
 -----------------------------
 
@@ -48,24 +49,34 @@ shipped with the optimal configuration a
 To fix this issue, upgrade to |RCE| 3.3.2 or greater, and if you discover
 memory consumption issues check the VCS Server settings.
 
-Fedora 23
----------
+Fedora 23 / Ubuntu 18.04
+------------------------
+
+|RCC| has a know problem with locales, due to changes in glibc 2.27+ which affects
+the local-archive format, which is now incompatible with our used glibc 2.26.
+
 
-|RCC| does not run perfectly on Fedora 23 due to a locale issue. This is a
-known issue under investigation due to the Nix packaging of the product, see the
-`Github issue here`_. |RCC| runs fine on Fedora 21.
+To work around this problem, you need set path to ``$LOCAL_ARCHIVE`` to the
+locale package in older pre glibc 2.27 format, or set `LC_ALL=C` in your enviroment.
+
+To use the pre 2.27 locale-archive fix follow these steps:
 
-To work around this problem, you need to point ``$LOCAL_ARCHIVE`` to the
-workaround locale package.
+1. Download the pre 2.27 locale-archive package
 
-1. Download this package:
-   http://lipa.ms.mff.cuni.cz/~cunav5am/nix/locale-archive
+.. code-block:: bash
+
+    wget https://dls.rhodecode.com/assets/locale-archive
+
 
 2. Point ``$LOCAL_ARCHIVE`` to the locale package.
 
 .. code-block:: bash
 
-    $ export LOCALE_ARCHIVE=/home/VERSION/locale-archive # change to your path
+    $ export LOCALE_ARCHIVE=/home/USER/locale-archive  # change to your path
+
+This can either added in `~/.rccontrol/supervisor/supervisord.ini`
+or in user .bashrc/.zshrc etc, or via a startup script that
+runs `rccontrol self-init`
 
 If you happen to be running |RCC| from systemd, use the following
 example to pass the correct locale information on boot.
@@ -85,4 +96,3 @@ example to pass the correct locale infor
     [Install]
     WantedBy=multi-user.target
 
-.. _Github issue here: https://github.com/NixOS/nix/issues/599
diff --git a/docs/pip2nix.ini b/docs/pip2nix.ini
new file mode 100644
--- /dev/null
+++ b/docs/pip2nix.ini
@@ -0,0 +1,3 @@
+[pip2nix]
+requirements = -r ./requirements_docs.txt
+output = ./python-packages-generated.nix
diff --git a/docs/python-packages-generated.nix b/docs/python-packages-generated.nix
new file mode 100644
--- /dev/null
+++ b/docs/python-packages-generated.nix
@@ -0,0 +1,221 @@
+# Generated by pip2nix 0.8.0.dev1
+# See https://github.com/johbo/pip2nix
+
+{ pkgs, fetchurl, fetchgit, fetchhg }:
+
+self: super: {
+  "alabaster" = super.buildPythonPackage {
+    name = "alabaster-0.7.11";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/3f/46/9346ea429931d80244ab7f11c4fce83671df0b7ae5a60247a2b588592c46/alabaster-0.7.11.tar.gz";
+      sha256 = "1mvm69xsn5xf1jc45kdq1mn0yq0pfn54mv2jcww4s1vwqx6iyfxn";
+    };
+  };
+  "babel" = super.buildPythonPackage {
+    name = "babel-2.6.0";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."pytz"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/be/cc/9c981b249a455fa0c76338966325fc70b7265521bad641bf2932f77712f4/Babel-2.6.0.tar.gz";
+      sha256 = "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc";
+    };
+  };
+  "certifi" = super.buildPythonPackage {
+    name = "certifi-2018.8.24";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/e1/0f/f8d5e939184547b3bdc6128551b831a62832713aa98c2ccdf8c47ecc7f17/certifi-2018.8.24.tar.gz";
+      sha256 = "0f0nhrj9mlrf79iway4578wrsgmjh0fmacl9zv8zjckdy7b90rip";
+    };
+  };
+  "chardet" = super.buildPythonPackage {
+    name = "chardet-3.0.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz";
+      sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
+    };
+  };
+  "docutils" = super.buildPythonPackage {
+    name = "docutils-0.14";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
+      sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
+    };
+  };
+  "idna" = super.buildPythonPackage {
+    name = "idna-2.7";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/65/c4/80f97e9c9628f3cac9b98bfca0402ede54e0563b56482e3e6e45c43c4935/idna-2.7.tar.gz";
+      sha256 = "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8";
+    };
+  };
+  "imagesize" = super.buildPythonPackage {
+    name = "imagesize-1.1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/41/f5/3cf63735d54aa9974e544aa25858d8f9670ac5b4da51020bbfc6aaade741/imagesize-1.1.0.tar.gz";
+      sha256 = "1dg3wn7qpwmhgqc0r9na2ding1wif9q5spz3j9zn2riwphc2k0zk";
+    };
+  };
+  "jinja2" = super.buildPythonPackage {
+    name = "jinja2-2.9.6";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."markupsafe"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
+      sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx";
+    };
+  };
+  "markupsafe" = super.buildPythonPackage {
+    name = "markupsafe-1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
+      sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
+    };
+  };
+  "packaging" = super.buildPythonPackage {
+    name = "packaging-17.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."pyparsing"
+      self."six"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/77/32/439f47be99809c12ef2da8b60a2c47987786d2c6c9205549dd6ef95df8bd/packaging-17.1.tar.gz";
+      sha256 = "0nrpayk8kij1zm9sjnk38ldz3a6705ggvw8ljylqbrb4vmqbf6gh";
+    };
+  };
+  "pygments" = super.buildPythonPackage {
+    name = "pygments-2.2.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
+      sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
+    };
+  };
+  "pyparsing" = super.buildPythonPackage {
+    name = "pyparsing-2.2.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/3c/ec/a94f8cf7274ea60b5413df054f82a8980523efd712ec55a59e7c3357cf7c/pyparsing-2.2.0.tar.gz";
+      sha256 = "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8";
+    };
+  };
+  "pytz" = super.buildPythonPackage {
+    name = "pytz-2018.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/10/76/52efda4ef98e7544321fd8d5d512e11739c1df18b0649551aeccfb1c8376/pytz-2018.4.tar.gz";
+      sha256 = "0jgpqx3kk2rhv81j1izjxvmx8d0x7hzs1857pgqnixic5wq2ar60";
+    };
+  };
+  "requests" = super.buildPythonPackage {
+    name = "requests-2.19.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."chardet"
+      self."idna"
+      self."urllib3"
+      self."certifi"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/54/1f/782a5734931ddf2e1494e4cd615a51ff98e1879cbe9eecbdfeaf09aa75e9/requests-2.19.1.tar.gz";
+      sha256 = "0snf8xxdzsgh1x2zv3vilvbrv9jbpmnfagzzb1rjmmvflckdh8pc";
+    };
+  };
+  "setuptools" = super.buildPythonPackage {
+    name = "setuptools-40.2.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ef/1d/201c13e353956a1c840f5d0fbf0461bd45bbd678ea4843ebf25924e8984c/setuptools-40.2.0.zip";
+      sha256 = "19ng5m7kigllg3x96c91y3a2k28g6kwnbb1v4warrnp4xma1v227";
+    };
+  };
+  "six" = super.buildPythonPackage {
+    name = "six-1.11.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
+      sha256 = "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h";
+    };
+  };
+  "snowballstemmer" = super.buildPythonPackage {
+    name = "snowballstemmer-1.2.1";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/20/6b/d2a7cb176d4d664d94a6debf52cd8dbae1f7203c8e42426daa077051d59c/snowballstemmer-1.2.1.tar.gz";
+      sha256 = "0a0idq4y5frv7qsg2x62jd7rd272749xk4x99misf5rcifk2d7wi";
+    };
+  };
+  "sphinx" = super.buildPythonPackage {
+    name = "sphinx-1.7.8";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."six"
+      self."jinja2"
+      self."pygments"
+      self."docutils"
+      self."snowballstemmer"
+      self."babel"
+      self."alabaster"
+      self."imagesize"
+      self."requests"
+      self."setuptools"
+      self."packaging"
+      self."sphinxcontrib-websupport"
+      self."typing"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ac/54/4ef326d0c654da1ed91341a7a1f43efc18a8c770ddd2b8e45df97cb79d82/Sphinx-1.7.8.tar.gz";
+      sha256 = "1ryz0w4c31930f1br2sjwrxwx9cmsy7cqdb0d81g98n9bj250w50";
+    };
+  };
+  "sphinx-rtd-theme" = super.buildPythonPackage {
+    name = "sphinx-rtd-theme-0.4.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."sphinx"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/f2/b0/a1933d792b806118ddbca6699f2e2c844d9b1b16e84a89d7effd5cd2a800/sphinx_rtd_theme-0.4.1.tar.gz";
+      sha256 = "1xkyqam8dzbjaymdyvkiif85m4y3jf8crdiwlgcfp8gqcj57aj9v";
+    };
+  };
+  "sphinxcontrib-websupport" = super.buildPythonPackage {
+    name = "sphinxcontrib-websupport-1.1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/07/7a/e74b06dce85555ffee33e1d6b7381314169ebf7e31b62c18fcb2815626b7/sphinxcontrib-websupport-1.1.0.tar.gz";
+      sha256 = "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x";
+    };
+  };
+  "typing" = super.buildPythonPackage {
+    name = "typing-3.6.6";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/bf/9b/2bf84e841575b633d8d91ad923e198a415e3901f228715524689495b4317/typing-3.6.6.tar.gz";
+      sha256 = "0ba9acs4awx15bf9v3nrs781msbd2nx826906nj6fqks2bvca9s0";
+    };
+  };
+  "urllib3" = super.buildPythonPackage {
+    name = "urllib3-1.23";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/3c/d2/dc5471622bd200db1cd9319e02e71bc655e9ea27b8e0ce65fc69de0dac15/urllib3-1.23.tar.gz";
+      sha256 = "1bvbd35q3zdcd7gsv38fwpizy7p06dr0154g5gfybrvnbvhwb2m6";
+    };
+  };
+
+### Test requirements
+
+  
+}
diff --git a/docs/release-notes/release-notes-4.13.0.rst b/docs/release-notes/release-notes-4.13.0.rst
new file mode 100644
--- /dev/null
+++ b/docs/release-notes/release-notes-4.13.0.rst
@@ -0,0 +1,133 @@
+|RCE| 4.13.0 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2018-09-05
+
+
+New Features
+^^^^^^^^^^^^
+
+- Branch permissions: new set of permissions were added to control branch modification.
+  There are 4 basic permissions that can be set for branch names/branch patterns:
+  * no-access (any modification for given branch is forbidden)
+  * web-merge (modify branch by web based PR merge)
+  * push (only non-forced modification on branch are allowed)
+  * forced push (all modification to branch are allowed)
+  Available in EE edition only.
+- Unified search and repo-switcher: a new persistent search box is now present allowing
+  to search for repositories, repository groups, commits (using full text search),
+  users, user-groups. Replaces redundant quick-filters/repo switcher.
+- Default Reviewers: added possibility to match against regex based pattern as
+  alternative syntax to glob which didn't handle all the cases.
+- Built-in Error tracker: added new exception tracking capability. All errors are now
+  tracked and stored. This allows instance admins to see potential problems without
+  access to the machine and logs.
+- User Groups: each user group which users have access to expose public profile link.
+  It's possible to view the members of a group before attaching it to any resource.
+- New caching framework: existing Beaker cache was completely replaced by dogpile.cache
+  library. This new cache framework in addition to solving multiple
+  performance/reliability problems of Beaker is used to cache permissions tree.
+  This gives huge performance boosts for very large and complex permission trees.
+- Pull Requests: description field is now allowed to use a RST/Markdown syntax.
+- SVN: added support for SVN 1.10 release line.
+
+
+General
+^^^^^^^
+
+- Google: updated google auth plugin with latest API changes.
+- Frontend: Switched to Polymer 2.0.
+- Events: added a default timeout for operation calling the endpoint url, so
+  they won't block forever.
+- SQLAlchemy: allow DB connection ping/refresh using dedicated flag from .ini file.
+  `sqlalchemy.db1.ping_connection = true`
+- Pull Requests: added option to force-refresh merge workspace in case of problems.
+  Adding GET param `?force_refresh=1` into PR page triggers the refresh.
+- Pull Requests: show more info about version of comment vs latest version.
+- Diffs: skip line numbers during copy from a diff view.
+- License: use simple cache to read license info.
+  Due to the complex and expensive encryption, this reduces requests time by ~10ms.
+- Debug: add new custom logging to track unique requests across systems.
+  Allows tracking single requests in very busy system by unique ID added into logging system.
+- Configuration: .ini files now can replace a special placeholders e.g "{ENV_NAME}"
+  into a value from the ENVIRONMENT. Allows easier setup in Docker and similar.
+- Backend: don't support vcsserver.scm_app anymore, now it uses http even if scm_app
+  is specified.
+- Repositories: re-order creation/fork forms for better UX and consistency.
+- UI: Add the number of inactive users in _admin/users and _admin/user_groups
+- UX: updated registration form to better indicate what is the process of binding a
+  RhodeCode account with external one like Google.
+- API: pull-requests allow automatic title generation via API
+- VCSServer: errors: use a better interface to track exceptions and tracebacks.
+- VCSServer: caches: replaced beaker with dogpile cache.
+- GIT: use GIT_DISCOVERY_ACROSS_FILESYSTEM for better compatibility on NFS servers.
+- Dependencies: bumped mercurial to 4.6.2
+- Dependencies: bumped evolve to 8.0.1
+- Dependencies: bumped hgsubversion to 1.9.2
+- Dependencies: bumped git version to 2.16.4
+- Dependencies: bumped SVN to 1.10.2
+- Dependencies: added alternative pymysql drivers for mysql
+- NIX: updated to 18.03 nix packages, now shipped with python 2.7.15
+  release and multiple other new libraries.
+
+
+Security
+^^^^^^^^
+
+- Mercurial: general protocol security updates.
+  * Fixes Mercurial's CVE for lack of permissions checking on mercurial batch commands.
+  * Introduced more strict checks for permissions, now they default to push instead of pull.
+  * Decypher batch commands and pick top-most permission to be required.
+  * This follows changes in Mercurial CORE after 4.6.1 release.
+- Fixed bug in bleach sanitizer allowing certain custom payload to bypass it. Now
+  we always fails if sanitizing fails. This could lead to stored XSS
+- Fixed stored XSS in binary file rendering.
+- Fixed stored XSS in repo forks datagrid.
+
+
+Performance
+^^^^^^^^^^^
+
+- Permissions: Permission trees for users and now cached, after calculation.
+  This reduces response time for some pages dramatically.
+  In case of any permission changes caches are invalidated.
+- Core: new dogpile.cache based cache framework was introduced, which is faster than
+  previously used Beaker.
+
+
+Fixes
+^^^^^
+
+- Audit Logs: store properly IP for certain events.
+- External Auth: pass along came_from into the url so we get properly
+  redirected back after logging using external auth provider.
+- Pull Requests: lock submit on pull request to prevent double submission on a fast click.
+- Pull Requests: fixed a case of unresolved comments attached to removed file in pull request.
+  That prevented from closing it.
+- Pull Requests: use numeric repo id for creation of shadow repos. Fixes a problem
+  when repository is renamed during PR lifetime.
+- API: fixed creation of a pull request with default reviewer rules.
+- Default Reviewers: fixed voting rule calculation on user group.
+- Pull Requests: in GIT use force fetch and update for target ref.
+  This solves a case when in PR a target repository is force updated (by push force)
+  and is out of sync.
+- VCSServer: detect early potential locale problem, and fallback to LC_ALL=C,
+  instead of crashing vcsserver.
+- Pull Requests: use a safer way of destroying shadow repositories.
+  Fixes some problems in NFS storage and big repositories
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- The direct backend `vcsserver.scm_app` is not supported anymore. This backed was
+  already deprecated some time ago. Now it will use `http` mode even if scm_app is
+  specified. Please contact us in case you still use it, and not sure how to upgrade.
+- New dogpile cache settings are not ported to converted .ini. If users want to do
+  adjustments please copy the settings over dogpile cache section from a newly
+  generated rhodecode.template.ini file. This file is stored next to rhodecode.ini
+- SVN 1.10.2 was introduced in this release. Please make sure to update your
+  mod_dav to the same version for best compatibility.
diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst
--- a/docs/release-notes/release-notes.rst
+++ b/docs/release-notes/release-notes.rst
@@ -9,6 +9,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.13.0.rst
    release-notes-4.12.4.rst
    release-notes-4.12.3.rst
    release-notes-4.12.2.rst
diff --git a/docs/requirements_docs.txt b/docs/requirements_docs.txt
--- a/docs/requirements_docs.txt
+++ b/docs/requirements_docs.txt
@@ -1,8 +1,8 @@
-Sphinx==1.6.5
+sphinx==1.7.8
 six==1.11.0
-sphinx_rtd_theme==0.2.5b1
+sphinx_rtd_theme==0.4.1
 docutils==0.14.0
-Pygments==2.2.0
-MarkupSafe==1.0.0
-Jinja2==2.9.6
-pytz
\ No newline at end of file
+pygments==2.2.0
+markupsafe==1.0.0
+jinja2==2.9.6
+pytz==2018.4
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,13 @@
 {
   "name": "rhodecode-enterprise",
-  "version": "0.0.1",
+  "version": "1.0.0",
+  "private": true,
+  "description" : "RhodeCode JS packaged",
+  "license": "SEE LICENSE IN LICENSE.txt",
+  "repository" : {
+    "type" : "hg",
+    "url" : "https://code.rhodecode.com/rhodecode-enterprise-ce"
+  },
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-contrib-copy": "^1.0.0",
@@ -8,16 +15,17 @@
     "grunt-contrib-jshint": "^0.12.0",
     "grunt-contrib-less": "^1.1.0",
     "grunt-contrib-watch": "^0.6.1",
-    "crisper": "^2.0.2",
-    "vulcanize": "^1.14.8",
+    "crisper": "^2.1.1",
+    "vulcanize": "^1.16.0",
     "grunt-crisper": "^1.0.1",
     "grunt-vulcanize": "^1.0.0",
     "node2nix": "^1.0.0",
     "jshint": "^2.9.1-rc3",
-    "bower": "^1.7.9",
+    "bower": "^1.8.4",
     "jquery": "1.11.3",
     "favico.js": "^0.3.10",
-    "clipboard": "^1.7.1",
+    "clipboard": "^2.0.1",
+    "qrious": "^4.0.2",
     "moment": "^2.18.1",
     "mousetrap": "^1.6.1",
     "appenlight-client": "git+https://git@github.com/AppEnlight/appenlight-client-js.git#0.5.1"
diff --git a/pkgs/README.rst b/pkgs/README.rst
new file mode 100644
--- /dev/null
+++ b/pkgs/README.rst
@@ -0,0 +1,52 @@
+
+==============================
+ Generate the Nix expressions
+==============================
+
+Details can be found in the repository of `RhodeCode Enterprise CE`_ inside of
+the file `docs/contributing/dependencies.rst`.
+
+Start the environment as follows:
+
+.. code:: shell
+
+   nix-shell pkgs/shell-generate.nix
+
+
+
+Python dependencies
+===================
+
+.. code:: shell
+
+   pip2nix generate --licenses
+   # or
+   nix-shell pkgs/shell-generate.nix --command "pip2nix generate --licenses"
+
+
+NodeJS dependencies
+===================
+
+.. code:: shell
+
+   rm -rf node_modules
+   nix-shell pkgs/shell-generate.nix --command "
+       node2nix --input package.json \
+                -o pkgs/node-packages.nix \
+                -e pkgs/node-env.nix \
+                -c pkgs/node-default.nix \
+                -d --flatten --nodejs-6 "
+
+
+
+Bower dependencies
+==================
+
+.. code:: shell
+
+   nix-shell pkgs/shell-generate.nix --command "bower2nix bower.json pkgs/bower-packages.nix"
+
+
+.. Links
+
+.. _RhodeCode Enterprise CE: https://code.rhodecode.com/rhodecode-enterprise-ce
diff --git a/pkgs/backport-16.03-build-bower-components.nix b/pkgs/backport-16.03-build-bower-components.nix
deleted file mode 100644
--- a/pkgs/backport-16.03-build-bower-components.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-# Backported buildBowerComponents so that we can also use it with the version
-# 16.03 which is the current stable at the time of this writing.
-#
-# This file can be removed once building with 16.03 is not needed anymore.
-
-{ pkgs }:
-
-{ buildInputs ? [], generated, ... } @ attrs:
-
-let
-  bower2nix-src = pkgs.fetchzip {
-    url = "https://github.com/rvl/bower2nix/archive/v3.0.1.tar.gz";
-    sha256 = "1zbvz96k2j6g0r4lvm5cgh41a73k9dgayk7x63cmg538dzznxvyb";
-  };
-
-  bower2nix = import "${bower2nix-src}/default.nix" { inherit pkgs; };
-
-  fetchbower = import ./backport-16.03-fetchbower.nix {
-    inherit (pkgs) stdenv lib;
-    inherit bower2nix;
-  };
-
-  # Fetches the bower packages. `generated` should be the result of a
-  # `bower2nix` command.
-  bowerPackages = import generated {
-    inherit (pkgs) buildEnv;
-    inherit fetchbower;
-  };
-
-in pkgs.stdenv.mkDerivation (
-  attrs
-  //
-  {
-    name = "bower_components-" + attrs.name;
-
-    inherit bowerPackages;
-
-    builder = builtins.toFile "builder.sh" ''
-      source $stdenv/setup
-
-      # The project's bower.json is required
-      cp $src/bower.json .
-
-      # Dereference symlinks -- bower doesn't like them
-      cp  --recursive --reflink=auto       \
-          --dereference --no-preserve=mode \
-          $bowerPackages bc
-
-      # Bower install in offline mode -- links together the fetched
-      # bower packages.
-      HOME=$PWD bower \
-          --config.registry=https://registry.bower.io \
-          --config.storage.packages=bc/packages \
-          --config.storage.registry=bc/registry \
-          install
-
-      # Sets up a single bower_components directory within
-      # the output derivation.
-      mkdir -p $out
-      mv bower_components $out
-    '';
-
-    buildInputs = buildInputs ++ [
-      pkgs.git
-      pkgs.nodePackages.bower
-    ];
-  }
-)
diff --git a/pkgs/backport-16.03-fetchbower.nix b/pkgs/backport-16.03-fetchbower.nix
deleted file mode 100644
--- a/pkgs/backport-16.03-fetchbower.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, lib, bower2nix }:
-let
-  bowerVersion = version:
-    let
-      components = lib.splitString "#" version;
-      hash = lib.last components;
-      ver = if builtins.length components == 1 then version else hash;
-    in ver;
-
-  fetchbower = name: version: target: outputHash: stdenv.mkDerivation {
-    name = "${name}-${bowerVersion version}";
-    buildCommand = ''
-      fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}"
-      # In some cases, the result of fetchBower is different depending
-      # on the output directory (e.g. if the bower package contains
-      # symlinks). So use a local output directory before copying to
-      # $out.
-      cp -R out $out
-    '';
-    outputHashMode = "recursive";
-    outputHashAlgo = "sha256";
-    inherit outputHash;
-    buildInputs = [ bower2nix ];
-  };
-
-in fetchbower
diff --git a/pkgs/bower-packages.nix b/pkgs/bower-packages.nix
--- a/pkgs/bower-packages.nix
+++ b/pkgs/bower-packages.nix
@@ -1,33 +1,30 @@
+# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
 { fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "webcomponentsjs" "0.7.22" "^0.7.22" "178h9j8jq9wi5845f5pxhhhqw6x022nzmpzm4di8fgsdl1f6nr5d")
-  (fetchbower "polymer" "Polymer/polymer#1.6.1" "Polymer/polymer#^1.6.1" "09mm0jgk457gvwqlc155swch7gjr6fs3g7spnvhi6vh5b6518540")
-  (fetchbower "paper-button" "PolymerElements/paper-button#1.0.13" "PolymerElements/paper-button#^1.0.13" "0i3y153nqk06pn0gk282vyybnl3g1w3w41d5i9z659cgn27g3fvm")
-  (fetchbower "paper-spinner" "PolymerElements/paper-spinner#1.2.0" "PolymerElements/paper-spinner#^1.2.0" "1av1m6y81jw3hjhz1yqy3rwcgxarjzl58ldfn4q6sn51pgzngfqb")
-  (fetchbower "paper-tooltip" "PolymerElements/paper-tooltip#1.1.3" "PolymerElements/paper-tooltip#^1.1.2" "0vmrm1n8k9sk9nvqy03q177axy22pia6i3j1gxbk72j3pqiqvg6k")
-  (fetchbower "paper-toast" "PolymerElements/paper-toast#1.3.0" "PolymerElements/paper-toast#^1.3.0" "0x9rqxsks5455s8pk4aikpp99ijdn6kxr9gvhwh99nbcqdzcxq1m")
-  (fetchbower "paper-toggle-button" "PolymerElements/paper-toggle-button#1.2.0" "PolymerElements/paper-toggle-button#^1.2.0" "0mphcng3ngspbpg4jjn0mb91nvr4xc1phq3qswib15h6sfww1b2w")
-  (fetchbower "iron-ajax" "PolymerElements/iron-ajax#1.4.4" "PolymerElements/iron-ajax#^1.4.4" "0jpi7ik3zljw8yh2ccc85r26lcpzmkc2nl1kn6fqdx57zkzk9v5b")
-  (fetchbower "iron-autogrow-textarea" "PolymerElements/iron-autogrow-textarea#1.0.13" "PolymerElements/iron-autogrow-textarea#^1.0.13" "0zwhpl97vii1s8k0lgain8i9dnw29b0mxc5ixdscx9las13n2lqq")
-  (fetchbower "iron-a11y-keys" "PolymerElements/iron-a11y-keys#1.0.6" "PolymerElements/iron-a11y-keys#^1.0.6" "1xz3mgghfcxixq28sdb654iaxj4nyi1bzcwf77ydkms6fviqs9mv")
-  (fetchbower "iron-flex-layout" "PolymerElements/iron-flex-layout#1.3.1" "PolymerElements/iron-flex-layout#^1.0.0" "0nswv3ih3bhflgcd2wjfmddqswzgqxb2xbq65jk9w3rkj26hplbl")
-  (fetchbower "paper-behaviors" "PolymerElements/paper-behaviors#1.0.12" "PolymerElements/paper-behaviors#^1.0.0" "012bqk97awgz55cn7rm9g7cckrdhkqhls3zvp8l6nd4rdwcrdzq8")
-  (fetchbower "paper-material" "PolymerElements/paper-material#1.0.6" "PolymerElements/paper-material#^1.0.0" "0rljmknfdbm5aabvx9pk77754zckj3l127c3mvnmwkpkkr353xnh")
-  (fetchbower "paper-styles" "PolymerElements/paper-styles#1.1.4" "PolymerElements/paper-styles#^1.0.0" "0j8vg74xrcxlni8i93dsab3y80f34kk30lv4yblqpkp9c3nrilf7")
-  (fetchbower "neon-animation" "PolymerElements/neon-animation#1.2.4" "PolymerElements/neon-animation#^1.0.0" "16mz9i2n5w0k5j8d6gha23cnbdgm5syz3fawyh89gdbq97bi2q5j")
-  (fetchbower "iron-a11y-announcer" "PolymerElements/iron-a11y-announcer#1.0.5" "PolymerElements/iron-a11y-announcer#^1.0.0" "0n7c7j1pwk3835s7s2jd9125wdcsqf216yi5gj07wn5s8h8p7m9d")
-  (fetchbower "iron-overlay-behavior" "PolymerElements/iron-overlay-behavior#1.8.6" "PolymerElements/iron-overlay-behavior#^1.0.9" "14brn9gz6qqskarg3fxk91xs7vg02vgcsz9a9743kidxr0l0413m")
-  (fetchbower "iron-fit-behavior" "PolymerElements/iron-fit-behavior#1.2.5" "PolymerElements/iron-fit-behavior#^1.1.0" "1msnlh8lp1xg6v4h6dkjwj9kzac5q5q208ayla3x9hi483ki6rlf")
-  (fetchbower "iron-checked-element-behavior" "PolymerElements/iron-checked-element-behavior#1.0.5" "PolymerElements/iron-checked-element-behavior#^1.0.0" "0l0yy4ah454s8bzfv076s8by7h67zy9ni6xb932qwyhx8br6c1m7")
-  (fetchbower "promise-polyfill" "polymerlabs/promise-polyfill#1.0.1" "polymerlabs/promise-polyfill#^1.0.0" "045bj2caav3famr5hhxgs1dx7n08r4s46mlzwb313vdy17is38xb")
-  (fetchbower "iron-behaviors" "PolymerElements/iron-behaviors#1.0.17" "PolymerElements/iron-behaviors#^1.0.0" "021qvkmbk32jrrmmphpmwgby4bzi5jyf47rh1bxmq2ip07ly4bpr")
-  (fetchbower "iron-validatable-behavior" "PolymerElements/iron-validatable-behavior#1.1.1" "PolymerElements/iron-validatable-behavior#^1.0.0" "1yhxlvywhw2klbbgm3f3cmanxfxggagph4ii635zv0c13707wslv")
-  (fetchbower "iron-form-element-behavior" "PolymerElements/iron-form-element-behavior#1.0.6" "PolymerElements/iron-form-element-behavior#^1.0.0" "0rdhxivgkdhhz2yadgdbjfc70l555p3y83vjh8rfj5hr0asyn6q1")
-  (fetchbower "iron-a11y-keys-behavior" "polymerelements/iron-a11y-keys-behavior#1.1.9" "polymerelements/iron-a11y-keys-behavior#^1.0.0" "1imm4gc84qizihhbyhfa8lwjh3myhj837f79i5m04xjgwrjmkaf6")
-  (fetchbower "paper-ripple" "PolymerElements/paper-ripple#1.0.8" "PolymerElements/paper-ripple#^1.0.0" "0r9sq8ik7wwrw0qb82c3rw0c030ljwd3s466c9y4qbcrsbvfjnns")
-  (fetchbower "font-roboto" "PolymerElements/font-roboto#1.0.1" "PolymerElements/font-roboto#^1.0.1" "02jz43r0wkyr3yp7rq2rc08l5cwnsgca9fr54sr4rhsnl7cjpxrj")
-  (fetchbower "iron-meta" "PolymerElements/iron-meta#1.1.2" "PolymerElements/iron-meta#^1.0.0" "1wl4dx8fnsknw9z9xi8bpc4cy9x70c11x4zxwxnj73hf3smifppl")
-  (fetchbower "iron-resizable-behavior" "PolymerElements/iron-resizable-behavior#1.0.5" "PolymerElements/iron-resizable-behavior#^1.0.0" "1fd5zmbr2hax42vmcasncvk7lzi38fmb1kyii26nn8pnnjak7zkn")
-  (fetchbower "iron-selector" "PolymerElements/iron-selector#1.5.2" "PolymerElements/iron-selector#^1.0.0" "1ajv46llqzvahm5g6g75w7nfyjcslp53ji0wm96l2k94j87spv3r")
-  (fetchbower "web-animations-js" "web-animations/web-animations-js#2.2.2" "web-animations/web-animations-js#^2.2.0" "1izfvm3l67vwys0bqbhidi9rqziw2f8wv289386sc6jsxzgkzhga")
+  (fetchbower "webcomponentsjs" "1.2.3" "^1.2.3" "0db2fjk779rhl9d4ifpk1j9a83vngx6j3hk7si1752dqxj857267")
+  (fetchbower "polymer" "Polymer/polymer#2.6.0" "Polymer/polymer#^2.6.0" "1jw5syjn0naa7dlxzxvsgwb20zbkbpx0pcg0wzjq4wr49c20nw0k")
+  (fetchbower "paper-button" "PolymerElements/paper-button#2.1.2" "PolymerElements/paper-button#^2.1.2" "1lwmjwhvimh02gss39yjp5h7yg9mxl1ig59yrk085v86y5f5ilz1")
+  (fetchbower "paper-spinner" "PolymerElements/paper-spinner#2.1.0" "PolymerElements/paper-spinner#^2.1.0" "07jamgxzvy4r9pgf5ikj1fm8nkrw6sywgcxvmm7ax58hjvmd4i45")
+  (fetchbower "paper-tooltip" "PolymerElements/paper-tooltip#2.1.1" "PolymerElements/paper-tooltip#^2.1.1" "0ja9vz4xps7dxfx6kmrwq0gifbjsyc3pk9l3hd5233ss72ghlvgb")
+  (fetchbower "paper-toast" "PolymerElements/paper-toast#2.1.2" "PolymerElements/paper-toast#^2.1.2" "0mkj9ayjx2l9hvrz4kw3yjbgrs9w873k05ywv94nh92mzpjkxn04")
+  (fetchbower "paper-toggle-button" "PolymerElements/paper-toggle-button#2.1.1" "PolymerElements/paper-toggle-button#^2.1.1" "1rl5ar3ny6r3v9hr8s68v8b3zh5yl52pikhi4b9iv9grv29g5999")
+  (fetchbower "iron-ajax" "PolymerElements/iron-ajax#2.1.3" "PolymerElements/iron-ajax#^2.1.3" "187zb6lkv18yapl292qhn611mbl4i2bqs2dimlwmdjaln285nc1l")
+  (fetchbower "iron-autogrow-textarea" "PolymerElements/iron-autogrow-textarea#2.2.0" "PolymerElements/iron-autogrow-textarea#^2.2.0" "1cx7g49m20z08x25z24g2pvv6m6dwfbkga3nsw0rpi3jk7xhznqw")
+  (fetchbower "iron-a11y-keys" "PolymerElements/iron-a11y-keys#2.1.2" "PolymerElements/iron-a11y-keys#^2.1.2" "0zdn3bzfrk88iwahmmzvcjn3m90zga1l8dx42b365n8if0n0zapj")
+  (fetchbower "shadycss" "webcomponents/shadycss#1.3.5" "webcomponents/shadycss#^v1.1.0" "1xp07d6jlmc3ywg4cdp2nijwi0vrbzw468242xz0s6zx5z2n2wzf")
+  (fetchbower "iron-flex-layout" "PolymerElements/iron-flex-layout#2.0.3" "PolymerElements/iron-flex-layout#1 - 2" "1ir9ili3rkcgbfj6is5s70vyb7m6avz0av0lpjjlhhsplrrl90bk")
+  (fetchbower "paper-behaviors" "PolymerElements/paper-behaviors#2.1.1" "PolymerElements/paper-behaviors#1 - 2" "0wzyznmy1q64jsm6lck0xma92lg2hz9h9m05r68iy20iyrvbjld7")
+  (fetchbower "paper-styles" "PolymerElements/paper-styles#2.1.0" "PolymerElements/paper-styles#1 - 2" "0xzsd7pvjsk7lgcmvx4q0dvps40q3mymkx26zgs8ns91s1ssfqbx")
+  (fetchbower "iron-a11y-announcer" "PolymerElements/iron-a11y-announcer#2.1.0" "PolymerElements/iron-a11y-announcer#1 - 2" "1hvmw76im8y3pxmg1yfnlkzap429q9i4v1z42y7m8lz0996jmxrz")
+  (fetchbower "iron-overlay-behavior" "PolymerElements/iron-overlay-behavior#2.3.4" "PolymerElements/iron-overlay-behavior#1 - 2" "0hk2fxhfz7kg27349qz1c87vq6nfdcnjr9az3q95ak3rigsb71wg")
+  (fetchbower "iron-fit-behavior" "PolymerElements/iron-fit-behavior#2.2.1" "PolymerElements/iron-fit-behavior#1 - 2" "0v89am4r2fncr7m9k0f2xqh5bvgn2dqjjc7p515ix4grk89whbs3")
+  (fetchbower "iron-checked-element-behavior" "PolymerElements/iron-checked-element-behavior#2.1.1" "PolymerElements/iron-checked-element-behavior#1 - 2" "00gpvnb7anspadw59av7lca6p03qlx59dgnhw3lqf5v223dsh0l3")
+  (fetchbower "iron-behaviors" "PolymerElements/iron-behaviors#2.1.1" "PolymerElements/iron-behaviors#1 - 2" "0c71l1il76jg8gvyh8bwlqraif53gfnz5700vpg35qyr1biwbr1w")
+  (fetchbower "iron-validatable-behavior" "PolymerElements/iron-validatable-behavior#2.1.0" "PolymerElements/iron-validatable-behavior#1 - 2" "1j65zv7hcxdcyyanzhp2wap3bnx7cz8ghd44m12fad2206jj6ysi")
+  (fetchbower "iron-a11y-keys-behavior" "PolymerElements/iron-a11y-keys-behavior#2.1.1" "PolymerElements/iron-a11y-keys-behavior#1 - 2" "0jsw7wvh4wzcjqdbvxyha99h1ph61lykyyyvdb6hm8m8w40bhs9b")
+  (fetchbower "paper-ripple" "PolymerElements/paper-ripple#2.1.1" "PolymerElements/paper-ripple#1 - 2" "0sam6w83nxf9mss79j6hjfsx0288pf4hwr1bw5xclzgpddcjmrm5")
+  (fetchbower "font-roboto" "PolymerElements/font-roboto#1.1.0" "PolymerElements/font-roboto#^1.0.1" "0z4msvaa5pnr84j2r957g313fmdbdbrknhdw1axy5g48845yv04s")
+  (fetchbower "iron-resizable-behavior" "PolymerElements/iron-resizable-behavior#2.1.1" "PolymerElements/iron-resizable-behavior#1 - 2" "0169rg6kby0ypfiwbkin46ywaszwj7r91yn081yqd96l1115aqnk")
+  (fetchbower "iron-form-element-behavior" "PolymerElements/iron-form-element-behavior#2.1.3" "PolymerElements/iron-form-element-behavior#1 - 2" "1c83kkfqvb5pdlvrhad3l7b11i244a8lykc8kzfnb9ya0xrln0cn")
+  (fetchbower "iron-meta" "PolymerElements/iron-meta#2.1.1" "PolymerElements/iron-meta#1 - 2" "12w1pcl3w97xpxihqddbf2d9dx8xz5i1jd9bz1xrmfsh25isni40")
 ]; }
diff --git a/pkgs/nix-common/pip2nix.nix b/pkgs/nix-common/pip2nix.nix
new file mode 100755
--- /dev/null
+++ b/pkgs/nix-common/pip2nix.nix
@@ -0,0 +1,17 @@
+{ pkgs
+, pythonPackages
+}:
+
+rec {
+  pip2nix-src = pkgs.fetchzip {
+    url = https://github.com/johbo/pip2nix/archive/51e6fdae34d0e8ded9efeef7a8601730249687a6.tar.gz;
+    sha256 = "02a4jjgi7lsvf8mhrxsd56s9a3yg20081rl9bgc2m84w60v2gbz2";
+  };
+
+  pip2nix = import pip2nix-src {
+    inherit
+      pkgs
+      pythonPackages;
+  };
+
+}
diff --git a/pkgs/node-default.nix b/pkgs/node-default.nix
--- a/pkgs/node-default.nix
+++ b/pkgs/node-default.nix
@@ -1,12 +1,14 @@
-# This file has been generated by node2nix 1.0.0. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv python utillinux runCommand writeTextFile nodejs;
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/pkgs/node-env.nix b/pkgs/node-env.nix
--- a/pkgs/node-env.nix
+++ b/pkgs/node-env.nix
@@ -1,31 +1,33 @@
 # This file originates from node2nix
 
-{stdenv, python, nodejs, utillinux, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
 
 let
+  python = if nodejs ? python then nodejs.python else python2;
+
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
   tarWrapper = runCommand "tarWrapper" {} ''
     mkdir -p $out/bin
-    
+
     cat > $out/bin/tar <<EOF
     #! ${stdenv.shell} -e
     $(type -p tar) "\$@" --warning=no-unknown-keyword
     EOF
-    
+
     chmod +x $out/bin/tar
   '';
-  
+
   # Function that generates a TGZ file from a NPM project
   buildNodeSourceDist =
     { name, version, src, ... }:
-    
+
     stdenv.mkDerivation {
       name = "node-tarball-${name}-${version}";
       inherit src;
       buildInputs = [ nodejs ];
       buildPhase = ''
         export HOME=$TMPDIR
-        tgzFile=$(npm pack)
+        tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
       '';
       installPhase = ''
         mkdir -p $out/tarballs
@@ -42,151 +44,322 @@ let
           # Bundle the dependencies of the package
           mkdir -p node_modules
           cd node_modules
-          
+
           # Only include dependencies if they don't exist. They may also be bundled in the package.
           if [ ! -e "${dependency.name}" ]
           then
               ${composePackage dependency}
           fi
-          
+
           cd ..
         ''
       ) dependencies);
 
   # Recursively composes the dependencies of a package
   composePackage = { name, packageName, src, dependencies ? [], ... }@args:
-    let
-      fixImpureDependencies = writeTextFile {
-        name = "fixDependencies.js";
-        text = ''
-          var fs = require('fs');
-          var url = require('url');
-          
-          /*
-           * Replaces an impure version specification by *
-           */
-          function replaceImpureVersionSpec(versionSpec) {
-              var parsedUrl = url.parse(versionSpec);
-              
-              if(versionSpec == "latest" || versionSpec == "unstable" ||
-                  versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/')
-                  return '*';
-              else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" ||
-                  parsedUrl.protocol == "http:" || parsedUrl.protocol == "https:")
-                  return '*';
-              else
-                  return versionSpec;
-          }
-      
-          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-      
-          /* Replace dependencies */
-          if(packageObj.dependencies !== undefined) {
-              for(var dependency in packageObj.dependencies) {
-                  var versionSpec = packageObj.dependencies[dependency];
-                  packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
-              }
-          }
-          
-          /* Replace development dependencies */
-          if(packageObj.devDependencies !== undefined) {
-              for(var dependency in packageObj.devDependencies) {
-                  var versionSpec = packageObj.devDependencies[dependency];
-                  packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
-              }
-          }
-          
-          /* Replace optional dependencies */
-          if(packageObj.optionalDependencies !== undefined) {
-              for(var dependency in packageObj.optionalDependencies) {
-                  var versionSpec = packageObj.optionalDependencies[dependency];
-                  packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
-              }
-          }
-          
-          /* Write the fixed JSON file */
-          fs.writeFileSync("package.json", JSON.stringify(packageObj));
-        '';
-      };
-    in
     ''
       DIR=$(pwd)
       cd $TMPDIR
-      
+
       unpackFile ${src}
-      
+
       # Make the base dir in which the target dependency resides first
       mkdir -p "$(dirname "$DIR/${packageName}")"
 
       if [ -f "${src}" ]
       then
           # Figure out what directory has been unpacked
-          packageDir=$(find . -type d -maxdepth 1 | tail -1)
-          
+          packageDir="$(find . -maxdepth 1 -type d | tail -1)"
+
           # Restore write permissions to make building work
+          find "$packageDir" -type d -print0 | xargs -0 chmod u+x
           chmod -R u+w "$packageDir"
-          
+
           # Move the extracted tarball into the output folder
           mv "$packageDir" "$DIR/${packageName}"
       elif [ -d "${src}" ]
       then
+          # Get a stripped name (without hash) of the source directory.
+          # On old nixpkgs it's already set internally.
+          if [ -z "$strippedName" ]
+          then
+              strippedName="$(stripHash ${src})"
+          fi
+
           # Restore write permissions to make building work
-           chmod -R u+w $strippedName
-           
-           # Move the extracted directory into the output folder
-           mv $strippedName "$DIR/${packageName}"
+          chmod -R u+w "$strippedName"
+
+          # Move the extracted directory into the output folder
+          mv "$strippedName" "$DIR/${packageName}"
       fi
-      
+
       # Unset the stripped name to not confuse the next unpack step
       unset strippedName
-      
-      # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
-      # The following JavaScript replaces these by * to prevent that
+
+      # Include the dependencies of the package
       cd "$DIR/${packageName}"
-      node ${fixImpureDependencies}
-      
-      # Include the dependencies of the package
       ${includeDependencies { inherit dependencies; }}
       cd ..
       ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
     '';
 
+  pinpointDependencies = {dependencies, production}:
+    let
+      pinpointDependenciesFromPackageJSON = writeTextFile {
+        name = "pinpointDependencies.js";
+        text = ''
+          var fs = require('fs');
+          var path = require('path');
+
+          function resolveDependencyVersion(location, name) {
+              if(location == process.env['NIX_STORE']) {
+                  return null;
+              } else {
+                  var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
+
+                  if(fs.existsSync(dependencyPackageJSON)) {
+                      var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
+
+                      if(dependencyPackageObj.name == name) {
+                          return dependencyPackageObj.version;
+                      }
+                  } else {
+                      return resolveDependencyVersion(path.resolve(location, ".."), name);
+                  }
+              }
+          }
+
+          function replaceDependencies(dependencies) {
+              if(typeof dependencies == "object" && dependencies !== null) {
+                  for(var dependency in dependencies) {
+                      var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
+
+                      if(resolvedVersion === null) {
+                          process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
+                      } else {
+                          dependencies[dependency] = resolvedVersion;
+                      }
+                  }
+              }
+          }
+
+          /* Read the package.json configuration */
+          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+
+          /* Pinpoint all dependencies */
+          replaceDependencies(packageObj.dependencies);
+          if(process.argv[2] == "development") {
+              replaceDependencies(packageObj.devDependencies);
+          }
+          replaceDependencies(packageObj.optionalDependencies);
+
+          /* Write the fixed package.json file */
+          fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
+        '';
+      };
+    in
+    ''
+      node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
+
+      ${stdenv.lib.optionalString (dependencies != [])
+        ''
+          if [ -d node_modules ]
+          then
+              cd node_modules
+              ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+              cd ..
+          fi
+        ''}
+    '';
+
+  # Recursively traverses all dependencies of a package and pinpoints all
+  # dependencies in the package.json file to the versions that are actually
+  # being used.
+
+  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
+    ''
+      if [ -d "${packageName}" ]
+      then
+          cd "${packageName}"
+          ${pinpointDependencies { inherit dependencies production; }}
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+      fi
+    '';
+
   # Extract the Node.js source code which is used to compile packages with
   # native bindings
   nodeSources = runCommand "node-sources" {} ''
     tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
     mv node-* $out
   '';
-  
+
+  # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
+  addIntegrityFieldsScript = writeTextFile {
+    name = "addintegrityfields.js";
+    text = ''
+      var fs = require('fs');
+      var path = require('path');
+
+      function augmentDependencies(baseDir, dependencies) {
+          for(var dependencyName in dependencies) {
+              var dependency = dependencies[dependencyName];
+
+              // Open package.json and augment metadata fields
+              var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
+              var packageJSONPath = path.join(packageJSONDir, "package.json");
+
+              if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
+                  console.log("Adding metadata fields to: "+packageJSONPath);
+                  var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
+
+                  if(dependency.integrity) {
+                      packageObj["_integrity"] = dependency.integrity;
+                  } else {
+                      packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
+                  }
+
+                  packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
+                  fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
+              }
+
+              // Augment transitive dependencies
+              if(dependency.dependencies !== undefined) {
+                  augmentDependencies(packageJSONDir, dependency.dependencies);
+              }
+          }
+      }
+
+      if(fs.existsSync("./package-lock.json")) {
+          var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
+
+          if(packageLock.lockfileVersion !== 1) {
+             process.stderr.write("Sorry, I only understand lock file version 1!\n");
+             process.exit(1);
+          }
+
+          if(packageLock.dependencies !== undefined) {
+              augmentDependencies(".", packageLock.dependencies);
+          }
+      }
+    '';
+  };
+
+  # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
+  reconstructPackageLock = writeTextFile {
+    name = "addintegrityfields.js";
+    text = ''
+      var fs = require('fs');
+      var path = require('path');
+
+      var packageObj = JSON.parse(fs.readFileSync("package.json"));
+
+      var lockObj = {
+          name: packageObj.name,
+          version: packageObj.version,
+          lockfileVersion: 1,
+          requires: true,
+          dependencies: {}
+      };
+
+      function augmentPackageJSON(filePath, dependencies) {
+          var packageJSON = path.join(filePath, "package.json");
+          if(fs.existsSync(packageJSON)) {
+              var packageObj = JSON.parse(fs.readFileSync(packageJSON));
+              dependencies[packageObj.name] = {
+                  version: packageObj.version,
+                  integrity: "sha1-000000000000000000000000000=",
+                  dependencies: {}
+              };
+              processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
+          }
+      }
+
+      function processDependencies(dir, dependencies) {
+          if(fs.existsSync(dir)) {
+              var files = fs.readdirSync(dir);
+
+              files.forEach(function(entry) {
+                  var filePath = path.join(dir, entry);
+                  var stats = fs.statSync(filePath);
+
+                  if(stats.isDirectory()) {
+                      if(entry.substr(0, 1) == "@") {
+                          // When we encounter a namespace folder, augment all packages belonging to the scope
+                          var pkgFiles = fs.readdirSync(filePath);
+
+                          pkgFiles.forEach(function(entry) {
+                              if(stats.isDirectory()) {
+                                  var pkgFilePath = path.join(filePath, entry);
+                                  augmentPackageJSON(pkgFilePath, dependencies);
+                              }
+                          });
+                      } else {
+                          augmentPackageJSON(filePath, dependencies);
+                      }
+                  }
+              });
+          }
+      }
+
+      processDependencies("node_modules", lockObj.dependencies);
+
+      fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
+    '';
+  };
+
   # Builds and composes an NPM package including all its dependencies
-  buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, preRebuild ? "", ... }@args:
-    
-    stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // {
+  buildNodePackage =
+    { name
+    , packageName
+    , version
+    , dependencies ? []
+    , buildInputs ? []
+    , production ? true
+    , npmFlags ? ""
+    , dontNpmInstall ? false
+    , bypassCache ? false
+    , preRebuild ? ""
+    , dontStrip ? true
+    , unpackPhase ? "true"
+    , buildPhase ? "true"
+    , ... }@args:
+
+    let
+      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
+    in
+    stdenv.mkDerivation ({
       name = "node-${name}-${version}";
-      buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
-      dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments
-      
-      inherit dontNpmInstall preRebuild;
-      
-      unpackPhase = args.unpackPhase or "true";
-      
-      buildPhase = args.buildPhase or "true";
-      
+      buildInputs = [ tarWrapper python nodejs ]
+        ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+        ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+        ++ buildInputs;
+
+      inherit dontStrip; # Stripping may fail a build for some package deployments
+      inherit dontNpmInstall preRebuild unpackPhase buildPhase;
+
       compositionScript = composePackage args;
-      passAsFile = [ "compositionScript" ];
-      
-      installPhase = args.installPhase or ''
+      pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+      passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
+
+      installPhase = ''
         # Create and enter a root node_modules/ folder
         mkdir -p $out/lib/node_modules
         cd $out/lib/node_modules
-          
+
         # Compose the package and all its dependencies
         source $compositionScriptPath
-        
+
+        # Pinpoint the versions of all dependencies to the ones that are actually being used
+        echo "pinpointing versions of dependencies..."
+        source $pinpointDependenciesScriptPath
+
         # Patch the shebangs of the bundled modules to prevent them from
         # calling executables outside the Nix store as much as possible
         patchShebangs .
-        
+
         # Deploy the Node.js package by running npm install. Since the
         # dependencies have been provided already by ourselves, it should not
         # attempt to install them again, which is good, because we want to make
@@ -196,23 +369,37 @@ let
         #
         # The other responsibilities of NPM are kept -- version checks, build
         # steps, postprocessing etc.
-        
+
         export HOME=$TMPDIR
         cd "${packageName}"
         runHook preRebuild
-        npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
-        
+
+        ${stdenv.lib.optionalString bypassCache ''
+          if [ ! -f package-lock.json ]
+          then
+              echo "No package-lock.json file found, reconstructing..."
+              node ${reconstructPackageLock}
+          fi
+
+          node ${addIntegrityFieldsScript}
+        ''}
+
+        npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
+
         if [ "$dontNpmInstall" != "1" ]
         then
-            npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+            rm -f npm-shrinkwrap.json
+
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
         fi
-        
+
         # Create symlink to the deployed executable folder, if applicable
         if [ -d "$out/lib/node_modules/.bin" ]
         then
             ln -s $out/lib/node_modules/.bin $out/bin
         fi
-        
+
         # Create symlinks to the deployed manual page folders, if applicable
         if [ -d "$out/lib/node_modules/${packageName}/man" ]
         then
@@ -226,52 +413,111 @@ let
                 done
             done
         fi
+
+        # Run post install hook, if provided
+        runHook postInstall
       '';
-    });
+    } // extraArgs);
 
   # Builds a development shell
-  buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, ... }@args:
+  buildNodeShell =
+    { name
+    , packageName
+    , version
+    , src
+    , dependencies ? []
+    , buildInputs ? []
+    , production ? true
+    , npmFlags ? ""
+    , dontNpmInstall ? false
+    , bypassCache ? false
+    , dontStrip ? true
+    , unpackPhase ? "true"
+    , buildPhase ? "true"
+    , ... }@args:
+
     let
-      nodeDependencies = stdenv.mkDerivation {
+      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
+
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
+
+      nodeDependencies = stdenv.mkDerivation ({
         name = "node-dependencies-${name}-${version}";
-        
-        buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
-        
+
+        buildInputs = [ tarWrapper python nodejs ]
+          ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+          ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+          ++ buildInputs;
+
+        inherit dontStrip; # Stripping may fail a build for some package deployments
+        inherit dontNpmInstall unpackPhase buildPhase;
+
         includeScript = includeDependencies { inherit dependencies; };
-        passAsFile = [ "includeScript" ];
-        
-        buildCommand = ''
-          mkdir -p $out/lib
-          cd $out/lib
+        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
+
+        installPhase = ''
+          mkdir -p $out/${packageName}
+          cd $out/${packageName}
+
           source $includeScriptPath
-          
+
           # Create fake package.json to make the npm commands work properly
-          cat > package.json <<EOF
-          {
-              "name": "${packageName}",
-              "version": "${version}"
-          }
-          EOF
-          
+          cp ${src}/package.json .
+          chmod 644 package.json
+          ${stdenv.lib.optionalString bypassCache ''
+            if [ -f ${src}/package-lock.json ]
+            then
+                cp ${src}/package-lock.json .
+            fi
+          ''}
+
+          # Pinpoint the versions of all dependencies to the ones that are actually being used
+          echo "pinpointing versions of dependencies..."
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          source $pinpointDependenciesScriptPath
+          cd ${packageName}
+
           # Patch the shebangs of the bundled modules to prevent them from
           # calling executables outside the Nix store as much as possible
           patchShebangs .
-          
-          export HOME=$TMPDIR
-          npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
-          
-          ${stdenv.lib.optionalString (!dontNpmInstall) ''
-            npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+
+          export HOME=$PWD
+
+          ${stdenv.lib.optionalString bypassCache ''
+            if [ ! -f package-lock.json ]
+            then
+                echo "No package-lock.json file found, reconstructing..."
+                node ${reconstructPackageLock}
+            fi
+
+            node ${addIntegrityFieldsScript}
           ''}
 
+          npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
+
+          ${stdenv.lib.optionalString (!dontNpmInstall) ''
+            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+            rm -f npm-shrinkwrap.json
+
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+          ''}
+
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          mv ${packageName} lib
           ln -s $out/lib/node_modules/.bin $out/bin
         '';
-      };
+      } // extraArgs);
     in
-    stdenv.lib.makeOverridable stdenv.mkDerivation {
+    stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
-      
-      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
+
+      buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
       buildCommand = ''
         mkdir -p $out/bin
         cat > $out/bin/shell <<EOF
@@ -281,7 +527,7 @@ let
         EOF
         chmod +x $out/bin/shell
       '';
-      
+
       # Provide the dependencies in a development shell through the NODE_PATH environment variable
       inherit nodeDependencies;
       shellHook = stdenv.lib.optionalString (dependencies != []) ''
@@ -289,4 +535,8 @@ let
       '';
     };
 in
-{ inherit buildNodeSourceDist buildNodePackage buildNodeShell; }
+{
+  buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
+  buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
+  buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
+}
diff --git a/pkgs/node-packages.nix b/pkgs/node-packages.nix
--- a/pkgs/node-packages.nix
+++ b/pkgs/node-packages.nix
@@ -1,9 +1,1207 @@
-# This file has been generated by node2nix 1.0.0. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
+    "@types/clone-0.1.30" = {
+      name = "_at_types_slash_clone";
+      packageName = "@types/clone";
+      version = "0.1.30";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz";
+        sha1 = "e7365648c1b42136a59c7d5040637b3b5c83b614";
+      };
+    };
+    "@types/node-4.2.23" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "4.2.23";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-4.2.23.tgz";
+        sha512 = "U6IchCNLRyswc9p6G6lxWlbE+KwAhZp6mGo6MD2yWpmFomhYmetK+c98OpKyvphNn04CU3aXeJrXdOqbXVTS/w==";
+      };
+    };
+    "@types/node-6.0.114" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "6.0.114";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-6.0.114.tgz";
+        sha512 = "5ViC9dwf1VIAtrOFTvOuN04lJgw28eKjuy0Vg2Bd/fSlxKP2feCSkIw04ZgOENL2ywdWrtbkthp1XVLEjJmouw==";
+      };
+    };
+    "@types/parse5-0.0.31" = {
+      name = "_at_types_slash_parse5";
+      packageName = "@types/parse5";
+      version = "0.0.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/parse5/-/parse5-0.0.31.tgz";
+        sha1 = "e827a493a443b156e1b582a2e4c3bdc0040f2ee7";
+      };
+    };
+    "abbrev-1.1.1" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+      };
+    };
+    "acorn-3.3.0" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
+        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
+      };
+    };
+    "acorn-5.7.1" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "5.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz";
+        sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==";
+      };
+    };
+    "acorn-jsx-3.0.1" = {
+      name = "acorn-jsx";
+      packageName = "acorn-jsx";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
+        sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
+      };
+    };
+    "ajv-4.11.8" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "4.11.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
+        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
+      };
+    };
+    "amdefine-1.0.1" = {
+      name = "amdefine";
+      packageName = "amdefine";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+      };
+    };
+    "ansi-escape-sequences-3.0.0" = {
+      name = "ansi-escape-sequences";
+      packageName = "ansi-escape-sequences";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-3.0.0.tgz";
+        sha1 = "1c18394b6af9b76ff9a63509fa497669fd2ce53e";
+      };
+    };
+    "ansi-regex-0.2.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
+        sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9";
+      };
+    };
+    "ansi-regex-2.1.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+      };
+    };
+    "ansi-styles-1.1.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz";
+        sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de";
+      };
+    };
+    "ansi-styles-2.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+      };
+    };
+    "appenlight-client-git+https://git@github.com/AppEnlight/appenlight-client-js.git#0.5.1" = {
+      name = "appenlight-client";
+      packageName = "appenlight-client";
+      version = "0.5.1";
+      src = fetchgit {
+        url = "https://git@github.com/AppEnlight/appenlight-client-js.git";
+        rev = "14712c64c230fbbe94fcbc8094aef5eb3b90b307";
+        sha256 = "05146f5b932f166c9a4db601bc9c13ae686899653d1dd03121652631f9bc83d6";
+      };
+    };
+    "aproba-1.2.0" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
+        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
+      };
+    };
+    "are-we-there-yet-1.1.5" = {
+      name = "are-we-there-yet";
+      packageName = "are-we-there-yet";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
+        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
+      };
+    };
+    "argparse-0.1.16" = {
+      name = "argparse";
+      packageName = "argparse";
+      version = "0.1.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
+        sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
+      };
+    };
+    "array-back-1.0.4" = {
+      name = "array-back";
+      packageName = "array-back";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz";
+        sha1 = "644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b";
+      };
+    };
+    "asap-2.0.6" = {
+      name = "asap";
+      packageName = "asap";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
+        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
+      };
+    };
+    "asn1-0.2.3" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
+        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
+      };
+    };
+    "assert-plus-0.2.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
+      };
+    };
+    "assert-plus-1.0.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+      };
+    };
+    "async-0.1.22" = {
+      name = "async";
+      packageName = "async";
+      version = "0.1.22";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz";
+        sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
+      };
+    };
+    "async-0.2.10" = {
+      name = "async";
+      packageName = "async";
+      version = "0.2.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+      };
+    };
+    "async-1.0.0" = {
+      name = "async";
+      packageName = "async";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz";
+        sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
+      };
+    };
+    "async-2.6.1" = {
+      name = "async";
+      packageName = "async";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz";
+        sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==";
+      };
+    };
+    "asynckit-0.4.0" = {
+      name = "asynckit";
+      packageName = "asynckit";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+      };
+    };
+    "aws-sign2-0.6.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
+        sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
+      };
+    };
+    "aws4-1.7.0" = {
+      name = "aws4";
+      packageName = "aws4";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz";
+        sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==";
+      };
+    };
+    "babel-polyfill-6.26.0" = {
+      name = "babel-polyfill";
+      packageName = "babel-polyfill";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz";
+        sha1 = "379937abc67d7895970adc621f284cd966cf2153";
+      };
+    };
+    "babel-runtime-6.26.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
+        sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
+      };
+    };
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    };
+    "base64-js-1.2.3" = {
+      name = "base64-js";
+      packageName = "base64-js";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz";
+        sha512 = "MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w==";
+      };
+    };
+    "bcrypt-pbkdf-1.0.2" = {
+      name = "bcrypt-pbkdf";
+      packageName = "bcrypt-pbkdf";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
+      };
+    };
+    "boom-2.10.1" = {
+      name = "boom";
+      packageName = "boom";
+      version = "2.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
+      };
+    };
+    "bower-1.8.4" = {
+      name = "bower";
+      packageName = "bower";
+      version = "1.8.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
+        sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
+      };
+    };
+    "brace-expansion-1.1.11" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+      };
+    };
+    "buffer-from-1.1.1" = {
+      name = "buffer-from";
+      packageName = "buffer-from";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz";
+        sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
+      };
+    };
+    "builtin-modules-1.1.1" = {
+      name = "builtin-modules";
+      packageName = "builtin-modules";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
+        sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
+      };
+    };
+    "builtins-1.0.3" = {
+      name = "builtins";
+      packageName = "builtins";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz";
+        sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88";
+      };
+    };
+    "caseless-0.12.0" = {
+      name = "caseless";
+      packageName = "caseless";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
+        sha1 = "1b681c21ff84033c826543090689420d187151dc";
+      };
+    };
+    "chalk-0.5.1" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
+        sha1 = "663b3a648b68b55d04690d49167aa837858f2174";
+      };
+    };
+    "chalk-1.1.3" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+      };
+    };
+    "cli-1.0.1" = {
+      name = "cli";
+      packageName = "cli";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz";
+        sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
+      };
+    };
+    "clipboard-2.0.1" = {
+      name = "clipboard";
+      packageName = "clipboard";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.1.tgz";
+        sha512 = "7yhQBmtN+uYZmfRjjVjKa0dZdWuabzpSKGtyQZN+9C8xlC788SSJjOHWh7tzurfwTqTD5UDYAhIv5fRJg3sHjQ==";
+      };
+    };
+    "clone-1.0.4" = {
+      name = "clone";
+      packageName = "clone";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz";
+        sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e";
+      };
+    };
+    "co-4.6.0" = {
+      name = "co";
+      packageName = "co";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
+        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
+      };
+    };
+    "code-point-at-1.1.0" = {
+      name = "code-point-at";
+      packageName = "code-point-at";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+      };
+    };
+    "coffee-script-1.3.3" = {
+      name = "coffee-script";
+      packageName = "coffee-script";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz";
+        sha1 = "150d6b4cb522894369efed6a2101c20bc7f4a4f4";
+      };
+    };
+    "colors-0.6.2" = {
+      name = "colors";
+      packageName = "colors";
+      version = "0.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
+      };
+    };
+    "colors-1.0.3" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
+        sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
+      };
+    };
+    "combined-stream-1.0.6" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
+        sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
+      };
+    };
+    "command-line-args-3.0.5" = {
+      name = "command-line-args";
+      packageName = "command-line-args";
+      version = "3.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/command-line-args/-/command-line-args-3.0.5.tgz";
+        sha1 = "5bd4ad45e7983e5c1344918e40280ee2693c5ac0";
+      };
+    };
+    "command-line-usage-3.0.8" = {
+      name = "command-line-usage";
+      packageName = "command-line-usage";
+      version = "3.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-3.0.8.tgz";
+        sha1 = "b6a20978c1b383477f5c11a529428b880bfe0f4d";
+      };
+    };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
+    "concat-stream-1.6.2" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
+        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
+      };
+    };
+    "config-chain-1.1.11" = {
+      name = "config-chain";
+      packageName = "config-chain";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
+        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
+      };
+    };
+    "console-browserify-1.1.0" = {
+      name = "console-browserify";
+      packageName = "console-browserify";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
+        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+      };
+    };
+    "console-control-strings-1.1.0" = {
+      name = "console-control-strings";
+      packageName = "console-control-strings";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
+        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
+      };
+    };
+    "core-js-2.5.7" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "2.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz";
+        sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==";
+      };
+    };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
+    "crisper-1.2.0" = {
+      name = "crisper";
+      packageName = "crisper";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crisper/-/crisper-1.2.0.tgz";
+        sha1 = "9a91f597d71f6110294e076ad44dbb3408568e46";
+      };
+    };
+    "crisper-2.1.1" = {
+      name = "crisper";
+      packageName = "crisper";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crisper/-/crisper-2.1.1.tgz";
+        sha512 = "yxfj9nTbFunDASztAxVF8hCPwaZBvTjayNzG3YL/VVQfQaKBXX2+TM3p1xB1Pxd8RYeDQJkJIQRwM3FQSIa+pw==";
+      };
+    };
+    "cryptiles-2.0.5" = {
+      name = "cryptiles";
+      packageName = "cryptiles";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
+      };
+    };
+    "cycle-1.0.3" = {
+      name = "cycle";
+      packageName = "cycle";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
+        sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
+      };
+    };
+    "dashdash-1.14.1" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+      };
+    };
+    "date-now-0.1.4" = {
+      name = "date-now";
+      packageName = "date-now";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
+        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
+      };
+    };
+    "dateformat-1.0.2-1.2.3" = {
+      name = "dateformat";
+      packageName = "dateformat";
+      version = "1.0.2-1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
+        sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
+      };
+    };
+    "debug-0.7.4" = {
+      name = "debug";
+      packageName = "debug";
+      version = "0.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
+        sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
+      };
+    };
+    "debug-2.6.9" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
+        sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
+      };
+    };
+    "deep-extend-0.4.2" = {
+      name = "deep-extend";
+      packageName = "deep-extend";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz";
+        sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
+      };
+    };
+    "deep-is-0.1.3" = {
+      name = "deep-is";
+      packageName = "deep-is";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
+        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+      };
+    };
+    "delayed-stream-1.0.0" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    };
+    "delegate-3.2.0" = {
+      name = "delegate";
+      packageName = "delegate";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz";
+        sha512 = "IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==";
+      };
+    };
+    "delegates-1.0.0" = {
+      name = "delegates";
+      packageName = "delegates";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
+        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
+      };
+    };
+    "doctrine-0.7.2" = {
+      name = "doctrine";
+      packageName = "doctrine";
+      version = "0.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz";
+        sha1 = "7cb860359ba3be90e040b26b729ce4bfa654c523";
+      };
+    };
+    "dom-serializer-0.1.0" = {
+      name = "dom-serializer";
+      packageName = "dom-serializer";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
+        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
+      };
+    };
+    "dom5-1.1.0" = {
+      name = "dom5";
+      packageName = "dom5";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom5/-/dom5-1.1.0.tgz";
+        sha1 = "3a0c7700c083ab4c4d26938a78b0f0c6dcc37794";
+      };
+    };
+    "dom5-1.3.6" = {
+      name = "dom5";
+      packageName = "dom5";
+      version = "1.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom5/-/dom5-1.3.6.tgz";
+        sha1 = "a7088a9fc5f3b08dc9f6eda4c7abaeb241945e0d";
+      };
+    };
+    "domelementtype-1.1.3" = {
+      name = "domelementtype";
+      packageName = "domelementtype";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
+        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
+      };
+    };
+    "domelementtype-1.3.0" = {
+      name = "domelementtype";
+      packageName = "domelementtype";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
+        sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
+      };
+    };
+    "domhandler-2.3.0" = {
+      name = "domhandler";
+      packageName = "domhandler";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
+        sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
+      };
+    };
+    "domutils-1.5.1" = {
+      name = "domutils";
+      packageName = "domutils";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
+        sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
+      };
+    };
+    "ecc-jsbn-0.1.2" = {
+      name = "ecc-jsbn";
+      packageName = "ecc-jsbn";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
+        sha1 = "3a83a904e54353287874c564b7549386849a98c9";
+      };
+    };
+    "entities-1.0.0" = {
+      name = "entities";
+      packageName = "entities";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
+        sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
+      };
+    };
+    "entities-1.1.1" = {
+      name = "entities";
+      packageName = "entities";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
+        sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
+      };
+    };
+    "errno-0.1.7" = {
+      name = "errno";
+      packageName = "errno";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
+        sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
+      };
+    };
+    "es6-promise-2.3.0" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz";
+        sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc";
+      };
+    };
+    "es6-promise-4.2.4" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "4.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz";
+        sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==";
+      };
+    };
+    "escape-string-regexp-1.0.5" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+      };
+    };
+    "escodegen-1.11.0" = {
+      name = "escodegen";
+      packageName = "escodegen";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz";
+        sha512 = "IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==";
+      };
+    };
+    "espree-3.5.4" = {
+      name = "espree";
+      packageName = "espree";
+      version = "3.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz";
+        sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==";
+      };
+    };
+    "esprima-1.0.4" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
+        sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
+      };
+    };
+    "esprima-3.1.3" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+      };
+    };
+    "estraverse-3.1.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz";
+        sha1 = "15e28a446b8b82bc700ccc8b96c78af4da0d6cba";
+      };
+    };
+    "estraverse-4.2.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz";
+        sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
+      };
+    };
+    "esutils-1.1.6" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz";
+        sha1 = "c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375";
+      };
+    };
+    "esutils-2.0.2" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
+        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
+      };
+    };
+    "eventemitter2-0.4.14" = {
+      name = "eventemitter2";
+      packageName = "eventemitter2";
+      version = "0.4.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
+        sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
+      };
+    };
+    "exit-0.1.2" = {
+      name = "exit";
+      packageName = "exit";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
+        sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
+      };
+    };
+    "extend-3.0.2" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
+        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
+      };
+    };
+    "extract-zip-1.6.7" = {
+      name = "extract-zip";
+      packageName = "extract-zip";
+      version = "1.6.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz";
+        sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9";
+      };
+    };
+    "extsprintf-1.3.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+      };
+    };
+    "eyes-0.1.8" = {
+      name = "eyes";
+      packageName = "eyes";
+      version = "0.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
+      };
+    };
+    "fast-levenshtein-2.0.6" = {
+      name = "fast-levenshtein";
+      packageName = "fast-levenshtein";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+      };
+    };
+    "favico.js-0.3.10" = {
+      name = "favico.js";
+      packageName = "favico.js";
+      version = "0.3.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/favico.js/-/favico.js-0.3.10.tgz";
+        sha1 = "80586e27a117f24a8d51c18a99bdc714d4339301";
+      };
+    };
+    "faye-websocket-0.4.4" = {
+      name = "faye-websocket";
+      packageName = "faye-websocket";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz";
+        sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc";
+      };
+    };
+    "fd-slicer-1.0.1" = {
+      name = "fd-slicer";
+      packageName = "fd-slicer";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
+        sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
+      };
+    };
+    "feature-detect-es6-1.5.0" = {
+      name = "feature-detect-es6";
+      packageName = "feature-detect-es6";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/feature-detect-es6/-/feature-detect-es6-1.5.0.tgz";
+        sha512 = "DzWPIGzTnfp3/KK1d/YPfmgLqeDju9F2DQYBL35VusgSApcA7XGqVtXfR4ETOOFEzdFJ3J7zh0Gkk011TiA4uQ==";
+      };
+    };
+    "file-sync-cmp-0.1.1" = {
+      name = "file-sync-cmp";
+      packageName = "file-sync-cmp";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz";
+        sha1 = "a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b";
+      };
+    };
+    "find-replace-1.0.3" = {
+      name = "find-replace";
+      packageName = "find-replace";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz";
+        sha1 = "b88e7364d2d9c959559f388c66670d6130441fa0";
+      };
+    };
+    "findit-2.0.0" = {
+      name = "findit";
+      packageName = "findit";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz";
+        sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e";
+      };
+    };
+    "findup-sync-0.1.3" = {
+      name = "findup-sync";
+      packageName = "findup-sync";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
+        sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683";
+      };
+    };
+    "foreachasync-3.0.0" = {
+      name = "foreachasync";
+      packageName = "foreachasync";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
+        sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
+      };
+    };
+    "forever-agent-0.6.1" = {
+      name = "forever-agent";
+      packageName = "forever-agent";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+      };
+    };
+    "form-data-2.1.4" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz";
+        sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1";
+      };
+    };
+    "fs-extra-0.6.4" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "0.6.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
+        sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
+      };
+    };
+    "fs-extra-1.0.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
+        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
+      };
+    };
+    "fs.extra-1.3.2" = {
+      name = "fs.extra";
+      packageName = "fs.extra";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
+        sha1 = "dd023f93013bee24531f1b33514c37b20fd93349";
+      };
+    };
+    "fs.realpath-1.0.0" = {
+      name = "fs.realpath";
+      packageName = "fs.realpath";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+      };
+    };
+    "gauge-2.7.4" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "2.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
+        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
+      };
+    };
+    "gaze-0.5.2" = {
+      name = "gaze";
+      packageName = "gaze";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz";
+        sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f";
+      };
+    };
+    "getobject-0.1.0" = {
+      name = "getobject";
+      packageName = "getobject";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz";
+        sha1 = "047a449789fa160d018f5486ed91320b6ec7885c";
+      };
+    };
+    "getpass-0.1.7" = {
+      name = "getpass";
+      packageName = "getpass";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
+        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+      };
+    };
+    "glob-3.1.21" = {
+      name = "glob";
+      packageName = "glob";
+      version = "3.1.21";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
+        sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd";
+      };
+    };
+    "glob-3.2.11" = {
+      name = "glob";
+      packageName = "glob";
+      version = "3.2.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+        sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+      };
+    };
+    "glob-7.1.2" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
+        sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==";
+      };
+    };
+    "globule-0.1.0" = {
+      name = "globule";
+      packageName = "globule";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
+        sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
+      };
+    };
+    "good-listener-1.2.2" = {
+      name = "good-listener";
+      packageName = "good-listener";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz";
+        sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50";
+      };
+    };
+    "graceful-fs-1.2.3" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+        sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+      };
+    };
+    "graceful-fs-4.1.11" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "4.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
+        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
+      };
+    };
     "grunt-0.4.5" = {
       name = "grunt";
       packageName = "grunt";
@@ -13,6 +1211,15 @@ let
         sha1 = "56937cd5194324adff6d207631832a9d6ba4e7f0";
       };
     };
+    "grunt-contrib-concat-0.5.1" = {
+      name = "grunt-contrib-concat";
+      packageName = "grunt-contrib-concat";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-0.5.1.tgz";
+        sha1 = "953c6efdfdfd2c107ab9c85077f2d4b24d31cd49";
+      };
+    };
     "grunt-contrib-copy-1.0.0" = {
       name = "grunt-contrib-copy";
       packageName = "grunt-contrib-copy";
@@ -22,15 +1229,6 @@ let
         sha1 = "7060c6581e904b8ab0d00f076e0a8f6e3e7c3573";
       };
     };
-    "grunt-contrib-concat-0.5.1" = {
-      name = "grunt-contrib-concat";
-      packageName = "grunt-contrib-concat";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-0.5.1.tgz";
-        sha1 = "953c6efdfdfd2c107ab9c85077f2d4b24d31cd49";
-      };
-    };
     "grunt-contrib-jshint-0.12.0" = {
       name = "grunt-contrib-jshint";
       packageName = "grunt-contrib-jshint";
@@ -58,24 +1256,6 @@ let
         sha1 = "64fdcba25a635f5b4da1b6ce6f90da0aeb6e3f15";
       };
     };
-    "crisper-2.1.1" = {
-      name = "crisper";
-      packageName = "crisper";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crisper/-/crisper-2.1.1.tgz";
-        sha1 = "4cc7321c3e90f3c5cbdc3503217f118fd7d5c51c";
-      };
-    };
-    "vulcanize-1.16.0" = {
-      name = "vulcanize";
-      packageName = "vulcanize";
-      version = "1.16.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vulcanize/-/vulcanize-1.16.0.tgz";
-        sha1 = "b0ce3b0044d194ad4908ae4f1a6c6110a6e4d5e6";
-      };
-    };
     "grunt-crisper-1.0.1" = {
       name = "grunt-crisper";
       packageName = "grunt-crisper";
@@ -85,6 +1265,33 @@ let
         sha1 = "e7c091dcaff10deb0091e3035ca7e54008991fe7";
       };
     };
+    "grunt-legacy-log-0.1.3" = {
+      name = "grunt-legacy-log";
+      packageName = "grunt-legacy-log";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz";
+        sha1 = "ec29426e803021af59029f87d2f9cd7335a05531";
+      };
+    };
+    "grunt-legacy-log-utils-0.1.1" = {
+      name = "grunt-legacy-log-utils";
+      packageName = "grunt-legacy-log-utils";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz";
+        sha1 = "c0706b9dd9064e116f36f23fe4e6b048672c0f7e";
+      };
+    };
+    "grunt-legacy-util-0.2.0" = {
+      name = "grunt-legacy-util";
+      packageName = "grunt-legacy-util";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
+        sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b";
+      };
+    };
     "grunt-vulcanize-1.0.0" = {
       name = "grunt-vulcanize";
       packageName = "grunt-vulcanize";
@@ -94,437 +1301,31 @@ let
         sha1 = "f4d6cfef274f8216c06f6c290e7dbb3b9e9e3b0f";
       };
     };
-    "node2nix-1.3.0" = {
-      name = "node2nix";
-      packageName = "node2nix";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node2nix/-/node2nix-1.3.0.tgz";
-        sha1 = "e830a3bc5880dd22ae47be71a147f776542850cc";
-      };
-    };
-    "jshint-2.9.5" = {
-      name = "jshint";
-      packageName = "jshint";
-      version = "2.9.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz";
-        sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c";
-      };
-    };
-    "bower-1.8.2" = {
-      name = "bower";
-      packageName = "bower";
-      version = "1.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz";
-        sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7";
-      };
-    };
-    "jquery-1.11.3" = {
-      name = "jquery";
-      packageName = "jquery";
-      version = "1.11.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jquery/-/jquery-1.11.3.tgz";
-        sha1 = "dd8b74278b27102d29df63eae28308a8cfa1b583";
-      };
-    };
-    "favico.js-0.3.10" = {
-      name = "favico.js";
-      packageName = "favico.js";
-      version = "0.3.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/favico.js/-/favico.js-0.3.10.tgz";
-        sha1 = "80586e27a117f24a8d51c18a99bdc714d4339301";
-      };
-    };
-    "clipboard-1.7.1" = {
-      name = "clipboard";
-      packageName = "clipboard";
-      version = "1.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clipboard/-/clipboard-1.7.1.tgz";
-        sha1 = "360d6d6946e99a7a1fef395e42ba92b5e9b5a16b";
-      };
-    };
-    "moment-2.18.1" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.18.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
-        sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f";
-      };
-    };
-    "mousetrap-1.6.1" = {
-      name = "mousetrap";
-      packageName = "mousetrap";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.1.tgz";
-        sha1 = "2a085f5c751294c75e7e81f6ec2545b29cbf42d9";
-      };
-    };
-    "appenlight-client-git+https://git@github.com/AppEnlight/appenlight-client-js.git#0.5.1" = {
-      name = "appenlight-client";
-      packageName = "appenlight-client";
-      version = "0.5.1";
-      src = fetchgit {
-        url = "https://git@github.com/AppEnlight/appenlight-client-js.git";
-        rev = "14712c64c230fbbe94fcbc8094aef5eb3b90b307";
-        sha256 = "92111f1104cbf0b31303c366c0fa752cf68af7ddde40d0161edd1b5fd9dd07f7";
-      };
-    };
-    "async-0.1.22" = {
-      name = "async";
-      packageName = "async";
-      version = "0.1.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz";
-        sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
-      };
-    };
-    "coffee-script-1.3.3" = {
-      name = "coffee-script";
-      packageName = "coffee-script";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz";
-        sha1 = "150d6b4cb522894369efed6a2101c20bc7f4a4f4";
-      };
-    };
-    "colors-0.6.2" = {
-      name = "colors";
-      packageName = "colors";
-      version = "0.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
-        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
-      };
-    };
-    "dateformat-1.0.2-1.2.3" = {
-      name = "dateformat";
-      packageName = "dateformat";
-      version = "1.0.2-1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
-        sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
-      };
-    };
-    "eventemitter2-0.4.14" = {
-      name = "eventemitter2";
-      packageName = "eventemitter2";
-      version = "0.4.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
-        sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
-      };
-    };
-    "findup-sync-0.1.3" = {
-      name = "findup-sync";
-      packageName = "findup-sync";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
-        sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683";
-      };
-    };
-    "glob-3.1.21" = {
-      name = "glob";
-      packageName = "glob";
-      version = "3.1.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
-        sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd";
-      };
-    };
-    "hooker-0.2.3" = {
-      name = "hooker";
-      packageName = "hooker";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
-        sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959";
-      };
-    };
-    "iconv-lite-0.2.11" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.2.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
-        sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8";
-      };
-    };
-    "minimatch-0.2.14" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "0.2.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
-        sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
-      };
-    };
-    "nopt-1.0.10" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
-        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
-      };
-    };
-    "rimraf-2.2.8" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
-        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
-      };
-    };
-    "lodash-0.9.2" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "0.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
-        sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c";
-      };
-    };
-    "underscore.string-2.2.1" = {
-      name = "underscore.string";
-      packageName = "underscore.string";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
-        sha1 = "d7c0fa2af5d5a1a67f4253daee98132e733f0f19";
-      };
-    };
-    "which-1.0.9" = {
-      name = "which";
-      packageName = "which";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz";
-        sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
-      };
-    };
-    "js-yaml-2.0.5" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz";
-        sha1 = "a25ae6509999e97df278c6719da11bd0687743a8";
-      };
-    };
-    "exit-0.1.2" = {
-      name = "exit";
-      packageName = "exit";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
-        sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
-      };
-    };
-    "getobject-0.1.0" = {
-      name = "getobject";
-      packageName = "getobject";
+    "har-schema-1.0.5" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
+        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
+      };
+    };
+    "har-validator-4.2.1" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
+        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
+      };
+    };
+    "has-ansi-0.1.0" = {
+      name = "has-ansi";
+      packageName = "has-ansi";
       version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz";
-        sha1 = "047a449789fa160d018f5486ed91320b6ec7885c";
-      };
-    };
-    "grunt-legacy-util-0.2.0" = {
-      name = "grunt-legacy-util";
-      packageName = "grunt-legacy-util";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
-        sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b";
-      };
-    };
-    "grunt-legacy-log-0.1.3" = {
-      name = "grunt-legacy-log";
-      packageName = "grunt-legacy-log";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz";
-        sha1 = "ec29426e803021af59029f87d2f9cd7335a05531";
-      };
-    };
-    "glob-3.2.11" = {
-      name = "glob";
-      packageName = "glob";
-      version = "3.2.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
-        sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
-      };
-    };
-    "lodash-2.4.2" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "2.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
-        sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
-      };
-    };
-    "inherits-2.0.3" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
-      };
-    };
-    "minimatch-0.3.0" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
-        sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
-      };
-    };
-    "lru-cache-2.7.3" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "2.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
-        sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
-      };
-    };
-    "sigmund-1.0.1" = {
-      name = "sigmund";
-      packageName = "sigmund";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
-        sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
-      };
-    };
-    "graceful-fs-1.2.3" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
-        sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
-      };
-    };
-    "inherits-1.0.2" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz";
-        sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b";
-      };
-    };
-    "abbrev-1.1.0" = {
-      name = "abbrev";
-      packageName = "abbrev";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz";
-        sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f";
-      };
-    };
-    "argparse-0.1.16" = {
-      name = "argparse";
-      packageName = "argparse";
-      version = "0.1.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
-        sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
-      };
-    };
-    "esprima-1.0.4" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
-        sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
-      };
-    };
-    "underscore-1.7.0" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
-        sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
-      };
-    };
-    "underscore.string-2.4.0" = {
-      name = "underscore.string";
-      packageName = "underscore.string";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
-        sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
-      };
-    };
-    "grunt-legacy-log-utils-0.1.1" = {
-      name = "grunt-legacy-log-utils";
-      packageName = "grunt-legacy-log-utils";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz";
-        sha1 = "c0706b9dd9064e116f36f23fe4e6b048672c0f7e";
-      };
-    };
-    "underscore.string-2.3.3" = {
-      name = "underscore.string";
-      packageName = "underscore.string";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
-        sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
-      };
-    };
-    "chalk-1.1.3" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
-        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
-      };
-    };
-    "file-sync-cmp-0.1.1" = {
-      name = "file-sync-cmp";
-      packageName = "file-sync-cmp";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz";
-        sha1 = "a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b";
-      };
-    };
-    "ansi-styles-2.2.1" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
-        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
-      };
-    };
-    "escape-string-regexp-1.0.5" = {
-      name = "escape-string-regexp";
-      packageName = "escape-string-regexp";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz";
+        sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e";
       };
     };
     "has-ansi-2.0.0" = {
@@ -536,148 +1337,94 @@ let
         sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
       };
     };
-    "strip-ansi-3.0.1" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
-        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
-      };
-    };
-    "supports-color-2.0.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
-        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
-      };
-    };
-    "ansi-regex-2.1.1" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
-      };
-    };
-    "chalk-0.5.1" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
-        sha1 = "663b3a648b68b55d04690d49167aa837858f2174";
-      };
-    };
-    "source-map-0.3.0" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz";
-        sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9";
-      };
-    };
-    "ansi-styles-1.1.0" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz";
-        sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de";
-      };
-    };
-    "has-ansi-0.1.0" = {
-      name = "has-ansi";
-      packageName = "has-ansi";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz";
-        sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e";
-      };
-    };
-    "strip-ansi-0.3.0" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
-        sha1 = "25f48ea22ca79187f3174a4db8759347bb126220";
-      };
-    };
-    "supports-color-0.2.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz";
-        sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a";
-      };
-    };
-    "ansi-regex-0.2.1" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
-        sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9";
-      };
-    };
-    "amdefine-1.0.1" = {
-      name = "amdefine";
-      packageName = "amdefine";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
-        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
-      };
-    };
-    "async-2.5.0" = {
-      name = "async";
-      packageName = "async";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz";
-        sha1 = "843190fd6b7357a0b9e1c956edddd5ec8462b54d";
-      };
-    };
-    "less-2.7.2" = {
-      name = "less";
-      packageName = "less";
-      version = "2.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/less/-/less-2.7.2.tgz";
-        sha1 = "368d6cc73e1fb03981183280918743c5dcf9b3df";
-      };
-    };
-    "lodash-4.17.4" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.17.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
-        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
-      };
-    };
-    "errno-0.1.4" = {
-      name = "errno";
-      packageName = "errno";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz";
-        sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d";
-      };
-    };
-    "graceful-fs-4.1.11" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "4.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
-        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
+    "has-unicode-2.0.1" = {
+      name = "has-unicode";
+      packageName = "has-unicode";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
+        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
+      };
+    };
+    "hasha-2.2.0" = {
+      name = "hasha";
+      packageName = "hasha";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
+        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
+      };
+    };
+    "hawk-3.1.3" = {
+      name = "hawk";
+      packageName = "hawk";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
+      };
+    };
+    "hoek-2.16.3" = {
+      name = "hoek";
+      packageName = "hoek";
+      version = "2.16.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
+      };
+    };
+    "hooker-0.2.3" = {
+      name = "hooker";
+      packageName = "hooker";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
+        sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959";
+      };
+    };
+    "hosted-git-info-2.7.1" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz";
+        sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==";
+      };
+    };
+    "htmlparser2-3.8.3" = {
+      name = "htmlparser2";
+      packageName = "htmlparser2";
+      version = "3.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
+        sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
+      };
+    };
+    "http-signature-1.1.1" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
+      };
+    };
+    "hydrolysis-1.25.0" = {
+      name = "hydrolysis";
+      packageName = "hydrolysis";
+      version = "1.25.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.25.0.tgz";
+        sha1 = "a4fb14a37a1e03b0db52d8aaa57c682272a14d84";
+      };
+    };
+    "iconv-lite-0.2.11" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.2.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
+        sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8";
       };
     };
     "image-size-0.5.5" = {
@@ -689,166 +1436,67 @@ let
         sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c";
       };
     };
-    "mime-1.4.0" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz";
-        sha1 = "69e9e0db51d44f2a3b56e48b7817d7d137f1a343";
-      };
-    };
-    "mkdirp-0.5.1" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
-      };
-    };
-    "promise-7.3.1" = {
-      name = "promise";
-      packageName = "promise";
-      version = "7.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
-        sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf";
-      };
-    };
-    "source-map-0.5.7" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.5.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
-        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
-      };
-    };
-    "request-2.82.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.82.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.82.0.tgz";
-        sha1 = "2ba8a92cd7ac45660ea2b10a53ae67cd247516ea";
-      };
-    };
-    "prr-0.0.0" = {
-      name = "prr";
-      packageName = "prr";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
-        sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
-      };
-    };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      };
-    };
-    "asap-2.0.6" = {
-      name = "asap";
-      packageName = "asap";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
-        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
-      };
-    };
-    "aws-sign2-0.7.0" = {
-      name = "aws-sign2";
-      packageName = "aws-sign2";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
-        sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
-      };
-    };
-    "aws4-1.6.0" = {
-      name = "aws4";
-      packageName = "aws4";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
-        sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
-      };
-    };
-    "caseless-0.12.0" = {
-      name = "caseless";
-      packageName = "caseless";
-      version = "0.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
-        sha1 = "1b681c21ff84033c826543090689420d187151dc";
-      };
-    };
-    "combined-stream-1.0.5" = {
-      name = "combined-stream";
-      packageName = "combined-stream";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
-        sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
-      };
-    };
-    "extend-3.0.1" = {
-      name = "extend";
-      packageName = "extend";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz";
-        sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444";
-      };
-    };
-    "forever-agent-0.6.1" = {
-      name = "forever-agent";
-      packageName = "forever-agent";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
-        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
-      };
-    };
-    "form-data-2.3.1" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz";
-        sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf";
-      };
-    };
-    "har-validator-5.0.3" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "5.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz";
-        sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd";
-      };
-    };
-    "hawk-6.0.2" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz";
-        sha1 = "af4d914eb065f9b5ce4d9d11c1cb2126eecc3038";
-      };
-    };
-    "http-signature-1.2.0" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
-        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
+    "inflight-1.0.6" = {
+      name = "inflight";
+      packageName = "inflight";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    };
+    "inherits-1.0.2" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz";
+        sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b";
+      };
+    };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
+    "ini-1.3.5" = {
+      name = "ini";
+      packageName = "ini";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
+      };
+    };
+    "is-builtin-module-1.0.0" = {
+      name = "is-builtin-module";
+      packageName = "is-builtin-module";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
+        sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
+      };
+    };
+    "is-fullwidth-code-point-1.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+      };
+    };
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
       };
     };
     "is-typedarray-1.0.0" = {
@@ -860,6 +1508,33 @@ let
         sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
       };
     };
+    "isarray-0.0.1" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+      };
+    };
+    "isarray-1.0.0" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+      };
+    };
+    "isexe-2.0.0" = {
+      name = "isexe";
+      packageName = "isexe";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+      };
+    };
     "isstream-0.1.2" = {
       name = "isstream";
       packageName = "isstream";
@@ -869,6 +1544,60 @@ let
         sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
       };
     };
+    "jquery-1.11.3" = {
+      name = "jquery";
+      packageName = "jquery";
+      version = "1.11.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jquery/-/jquery-1.11.3.tgz";
+        sha1 = "dd8b74278b27102d29df63eae28308a8cfa1b583";
+      };
+    };
+    "js-yaml-2.0.5" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz";
+        sha1 = "a25ae6509999e97df278c6719da11bd0687743a8";
+      };
+    };
+    "jsbn-0.1.1" = {
+      name = "jsbn";
+      packageName = "jsbn";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+      };
+    };
+    "jshint-2.9.6" = {
+      name = "jshint";
+      packageName = "jshint";
+      version = "2.9.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz";
+        sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA==";
+      };
+    };
+    "json-schema-0.2.3" = {
+      name = "json-schema";
+      packageName = "json-schema";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
+        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+      };
+    };
+    "json-stable-stringify-1.0.1" = {
+      name = "json-stable-stringify";
+      packageName = "json-stable-stringify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
+        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
+      };
+    };
     "json-stringify-safe-5.0.1" = {
       name = "json-stringify-safe";
       packageName = "json-stringify-safe";
@@ -878,157 +1607,22 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.17" = {
-      name = "mime-types";
-      packageName = "mime-types";
-      version = "2.1.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz";
-        sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a";
-      };
-    };
-    "oauth-sign-0.8.2" = {
-      name = "oauth-sign";
-      packageName = "oauth-sign";
-      version = "0.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
-        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
-      };
-    };
-    "performance-now-2.1.0" = {
-      name = "performance-now";
-      packageName = "performance-now";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
-        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
-      };
-    };
-    "qs-6.5.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
-        sha1 = "349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8";
-      };
-    };
-    "safe-buffer-5.1.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha1 = "893312af69b2123def71f57889001671eeb2c853";
-      };
-    };
-    "stringstream-0.0.5" = {
-      name = "stringstream";
-      packageName = "stringstream";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
-        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
-      };
-    };
-    "tough-cookie-2.3.3" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
-        sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
-      };
-    };
-    "tunnel-agent-0.6.0" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
-        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
-      };
-    };
-    "uuid-3.1.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
-        sha1 = "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04";
-      };
-    };
-    "delayed-stream-1.0.0" = {
-      name = "delayed-stream";
-      packageName = "delayed-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
-        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
-      };
-    };
-    "asynckit-0.4.0" = {
-      name = "asynckit";
-      packageName = "asynckit";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
-        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
-      };
-    };
-    "ajv-5.2.2" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "5.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz";
-        sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39";
-      };
-    };
-    "har-schema-2.0.0" = {
-      name = "har-schema";
-      packageName = "har-schema";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
-        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
-      };
-    };
-    "co-4.6.0" = {
-      name = "co";
-      packageName = "co";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
-        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
-      };
-    };
-    "fast-deep-equal-1.0.0" = {
-      name = "fast-deep-equal";
-      packageName = "fast-deep-equal";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz";
-        sha1 = "96256a3bc975595eb36d82e9929d060d893439ff";
-      };
-    };
-    "json-schema-traverse-0.3.1" = {
-      name = "json-schema-traverse";
-      packageName = "json-schema-traverse";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
-        sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
-      };
-    };
-    "json-stable-stringify-1.0.1" = {
-      name = "json-stable-stringify";
-      packageName = "json-stable-stringify";
+    "jsonfile-1.0.1" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
-        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
+        sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
+      };
+    };
+    "jsonfile-2.4.0" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
+        sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
       };
     };
     "jsonify-0.0.0" = {
@@ -1040,60 +1634,6 @@ let
         sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
       };
     };
-    "hoek-4.2.0" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz";
-        sha1 = "72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d";
-      };
-    };
-    "boom-4.3.1" = {
-      name = "boom";
-      packageName = "boom";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz";
-        sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31";
-      };
-    };
-    "cryptiles-3.1.2" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz";
-        sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
-      };
-    };
-    "sntp-2.0.2" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz";
-        sha1 = "5064110f0af85f7cfdb7d6b67a40028ce52b4b2b";
-      };
-    };
-    "boom-5.2.0" = {
-      name = "boom";
-      packageName = "boom";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz";
-        sha1 = "5dd9da6ee3a5f302077436290cb717d3f4a54e02";
-      };
-    };
-    "assert-plus-1.0.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
-        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
-      };
-    };
     "jsprim-1.4.1" = {
       name = "jsprim";
       packageName = "jsprim";
@@ -1103,166 +1643,49 @@ let
         sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     };
-    "sshpk-1.13.1" = {
-      name = "sshpk";
-      packageName = "sshpk";
-      version = "1.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz";
-        sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3";
-      };
-    };
-    "extsprintf-1.3.0" = {
-      name = "extsprintf";
-      packageName = "extsprintf";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
-        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
-      };
-    };
-    "json-schema-0.2.3" = {
-      name = "json-schema";
-      packageName = "json-schema";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
-        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
-      };
-    };
-    "verror-1.10.0" = {
-      name = "verror";
-      packageName = "verror";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
-        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
-      };
-    };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
-      };
-    };
-    "asn1-0.2.3" = {
-      name = "asn1";
-      packageName = "asn1";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
-        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
-      };
-    };
-    "dashdash-1.14.1" = {
-      name = "dashdash";
-      packageName = "dashdash";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
-        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
-      };
-    };
-    "getpass-0.1.7" = {
-      name = "getpass";
-      packageName = "getpass";
-      version = "0.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
-        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
-      };
-    };
-    "jsbn-0.1.1" = {
-      name = "jsbn";
-      packageName = "jsbn";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
-        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
-      };
-    };
-    "tweetnacl-0.14.5" = {
-      name = "tweetnacl";
-      packageName = "tweetnacl";
-      version = "0.14.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
-        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
-      };
-    };
-    "ecc-jsbn-0.1.1" = {
-      name = "ecc-jsbn";
-      packageName = "ecc-jsbn";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
-        sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
-      };
-    };
-    "bcrypt-pbkdf-1.0.1" = {
-      name = "bcrypt-pbkdf";
-      packageName = "bcrypt-pbkdf";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
-        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
-      };
-    };
-    "mime-db-1.30.0" = {
-      name = "mime-db";
-      packageName = "mime-db";
-      version = "1.30.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz";
-        sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01";
-      };
-    };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
-      };
-    };
-    "gaze-0.5.2" = {
-      name = "gaze";
-      packageName = "gaze";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz";
-        sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f";
-      };
-    };
-    "tiny-lr-fork-0.0.5" = {
-      name = "tiny-lr-fork";
-      packageName = "tiny-lr-fork";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz";
-        sha1 = "1e99e1e2a8469b736ab97d97eefa98c71f76ed0a";
-      };
-    };
-    "async-0.2.10" = {
-      name = "async";
-      packageName = "async";
-      version = "0.2.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
-        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
-      };
-    };
-    "globule-0.1.0" = {
-      name = "globule";
-      packageName = "globule";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
-        sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
+    "kew-0.7.0" = {
+      name = "kew";
+      packageName = "kew";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
+        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
+      };
+    };
+    "klaw-1.3.1" = {
+      name = "klaw";
+      packageName = "klaw";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz";
+        sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
+      };
+    };
+    "less-2.7.3" = {
+      name = "less";
+      packageName = "less";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz";
+        sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==";
+      };
+    };
+    "levn-0.3.0" = {
+      name = "levn";
+      packageName = "levn";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
+        sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
+      };
+    };
+    "lodash-0.9.2" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "0.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
+        sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c";
       };
     };
     "lodash-1.0.2" = {
@@ -1274,40 +1697,193 @@ let
         sha1 = "8f57560c83b59fc270bd3d561b690043430e2551";
       };
     };
-    "qs-0.5.6" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.5.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
-        sha1 = "31b1ad058567651c526921506b9a8793911a0384";
-      };
-    };
-    "faye-websocket-0.4.4" = {
-      name = "faye-websocket";
-      packageName = "faye-websocket";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz";
-        sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc";
-      };
-    };
-    "noptify-0.0.3" = {
-      name = "noptify";
-      packageName = "noptify";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz";
-        sha1 = "58f654a73d9753df0c51d9686dc92104a67f4bbb";
-      };
-    };
-    "debug-0.7.4" = {
-      name = "debug";
-      packageName = "debug";
-      version = "0.7.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
-        sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
+    "lodash-2.4.2" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "2.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
+        sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
+      };
+    };
+    "lodash-4.17.10" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
+        sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==";
+      };
+    };
+    "lru-cache-2.7.3" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
+        sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
+      };
+    };
+    "mime-1.6.0" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
+        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
+      };
+    };
+    "mime-db-1.35.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.35.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz";
+        sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==";
+      };
+    };
+    "mime-types-2.1.19" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz";
+        sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==";
+      };
+    };
+    "minimatch-0.2.14" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "0.2.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
+        sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
+      };
+    };
+    "minimatch-0.3.0" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
+        sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
+      };
+    };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    };
+    "minipass-2.3.3" = {
+      name = "minipass";
+      packageName = "minipass";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz";
+        sha512 = "/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==";
+      };
+    };
+    "minizlib-1.1.0" = {
+      name = "minizlib";
+      packageName = "minizlib";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz";
+        sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==";
+      };
+    };
+    "mkdirp-0.3.5" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      };
+    };
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      };
+    };
+    "moment-2.22.2" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.22.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz";
+        sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66";
+      };
+    };
+    "mousetrap-1.6.2" = {
+      name = "mousetrap";
+      packageName = "mousetrap";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.2.tgz";
+        sha512 = "jDjhi7wlHwdO6q6DS7YRmSHcuI+RVxadBkLt3KHrhd3C2b+w5pKefg3oj5beTcHZyVFA9Aksf+yEE1y5jxUjVA==";
+      };
+    };
+    "ms-2.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+      };
+    };
+    "ncp-0.4.2" = {
+      name = "ncp";
+      packageName = "ncp";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
+        sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
+      };
+    };
+    "nijs-0.0.25" = {
+      name = "nijs";
+      packageName = "nijs";
+      version = "0.0.25";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz";
+        sha1 = "04b035cb530d46859d1018839a518c029133f676";
+      };
+    };
+    "node2nix-1.6.0" = {
+      name = "node2nix";
+      packageName = "node2nix";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node2nix/-/node2nix-1.6.0.tgz";
+        sha512 = "MJY6SsQH3pN59R9N3nMz/L8BsbQ0DlvSF38mgg1fwfwgnaJ+y600s3Nd0vZ+cnETUH+4OPETc4QohflccjPUYw==";
+      };
+    };
+    "nopt-1.0.10" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
+        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
     "nopt-2.0.0" = {
@@ -1319,204 +1895,6 @@ let
         sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d";
       };
     };
-    "command-line-args-3.0.5" = {
-      name = "command-line-args";
-      packageName = "command-line-args";
-      version = "3.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/command-line-args/-/command-line-args-3.0.5.tgz";
-        sha1 = "5bd4ad45e7983e5c1344918e40280ee2693c5ac0";
-      };
-    };
-    "command-line-usage-3.0.8" = {
-      name = "command-line-usage";
-      packageName = "command-line-usage";
-      version = "3.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-3.0.8.tgz";
-        sha1 = "b6a20978c1b383477f5c11a529428b880bfe0f4d";
-      };
-    };
-    "dom5-1.3.6" = {
-      name = "dom5";
-      packageName = "dom5";
-      version = "1.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom5/-/dom5-1.3.6.tgz";
-        sha1 = "a7088a9fc5f3b08dc9f6eda4c7abaeb241945e0d";
-      };
-    };
-    "array-back-1.0.4" = {
-      name = "array-back";
-      packageName = "array-back";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz";
-        sha1 = "644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b";
-      };
-    };
-    "feature-detect-es6-1.3.1" = {
-      name = "feature-detect-es6";
-      packageName = "feature-detect-es6";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/feature-detect-es6/-/feature-detect-es6-1.3.1.tgz";
-        sha1 = "f888736af9cb0c91f55663bfa4762eb96ee7047f";
-      };
-    };
-    "find-replace-1.0.3" = {
-      name = "find-replace";
-      packageName = "find-replace";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz";
-        sha1 = "b88e7364d2d9c959559f388c66670d6130441fa0";
-      };
-    };
-    "typical-2.6.1" = {
-      name = "typical";
-      packageName = "typical";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz";
-        sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d";
-      };
-    };
-    "test-value-2.1.0" = {
-      name = "test-value";
-      packageName = "test-value";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz";
-        sha1 = "11da6ff670f3471a73b625ca4f3fdcf7bb748291";
-      };
-    };
-    "ansi-escape-sequences-3.0.0" = {
-      name = "ansi-escape-sequences";
-      packageName = "ansi-escape-sequences";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-3.0.0.tgz";
-        sha1 = "1c18394b6af9b76ff9a63509fa497669fd2ce53e";
-      };
-    };
-    "table-layout-0.3.0" = {
-      name = "table-layout";
-      packageName = "table-layout";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/table-layout/-/table-layout-0.3.0.tgz";
-        sha1 = "6ee20dc483db371b3e5c87f704ed2f7c799d2c9a";
-      };
-    };
-    "core-js-2.5.1" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "2.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz";
-        sha1 = "ae6874dc66937789b80754ff5428df66819ca50b";
-      };
-    };
-    "deep-extend-0.4.2" = {
-      name = "deep-extend";
-      packageName = "deep-extend";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz";
-        sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
-      };
-    };
-    "wordwrapjs-2.0.0" = {
-      name = "wordwrapjs";
-      packageName = "wordwrapjs";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-2.0.0.tgz";
-        sha1 = "ab55f695e6118da93858fdd70c053d1c5e01ac20";
-      };
-    };
-    "reduce-flatten-1.0.1" = {
-      name = "reduce-flatten";
-      packageName = "reduce-flatten";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz";
-        sha1 = "258c78efd153ddf93cb561237f61184f3696e327";
-      };
-    };
-    "@types/clone-0.1.30" = {
-      name = "@types/clone";
-      packageName = "@types/clone";
-      version = "0.1.30";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz";
-        sha1 = "e7365648c1b42136a59c7d5040637b3b5c83b614";
-      };
-    };
-    "@types/node-4.2.20" = {
-      name = "@types/node";
-      packageName = "@types/node";
-      version = "4.2.20";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-4.2.20.tgz";
-        sha1 = "3f7dceff43e07cfff4407fc3495d98a533b32267";
-      };
-    };
-    "@types/parse5-0.0.31" = {
-      name = "@types/parse5";
-      packageName = "@types/parse5";
-      version = "0.0.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/parse5/-/parse5-0.0.31.tgz";
-        sha1 = "e827a493a443b156e1b582a2e4c3bdc0040f2ee7";
-      };
-    };
-    "clone-1.0.2" = {
-      name = "clone";
-      packageName = "clone";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz";
-        sha1 = "260b7a99ebb1edfe247538175f783243cb19d149";
-      };
-    };
-    "parse5-1.5.1" = {
-      name = "parse5";
-      packageName = "parse5";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz";
-        sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
-      };
-    };
-    "@types/node-6.0.88" = {
-      name = "@types/node";
-      packageName = "@types/node";
-      version = "6.0.88";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-6.0.88.tgz";
-        sha1 = "f618f11a944f6a18d92b5c472028728a3e3d4b66";
-      };
-    };
-    "es6-promise-2.3.0" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz";
-        sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc";
-      };
-    };
-    "hydrolysis-1.25.0" = {
-      name = "hydrolysis";
-      packageName = "hydrolysis";
-      version = "1.25.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.25.0.tgz";
-        sha1 = "a4fb14a37a1e03b0db52d8aaa57c682272a14d84";
-      };
-    };
     "nopt-3.0.6" = {
       name = "nopt";
       packageName = "nopt";
@@ -1526,157 +1904,103 @@ let
         sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
       };
     };
-    "path-posix-1.0.0" = {
-      name = "path-posix";
-      packageName = "path-posix";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz";
-        sha1 = "06b26113f56beab042545a23bfa88003ccac260f";
-      };
-    };
-    "acorn-3.3.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
-        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
-      };
-    };
-    "babel-polyfill-6.26.0" = {
-      name = "babel-polyfill";
-      packageName = "babel-polyfill";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz";
-        sha1 = "379937abc67d7895970adc621f284cd966cf2153";
-      };
-    };
-    "doctrine-0.7.2" = {
-      name = "doctrine";
-      packageName = "doctrine";
-      version = "0.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz";
-        sha1 = "7cb860359ba3be90e040b26b729ce4bfa654c523";
-      };
-    };
-    "dom5-1.1.0" = {
-      name = "dom5";
-      packageName = "dom5";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom5/-/dom5-1.1.0.tgz";
-        sha1 = "3a0c7700c083ab4c4d26938a78b0f0c6dcc37794";
-      };
-    };
-    "escodegen-1.9.0" = {
-      name = "escodegen";
-      packageName = "escodegen";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz";
-        sha1 = "9811a2f265dc1cd3894420ee3717064b632b8852";
-      };
-    };
-    "espree-3.5.1" = {
-      name = "espree";
-      packageName = "espree";
-      version = "3.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz";
-        sha1 = "0c988b8ab46db53100a1954ae4ba995ddd27d87e";
-      };
-    };
-    "estraverse-3.1.0" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz";
-        sha1 = "15e28a446b8b82bc700ccc8b96c78af4da0d6cba";
-      };
-    };
-    "path-is-absolute-1.0.1" = {
-      name = "path-is-absolute";
-      packageName = "path-is-absolute";
+    "noptify-0.0.3" = {
+      name = "noptify";
+      packageName = "noptify";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz";
+        sha1 = "58f654a73d9753df0c51d9686dc92104a67f4bbb";
+      };
+    };
+    "normalize-package-data-2.4.0" = {
+      name = "normalize-package-data";
+      packageName = "normalize-package-data";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
+        sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==";
+      };
+    };
+    "npm-package-arg-6.1.0" = {
+      name = "npm-package-arg";
+      packageName = "npm-package-arg";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz";
+        sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==";
+      };
+    };
+    "npm-registry-client-8.5.1" = {
+      name = "npm-registry-client";
+      packageName = "npm-registry-client";
+      version = "8.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.1.tgz";
+        sha512 = "7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg==";
+      };
+    };
+    "npmconf-2.1.3" = {
+      name = "npmconf";
+      packageName = "npmconf";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.3.tgz";
+        sha512 = "iTK+HI68GceCoGOHAQiJ/ik1iDfI7S+cgyG8A+PP18IU3X83kRhQIRhAUNj4Bp2JMx6Zrt5kCiozYa9uGWTjhA==";
+      };
+    };
+    "npmlog-4.1.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
+        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
+      };
+    };
+    "number-is-nan-1.0.1" = {
+      name = "number-is-nan";
+      packageName = "number-is-nan";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
-      };
-    };
-    "babel-runtime-6.26.0" = {
-      name = "babel-runtime";
-      packageName = "babel-runtime";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
-        sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
-      };
-    };
-    "regenerator-runtime-0.10.5" = {
-      name = "regenerator-runtime";
-      packageName = "regenerator-runtime";
-      version = "0.10.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
-        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
-      };
-    };
-    "regenerator-runtime-0.11.0" = {
-      name = "regenerator-runtime";
-      packageName = "regenerator-runtime";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz";
-        sha1 = "7e54fe5b5ccd5d6624ea6255c3473be090b802e1";
-      };
-    };
-    "esutils-1.1.6" = {
-      name = "esutils";
-      packageName = "esutils";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz";
-        sha1 = "c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375";
-      };
-    };
-    "isarray-0.0.1" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
-        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
-      };
-    };
-    "estraverse-4.2.0" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz";
-        sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
-      };
-    };
-    "esutils-2.0.2" = {
-      name = "esutils";
-      packageName = "esutils";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
-        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
-      };
-    };
-    "esprima-3.1.3" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+      };
+    };
+    "oauth-sign-0.8.2" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
+        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
+      };
+    };
+    "object-assign-4.1.1" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+      };
+    };
+    "once-1.3.3" = {
+      name = "once";
+      packageName = "once";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz";
+        sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
+      };
+    };
+    "once-1.4.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
     "optionator-0.8.2" = {
@@ -1688,96 +2012,6 @@ let
         sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
       };
     };
-    "prelude-ls-1.1.2" = {
-      name = "prelude-ls";
-      packageName = "prelude-ls";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
-        sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
-      };
-    };
-    "deep-is-0.1.3" = {
-      name = "deep-is";
-      packageName = "deep-is";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
-        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
-      };
-    };
-    "wordwrap-1.0.0" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
-        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
-      };
-    };
-    "type-check-0.3.2" = {
-      name = "type-check";
-      packageName = "type-check";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
-        sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
-      };
-    };
-    "levn-0.3.0" = {
-      name = "levn";
-      packageName = "levn";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
-        sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
-      };
-    };
-    "fast-levenshtein-2.0.6" = {
-      name = "fast-levenshtein";
-      packageName = "fast-levenshtein";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
-        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
-      };
-    };
-    "acorn-5.1.2" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "5.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz";
-        sha1 = "911cb53e036807cf0fa778dc5d370fbd864246d7";
-      };
-    };
-    "acorn-jsx-3.0.1" = {
-      name = "acorn-jsx";
-      packageName = "acorn-jsx";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
-        sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
-      };
-    };
-    "object-assign-4.1.1" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
-        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
-      };
-    };
-    "crisper-1.2.0" = {
-      name = "crisper";
-      packageName = "crisper";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crisper/-/crisper-1.2.0.tgz";
-        sha1 = "9a91f597d71f6110294e076ad44dbb3408568e46";
-      };
-    };
     "optparse-1.0.5" = {
       name = "optparse";
       packageName = "optparse";
@@ -1787,303 +2021,6 @@ let
         sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16";
       };
     };
-    "semver-5.4.1" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-        sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
-      };
-    };
-    "npm-registry-client-8.4.0" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "8.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
-        sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c";
-      };
-    };
-    "npmconf-2.1.2" = {
-      name = "npmconf";
-      packageName = "npmconf";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz";
-        sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a";
-      };
-    };
-    "tar-3.1.15" = {
-      name = "tar";
-      packageName = "tar";
-      version = "3.1.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz";
-        sha1 = "cccdc35b90917d58e4c3837795d5d022d7a1f46f";
-      };
-    };
-    "temp-0.8.3" = {
-      name = "temp";
-      packageName = "temp";
-      version = "0.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
-        sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
-      };
-    };
-    "fs.extra-1.3.2" = {
-      name = "fs.extra";
-      packageName = "fs.extra";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
-        sha1 = "dd023f93013bee24531f1b33514c37b20fd93349";
-      };
-    };
-    "findit-2.0.0" = {
-      name = "findit";
-      packageName = "findit";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz";
-        sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e";
-      };
-    };
-    "base64-js-1.2.1" = {
-      name = "base64-js";
-      packageName = "base64-js";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz";
-        sha1 = "a91947da1f4a516ea38e5b4ec0ec3773675e0886";
-      };
-    };
-    "slasp-0.0.4" = {
-      name = "slasp";
-      packageName = "slasp";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
-        sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
-      };
-    };
-    "nijs-0.0.23" = {
-      name = "nijs";
-      packageName = "nijs";
-      version = "0.0.23";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nijs/-/nijs-0.0.23.tgz";
-        sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a";
-      };
-    };
-    "concat-stream-1.6.0" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
-        sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
-      };
-    };
-    "normalize-package-data-2.4.0" = {
-      name = "normalize-package-data";
-      packageName = "normalize-package-data";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
-        sha1 = "12f95a307d58352075a04907b84ac8be98ac012f";
-      };
-    };
-    "npm-package-arg-5.1.2" = {
-      name = "npm-package-arg";
-      packageName = "npm-package-arg";
-      version = "5.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
-        sha1 = "fb18d17bb61e60900d6312619919bd753755ab37";
-      };
-    };
-    "once-1.4.0" = {
-      name = "once";
-      packageName = "once";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
-        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
-      };
-    };
-    "retry-0.10.1" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
-        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
-      };
-    };
-    "slide-1.1.6" = {
-      name = "slide";
-      packageName = "slide";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
-        sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
-      };
-    };
-    "ssri-4.1.6" = {
-      name = "ssri";
-      packageName = "ssri";
-      version = "4.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
-        sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b";
-      };
-    };
-    "npmlog-4.1.2" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "4.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
-        sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b";
-      };
-    };
-    "typedarray-0.0.6" = {
-      name = "typedarray";
-      packageName = "typedarray";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
-        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
-      };
-    };
-    "readable-stream-2.3.3" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz";
-        sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c";
-      };
-    };
-    "isarray-1.0.0" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
-        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
-      };
-    };
-    "process-nextick-args-1.0.7" = {
-      name = "process-nextick-args";
-      packageName = "process-nextick-args";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
-        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
-      };
-    };
-    "string_decoder-1.0.3" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
-        sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab";
-      };
-    };
-    "util-deprecate-1.0.2" = {
-      name = "util-deprecate";
-      packageName = "util-deprecate";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
-        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
-      };
-    };
-    "hosted-git-info-2.5.0" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
-        sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c";
-      };
-    };
-    "is-builtin-module-1.0.0" = {
-      name = "is-builtin-module";
-      packageName = "is-builtin-module";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
-        sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
-      };
-    };
-    "validate-npm-package-license-3.0.1" = {
-      name = "validate-npm-package-license";
-      packageName = "validate-npm-package-license";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz";
-        sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc";
-      };
-    };
-    "builtin-modules-1.1.1" = {
-      name = "builtin-modules";
-      packageName = "builtin-modules";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
-        sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
-      };
-    };
-    "spdx-correct-1.0.2" = {
-      name = "spdx-correct";
-      packageName = "spdx-correct";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz";
-        sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
-      };
-    };
-    "spdx-expression-parse-1.0.4" = {
-      name = "spdx-expression-parse";
-      packageName = "spdx-expression-parse";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz";
-        sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c";
-      };
-    };
-    "spdx-license-ids-1.2.2" = {
-      name = "spdx-license-ids";
-      packageName = "spdx-license-ids";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz";
-        sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57";
-      };
-    };
-    "osenv-0.1.4" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz";
-        sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644";
-      };
-    };
-    "validate-npm-package-name-3.0.0" = {
-      name = "validate-npm-package-name";
-      packageName = "validate-npm-package-name";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz";
-        sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
-      };
-    };
     "os-homedir-1.0.2" = {
       name = "os-homedir";
       packageName = "os-homedir";
@@ -2102,184 +2039,130 @@ let
         sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
       };
     };
-    "builtins-1.0.3" = {
-      name = "builtins";
-      packageName = "builtins";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz";
-        sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88";
-      };
-    };
-    "wrappy-1.0.2" = {
-      name = "wrappy";
-      packageName = "wrappy";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
-        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
-      };
-    };
-    "are-we-there-yet-1.1.4" = {
-      name = "are-we-there-yet";
-      packageName = "are-we-there-yet";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz";
-        sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d";
-      };
-    };
-    "console-control-strings-1.1.0" = {
-      name = "console-control-strings";
-      packageName = "console-control-strings";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
-        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
-      };
-    };
-    "gauge-2.7.4" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "2.7.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
-        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
-      };
-    };
-    "set-blocking-2.0.0" = {
-      name = "set-blocking";
-      packageName = "set-blocking";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
-        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
-      };
-    };
-    "delegates-1.0.0" = {
-      name = "delegates";
-      packageName = "delegates";
+    "osenv-0.1.5" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
+      };
+    };
+    "parse5-1.5.1" = {
+      name = "parse5";
+      packageName = "parse5";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz";
+        sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
+      };
+    };
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    };
+    "path-posix-1.0.0" = {
+      name = "path-posix";
+      packageName = "path-posix";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
-        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
-      };
-    };
-    "aproba-1.2.0" = {
-      name = "aproba";
-      packageName = "aproba";
+        url = "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz";
+        sha1 = "06b26113f56beab042545a23bfa88003ccac260f";
+      };
+    };
+    "pend-1.2.0" = {
+      name = "pend";
+      packageName = "pend";
       version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
-        sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a";
-      };
-    };
-    "has-unicode-2.0.1" = {
-      name = "has-unicode";
-      packageName = "has-unicode";
+        url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
+        sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
+      };
+    };
+    "performance-now-0.2.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
+        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
+      };
+    };
+    "phantom-4.0.12" = {
+      name = "phantom";
+      packageName = "phantom";
+      version = "4.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/phantom/-/phantom-4.0.12.tgz";
+        sha512 = "Tz82XhtPmwCk1FFPmecy7yRGZG2btpzY2KI9fcoPT7zT9det0CcMyfBFPp1S8DqzsnQnm8ZYEfdy528mwVtksA==";
+      };
+    };
+    "phantomjs-prebuilt-2.1.16" = {
+      name = "phantomjs-prebuilt";
+      packageName = "phantomjs-prebuilt";
+      version = "2.1.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz";
+        sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef";
+      };
+    };
+    "pinkie-2.0.4" = {
+      name = "pinkie";
+      packageName = "pinkie";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+      };
+    };
+    "pinkie-promise-2.0.1" = {
+      name = "pinkie-promise";
+      packageName = "pinkie-promise";
       version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
-        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
-      };
-    };
-    "signal-exit-3.0.2" = {
-      name = "signal-exit";
-      packageName = "signal-exit";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
-      };
-    };
-    "string-width-1.0.2" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
-        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
-      };
-    };
-    "wide-align-1.1.2" = {
-      name = "wide-align";
-      packageName = "wide-align";
+        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+      };
+    };
+    "prelude-ls-1.1.2" = {
+      name = "prelude-ls";
+      packageName = "prelude-ls";
       version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
-        sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710";
-      };
-    };
-    "code-point-at-1.1.0" = {
-      name = "code-point-at";
-      packageName = "code-point-at";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
-        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
-      };
-    };
-    "is-fullwidth-code-point-1.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
-        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
-      };
-    };
-    "number-is-nan-1.0.1" = {
-      name = "number-is-nan";
-      packageName = "number-is-nan";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "097b602b53422a522c1afb8790318336941a011d";
-      };
-    };
-    "config-chain-1.1.11" = {
-      name = "config-chain";
-      packageName = "config-chain";
-      version = "1.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
-        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
-      };
-    };
-    "ini-1.3.4" = {
-      name = "ini";
-      packageName = "ini";
-      version = "1.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
-        sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
-      };
-    };
-    "once-1.3.3" = {
-      name = "once";
-      packageName = "once";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz";
-        sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
-      };
-    };
-    "semver-4.3.6" = {
-      name = "semver";
-      packageName = "semver";
-      version = "4.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
-        sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
-      };
-    };
-    "uid-number-0.0.5" = {
-      name = "uid-number";
-      packageName = "uid-number";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
-        sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
+        url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
+        sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
+      };
+    };
+    "process-nextick-args-2.0.0" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
+        sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
+      };
+    };
+    "progress-1.1.8" = {
+      name = "progress";
+      packageName = "progress";
+      version = "1.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
+        sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
+      };
+    };
+    "promise-7.3.1" = {
+      name = "promise";
+      packageName = "promise";
+      version = "7.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
+        sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
       };
     };
     "proto-list-1.2.4" = {
@@ -2291,238 +2174,49 @@ let
         sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
       };
     };
-    "minipass-2.2.1" = {
-      name = "minipass";
-      packageName = "minipass";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz";
-        sha1 = "5ada97538b1027b4cf7213432428578cb564011f";
-      };
-    };
-    "minizlib-1.0.3" = {
-      name = "minizlib";
-      packageName = "minizlib";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz";
-        sha1 = "d5c1abf77be154619952e253336eccab9b2a32f5";
-      };
-    };
-    "yallist-3.0.2" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
-        sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
-      };
-    };
-    "fs-extra-0.6.4" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "0.6.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
-        sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
-      };
-    };
-    "mkdirp-0.3.5" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
-        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
-      };
-    };
-    "walk-2.3.9" = {
-      name = "walk";
-      packageName = "walk";
-      version = "2.3.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
-        sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b";
-      };
-    };
-    "ncp-0.4.2" = {
-      name = "ncp";
-      packageName = "ncp";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
-        sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
-      };
-    };
-    "jsonfile-1.0.1" = {
-      name = "jsonfile";
-      packageName = "jsonfile";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
-        sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
-      };
-    };
-    "foreachasync-3.0.0" = {
-      name = "foreachasync";
-      packageName = "foreachasync";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
-        sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
-      };
-    };
-    "cli-1.0.1" = {
-      name = "cli";
-      packageName = "cli";
+    "prr-1.0.1" = {
+      name = "prr";
+      packageName = "prr";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz";
-        sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
-      };
-    };
-    "console-browserify-1.1.0" = {
-      name = "console-browserify";
-      packageName = "console-browserify";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
-        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
-      };
-    };
-    "htmlparser2-3.8.3" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
-        sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
-      };
-    };
-    "minimatch-3.0.4" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
-      };
-    };
-    "shelljs-0.3.0" = {
-      name = "shelljs";
-      packageName = "shelljs";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
-        sha1 = "3596e6307a781544f591f37da618360f31db57b1";
-      };
-    };
-    "strip-json-comments-1.0.4" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
-        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
-      };
-    };
-    "lodash-3.7.0" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "3.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz";
-        sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45";
-      };
-    };
-    "glob-7.1.2" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
-        sha1 = "c19c9df9a028702d678612384a6552404c636d15";
-      };
-    };
-    "fs.realpath-1.0.0" = {
-      name = "fs.realpath";
-      packageName = "fs.realpath";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
-        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
-      };
-    };
-    "inflight-1.0.6" = {
-      name = "inflight";
-      packageName = "inflight";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
-        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
-      };
-    };
-    "brace-expansion-1.1.8" = {
-      name = "brace-expansion";
-      packageName = "brace-expansion";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
-        sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
-      };
-    };
-    "balanced-match-1.0.0" = {
-      name = "balanced-match";
-      packageName = "balanced-match";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
-        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
-      };
-    };
-    "concat-map-0.0.1" = {
-      name = "concat-map";
-      packageName = "concat-map";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
-      };
-    };
-    "date-now-0.1.4" = {
-      name = "date-now";
-      packageName = "date-now";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
-        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
-      };
-    };
-    "domhandler-2.3.0" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
-        sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
-      };
-    };
-    "domutils-1.5.1" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
-        sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
-      };
-    };
-    "domelementtype-1.3.0" = {
-      name = "domelementtype";
-      packageName = "domelementtype";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
-        sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
+        url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz";
+        sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476";
+      };
+    };
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    };
+    "qrious-4.0.2" = {
+      name = "qrious";
+      packageName = "qrious";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qrious/-/qrious-4.0.2.tgz";
+        sha512 = "xWPJIrK1zu5Ypn898fBp8RHkT/9ibquV2Kv24S/JY9VYEhMBMKur1gHVsOiNUh7PHP9uCgejjpZUHUIXXKoU/g==";
+      };
+    };
+    "qs-0.5.6" = {
+      name = "qs";
+      packageName = "qs";
+      version = "0.5.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
+        sha1 = "31b1ad058567651c526921506b9a8793911a0384";
+      };
+    };
+    "qs-6.4.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
+        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
       };
     };
     "readable-stream-1.1.14" = {
@@ -2534,58 +2228,94 @@ let
         sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
       };
     };
-    "entities-1.0.0" = {
-      name = "entities";
-      packageName = "entities";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
-        sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
-      };
-    };
-    "dom-serializer-0.1.0" = {
-      name = "dom-serializer";
-      packageName = "dom-serializer";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
-        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
-      };
-    };
-    "domelementtype-1.1.3" = {
-      name = "domelementtype";
-      packageName = "domelementtype";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
-        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
-      };
-    };
-    "entities-1.1.1" = {
-      name = "entities";
-      packageName = "entities";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
-        sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
-      };
-    };
-    "string_decoder-0.10.31" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "0.10.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
-        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
-      };
-    };
-    "good-listener-1.2.2" = {
-      name = "good-listener";
-      packageName = "good-listener";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz";
-        sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50";
+    "readable-stream-2.3.6" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+      };
+    };
+    "reduce-flatten-1.0.1" = {
+      name = "reduce-flatten";
+      packageName = "reduce-flatten";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz";
+        sha1 = "258c78efd153ddf93cb561237f61184f3696e327";
+      };
+    };
+    "regenerator-runtime-0.10.5" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.10.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
+        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
+      };
+    };
+    "regenerator-runtime-0.11.1" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";
+        sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
+      };
+    };
+    "request-2.81.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.81.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
+        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
+      };
+    };
+    "request-progress-2.0.1" = {
+      name = "request-progress";
+      packageName = "request-progress";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
+        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
+      };
+    };
+    "retry-0.10.1" = {
+      name = "retry";
+      packageName = "retry";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
+        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
+      };
+    };
+    "rimraf-2.2.8" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.2.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+      };
+    };
+    "safe-buffer-5.1.2" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+      };
+    };
+    "safer-buffer-2.1.2" = {
+      name = "safer-buffer";
+      packageName = "safer-buffer";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
     "select-1.1.2" = {
@@ -2597,88 +2327,734 @@ let
         sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d";
       };
     };
+    "semver-4.3.6" = {
+      name = "semver";
+      packageName = "semver";
+      version = "4.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
+        sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
+      };
+    };
+    "semver-5.5.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
+        sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
+      };
+    };
+    "set-blocking-2.0.0" = {
+      name = "set-blocking";
+      packageName = "set-blocking";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
+        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+      };
+    };
+    "shelljs-0.3.0" = {
+      name = "shelljs";
+      packageName = "shelljs";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
+        sha1 = "3596e6307a781544f591f37da618360f31db57b1";
+      };
+    };
+    "sigmund-1.0.1" = {
+      name = "sigmund";
+      packageName = "sigmund";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
+        sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
+      };
+    };
+    "signal-exit-3.0.2" = {
+      name = "signal-exit";
+      packageName = "signal-exit";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+      };
+    };
+    "slasp-0.0.4" = {
+      name = "slasp";
+      packageName = "slasp";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
+        sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
+      };
+    };
+    "slide-1.1.6" = {
+      name = "slide";
+      packageName = "slide";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
+        sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
+      };
+    };
+    "sntp-1.0.9" = {
+      name = "sntp";
+      packageName = "sntp";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
+      };
+    };
+    "source-map-0.3.0" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz";
+        sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9";
+      };
+    };
+    "source-map-0.5.7" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+      };
+    };
+    "source-map-0.6.1" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
+        sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
+      };
+    };
+    "spdx-correct-3.0.0" = {
+      name = "spdx-correct";
+      packageName = "spdx-correct";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz";
+        sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==";
+      };
+    };
+    "spdx-exceptions-2.1.0" = {
+      name = "spdx-exceptions";
+      packageName = "spdx-exceptions";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz";
+        sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==";
+      };
+    };
+    "spdx-expression-parse-3.0.0" = {
+      name = "spdx-expression-parse";
+      packageName = "spdx-expression-parse";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
+        sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
+      };
+    };
+    "spdx-license-ids-3.0.0" = {
+      name = "spdx-license-ids";
+      packageName = "spdx-license-ids";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz";
+        sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==";
+      };
+    };
+    "split-1.0.1" = {
+      name = "split";
+      packageName = "split";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
+        sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
+      };
+    };
+    "sshpk-1.14.2" = {
+      name = "sshpk";
+      packageName = "sshpk";
+      version = "1.14.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
+        sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
+      };
+    };
+    "ssri-5.3.0" = {
+      name = "ssri";
+      packageName = "ssri";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz";
+        sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==";
+      };
+    };
+    "stack-trace-0.0.10" = {
+      name = "stack-trace";
+      packageName = "stack-trace";
+      version = "0.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
+        sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
+      };
+    };
+    "string-width-1.0.2" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+      };
+    };
+    "string_decoder-0.10.31" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+      };
+    };
+    "string_decoder-1.1.1" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+      };
+    };
+    "stringstream-0.0.6" = {
+      name = "stringstream";
+      packageName = "stringstream";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz";
+        sha512 = "87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==";
+      };
+    };
+    "strip-ansi-0.3.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
+        sha1 = "25f48ea22ca79187f3174a4db8759347bb126220";
+      };
+    };
+    "strip-ansi-3.0.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+      };
+    };
+    "strip-json-comments-1.0.4" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
+        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
+      };
+    };
+    "supports-color-0.2.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz";
+        sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a";
+      };
+    };
+    "supports-color-2.0.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+      };
+    };
+    "table-layout-0.3.0" = {
+      name = "table-layout";
+      packageName = "table-layout";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/table-layout/-/table-layout-0.3.0.tgz";
+        sha1 = "6ee20dc483db371b3e5c87f704ed2f7c799d2c9a";
+      };
+    };
+    "tar-3.1.15" = {
+      name = "tar";
+      packageName = "tar";
+      version = "3.1.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz";
+        sha512 = "pQNFsg+Wb6VXsrIPUnuQwrHR4wD5ASBR0jRyiT4/AALFA2Nl+CjhkDX5fTmIwCuULRtyQR3Dae2BBnP2EFHscw==";
+      };
+    };
+    "temp-0.8.3" = {
+      name = "temp";
+      packageName = "temp";
+      version = "0.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
+        sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
+      };
+    };
+    "test-value-2.1.0" = {
+      name = "test-value";
+      packageName = "test-value";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz";
+        sha1 = "11da6ff670f3471a73b625ca4f3fdcf7bb748291";
+      };
+    };
+    "throttleit-1.0.0" = {
+      name = "throttleit";
+      packageName = "throttleit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
+        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
+      };
+    };
+    "through-2.3.8" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    };
     "tiny-emitter-2.0.2" = {
       name = "tiny-emitter";
       packageName = "tiny-emitter";
       version = "2.0.2";
       src = fetchurl {
         url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz";
-        sha1 = "82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c";
-      };
-    };
-    "delegate-3.1.3" = {
-      name = "delegate";
-      packageName = "delegate";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delegate/-/delegate-3.1.3.tgz";
-        sha1 = "9a8251a777d7025faa55737bc3b071742127a9fd";
+        sha512 = "2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==";
+      };
+    };
+    "tiny-lr-fork-0.0.5" = {
+      name = "tiny-lr-fork";
+      packageName = "tiny-lr-fork";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz";
+        sha1 = "1e99e1e2a8469b736ab97d97eefa98c71f76ed0a";
+      };
+    };
+    "tough-cookie-2.3.4" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
+        sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==";
+      };
+    };
+    "tunnel-agent-0.6.0" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
+      };
+    };
+    "tweetnacl-0.14.5" = {
+      name = "tweetnacl";
+      packageName = "tweetnacl";
+      version = "0.14.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+      };
+    };
+    "type-check-0.3.2" = {
+      name = "type-check";
+      packageName = "type-check";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
+        sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
+      };
+    };
+    "typedarray-0.0.6" = {
+      name = "typedarray";
+      packageName = "typedarray";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+      };
+    };
+    "typical-2.6.1" = {
+      name = "typical";
+      packageName = "typical";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz";
+        sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d";
+      };
+    };
+    "uid-number-0.0.5" = {
+      name = "uid-number";
+      packageName = "uid-number";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
+        sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
+      };
+    };
+    "underscore-1.7.0" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
+        sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
+      };
+    };
+    "underscore.string-2.2.1" = {
+      name = "underscore.string";
+      packageName = "underscore.string";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
+        sha1 = "d7c0fa2af5d5a1a67f4253daee98132e733f0f19";
+      };
+    };
+    "underscore.string-2.3.3" = {
+      name = "underscore.string";
+      packageName = "underscore.string";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
+        sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
+      };
+    };
+    "underscore.string-2.4.0" = {
+      name = "underscore.string";
+      packageName = "underscore.string";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
+        sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
+      };
+    };
+    "unicode-5.2.0-0.7.5" = {
+      name = "unicode-5.2.0";
+      packageName = "unicode-5.2.0";
+      version = "0.7.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unicode-5.2.0/-/unicode-5.2.0-0.7.5.tgz";
+        sha512 = "KVGLW1Bri30x00yv4HNM8kBxoqFXr0Sbo55735nvrlsx4PYBZol3UtoWgO492fSwmsetzPEZzy73rbU8OGXJcA==";
+      };
+    };
+    "util-deprecate-1.0.2" = {
+      name = "util-deprecate";
+      packageName = "util-deprecate";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+      };
+    };
+    "uuid-3.3.2" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
+        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+      };
+    };
+    "validate-npm-package-license-3.0.3" = {
+      name = "validate-npm-package-license";
+      packageName = "validate-npm-package-license";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz";
+        sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==";
+      };
+    };
+    "validate-npm-package-name-3.0.0" = {
+      name = "validate-npm-package-name";
+      packageName = "validate-npm-package-name";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz";
+        sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
+      };
+    };
+    "verror-1.10.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+      };
+    };
+    "vulcanize-1.16.0" = {
+      name = "vulcanize";
+      packageName = "vulcanize";
+      version = "1.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vulcanize/-/vulcanize-1.16.0.tgz";
+        sha512 = "TYlFljSc896b5+0FmMiw0JAMrHNBiHx0IAFC/dQR3Dxdb9Nx43ohm6wMWTlPXQn4sk/0WkqfgoAA6SLxyvPCLQ==";
+      };
+    };
+    "walk-2.3.14" = {
+      name = "walk";
+      packageName = "walk";
+      version = "2.3.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz";
+        sha512 = "5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==";
+      };
+    };
+    "which-1.0.9" = {
+      name = "which";
+      packageName = "which";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz";
+        sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
+      };
+    };
+    "which-1.3.1" = {
+      name = "which";
+      packageName = "which";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
+        sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
+      };
+    };
+    "wide-align-1.1.3" = {
+      name = "wide-align";
+      packageName = "wide-align";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
+        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
+      };
+    };
+    "winston-2.4.3" = {
+      name = "winston";
+      packageName = "winston";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz";
+        sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw==";
+      };
+    };
+    "wordwrap-1.0.0" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
+        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+      };
+    };
+    "wordwrapjs-2.0.0" = {
+      name = "wordwrapjs";
+      packageName = "wordwrapjs";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-2.0.0.tgz";
+        sha1 = "ab55f695e6118da93858fdd70c053d1c5e01ac20";
+      };
+    };
+    "wrappy-1.0.2" = {
+      name = "wrappy";
+      packageName = "wrappy";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+      };
+    };
+    "yallist-3.0.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
+        sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
+      };
+    };
+    "yauzl-2.4.1" = {
+      name = "yauzl";
+      packageName = "yauzl";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz";
+        sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
       };
     };
   };
   args = {
     name = "rhodecode-enterprise";
     packageName = "rhodecode-enterprise";
-    version = "0.0.1";
-    src = ./.;
+    version = "1.0.0";
+    src = ./..;
     dependencies = [
-      sources."grunt-0.4.5"
-      sources."grunt-contrib-copy-1.0.0"
-      (sources."grunt-contrib-concat-0.5.1" // {
+      sources."@types/clone-0.1.30"
+      sources."@types/node-4.2.23"
+      (sources."@types/parse5-0.0.31" // {
         dependencies = [
-          sources."chalk-0.5.1"
-          sources."ansi-styles-1.1.0"
-          sources."has-ansi-0.1.0"
-          sources."strip-ansi-0.3.0"
-          sources."supports-color-0.2.0"
-          sources."ansi-regex-0.2.1"
+          sources."@types/node-6.0.114"
+        ];
+      })
+      sources."abbrev-1.1.1"
+      sources."acorn-3.3.0"
+      sources."acorn-jsx-3.0.1"
+      sources."ajv-4.11.8"
+      sources."amdefine-1.0.1"
+      sources."ansi-escape-sequences-3.0.0"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."appenlight-client-git+https://git@github.com/AppEnlight/appenlight-client-js.git#0.5.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      (sources."argparse-0.1.16" // {
+        dependencies = [
+          sources."underscore.string-2.4.0"
         ];
       })
-      sources."grunt-contrib-jshint-0.12.0"
-      (sources."grunt-contrib-less-1.4.1" // {
+      sources."array-back-1.0.4"
+      sources."asap-2.0.6"
+      sources."asn1-0.2.3"
+      sources."assert-plus-0.2.0"
+      sources."async-0.1.22"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.7.0"
+      sources."babel-polyfill-6.26.0"
+      (sources."babel-runtime-6.26.0" // {
         dependencies = [
-          sources."async-2.5.0"
-          sources."lodash-4.17.4"
+          sources."regenerator-runtime-0.11.1"
         ];
       })
-      (sources."grunt-contrib-watch-0.6.1" // {
+      sources."balanced-match-1.0.0"
+      sources."base64-js-1.2.3"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."boom-2.10.1"
+      sources."bower-1.8.4"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-from-1.1.1"
+      sources."builtin-modules-1.1.1"
+      sources."builtins-1.0.3"
+      sources."caseless-0.12.0"
+      sources."chalk-1.1.3"
+      (sources."cli-1.0.1" // {
         dependencies = [
-          sources."lodash-2.4.2"
-          sources."async-0.2.10"
+          sources."glob-7.1.2"
+          sources."minimatch-3.0.4"
         ];
       })
+      sources."clipboard-2.0.1"
+      sources."clone-1.0.4"
+      sources."co-4.6.0"
+      sources."code-point-at-1.1.0"
+      sources."coffee-script-1.3.3"
+      sources."colors-0.6.2"
+      sources."combined-stream-1.0.6"
+      sources."command-line-args-3.0.5"
+      sources."command-line-usage-3.0.8"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."config-chain-1.1.11"
+      sources."console-browserify-1.1.0"
+      sources."console-control-strings-1.1.0"
+      sources."core-js-2.5.7"
+      sources."core-util-is-1.0.2"
       sources."crisper-2.1.1"
-      (sources."vulcanize-1.16.0" // {
+      sources."cryptiles-2.0.5"
+      sources."cycle-1.0.3"
+      (sources."dashdash-1.14.1" // {
         dependencies = [
-          sources."nopt-3.0.6"
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."grunt-crisper-1.0.1"
-      (sources."grunt-vulcanize-1.0.0" // {
+      sources."date-now-0.1.4"
+      sources."dateformat-1.0.2-1.2.3"
+      sources."debug-0.7.4"
+      sources."deep-extend-0.4.2"
+      sources."deep-is-0.1.3"
+      sources."delayed-stream-1.0.0"
+      sources."delegate-3.2.0"
+      sources."delegates-1.0.0"
+      sources."doctrine-0.7.2"
+      (sources."dom-serializer-0.1.0" // {
         dependencies = [
-          sources."crisper-1.2.0"
-          sources."nopt-3.0.6"
+          sources."domelementtype-1.1.3"
+          sources."entities-1.1.1"
         ];
       })
-      sources."node2nix-1.3.0"
-      (sources."jshint-2.9.5" // {
+      sources."dom5-1.3.6"
+      sources."domelementtype-1.3.0"
+      sources."domhandler-2.3.0"
+      sources."domutils-1.5.1"
+      sources."ecc-jsbn-0.1.2"
+      sources."entities-1.0.0"
+      sources."errno-0.1.7"
+      sources."es6-promise-2.3.0"
+      sources."escape-string-regexp-1.0.5"
+      (sources."escodegen-1.11.0" // {
         dependencies = [
-          sources."minimatch-3.0.4"
-          sources."lodash-3.7.0"
+          sources."esprima-3.1.3"
+          sources."estraverse-4.2.0"
+          sources."esutils-2.0.2"
+          sources."source-map-0.6.1"
+        ];
+      })
+      (sources."espree-3.5.4" // {
+        dependencies = [
+          sources."acorn-5.7.1"
         ];
       })
-      sources."bower-1.8.2"
-      sources."jquery-1.11.3"
+      sources."esprima-1.0.4"
+      sources."estraverse-3.1.0"
+      sources."esutils-1.1.6"
+      sources."eventemitter2-0.4.14"
+      sources."exit-0.1.2"
+      sources."extend-3.0.2"
+      (sources."extract-zip-1.6.7" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
+      sources."extsprintf-1.3.0"
+      sources."eyes-0.1.8"
+      sources."fast-levenshtein-2.0.6"
       sources."favico.js-0.3.10"
-      sources."clipboard-1.7.1"
-      sources."moment-2.18.1"
-      sources."mousetrap-1.6.1"
-      sources."appenlight-client-git+https://git@github.com/AppEnlight/appenlight-client-js.git#0.5.1"
-      sources."async-0.1.22"
-      sources."coffee-script-1.3.3"
-      sources."colors-0.6.2"
-      sources."dateformat-1.0.2-1.2.3"
-      sources."eventemitter2-0.4.14"
+      sources."faye-websocket-0.4.4"
+      sources."fd-slicer-1.0.1"
+      sources."feature-detect-es6-1.5.0"
+      sources."file-sync-cmp-0.1.1"
+      sources."find-replace-1.0.3"
+      sources."findit-2.0.0"
       (sources."findup-sync-0.1.3" // {
         dependencies = [
           sources."glob-3.2.11"
@@ -2686,333 +3062,321 @@ let
           sources."minimatch-0.3.0"
         ];
       })
+      sources."foreachasync-3.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.4"
+      (sources."fs-extra-0.6.4" // {
+        dependencies = [
+          sources."mkdirp-0.3.5"
+        ];
+      })
+      (sources."fs.extra-1.3.2" // {
+        dependencies = [
+          sources."mkdirp-0.3.5"
+        ];
+      })
+      sources."fs.realpath-1.0.0"
+      sources."gauge-2.7.4"
+      sources."gaze-0.5.2"
+      sources."getobject-0.1.0"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
       (sources."glob-3.1.21" // {
         dependencies = [
           sources."inherits-1.0.2"
         ];
       })
-      sources."hooker-0.2.3"
-      sources."iconv-lite-0.2.11"
-      sources."minimatch-0.2.14"
-      sources."nopt-1.0.10"
-      sources."rimraf-2.2.8"
-      sources."lodash-0.9.2"
-      sources."underscore.string-2.2.1"
-      sources."which-1.0.9"
-      sources."js-yaml-2.0.5"
-      sources."exit-0.1.2"
-      sources."getobject-0.1.0"
-      sources."grunt-legacy-util-0.2.0"
+      (sources."globule-0.1.0" // {
+        dependencies = [
+          sources."lodash-1.0.2"
+        ];
+      })
+      sources."good-listener-1.2.2"
+      sources."graceful-fs-1.2.3"
+      sources."grunt-0.4.5"
+      (sources."grunt-contrib-concat-0.5.1" // {
+        dependencies = [
+          sources."ansi-regex-0.2.1"
+          sources."ansi-styles-1.1.0"
+          sources."chalk-0.5.1"
+          sources."has-ansi-0.1.0"
+          sources."strip-ansi-0.3.0"
+          sources."supports-color-0.2.0"
+        ];
+      })
+      sources."grunt-contrib-copy-1.0.0"
+      sources."grunt-contrib-jshint-0.12.0"
+      (sources."grunt-contrib-less-1.4.1" // {
+        dependencies = [
+          sources."async-2.6.1"
+          sources."lodash-4.17.10"
+        ];
+      })
+      (sources."grunt-contrib-watch-0.6.1" // {
+        dependencies = [
+          sources."async-0.2.10"
+          sources."lodash-2.4.2"
+        ];
+      })
+      sources."grunt-crisper-1.0.1"
       (sources."grunt-legacy-log-0.1.3" // {
         dependencies = [
           sources."lodash-2.4.2"
           sources."underscore.string-2.3.3"
         ];
       })
-      sources."inherits-2.0.3"
-      sources."lru-cache-2.7.3"
-      sources."sigmund-1.0.1"
-      sources."graceful-fs-1.2.3"
-      sources."abbrev-1.1.0"
-      (sources."argparse-0.1.16" // {
-        dependencies = [
-          sources."underscore.string-2.4.0"
-        ];
-      })
-      sources."esprima-1.0.4"
-      sources."underscore-1.7.0"
       (sources."grunt-legacy-log-utils-0.1.1" // {
         dependencies = [
           sources."lodash-2.4.2"
           sources."underscore.string-2.3.3"
         ];
       })
-      sources."chalk-1.1.3"
-      sources."file-sync-cmp-0.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
+      sources."grunt-legacy-util-0.2.0"
+      (sources."grunt-vulcanize-1.0.0" // {
+        dependencies = [
+          sources."crisper-1.2.0"
+          sources."nopt-3.0.6"
+        ];
+      })
+      sources."har-schema-1.0.5"
+      sources."har-validator-4.2.1"
       sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
-      sources."source-map-0.3.0"
-      sources."amdefine-1.0.1"
-      (sources."less-2.7.2" // {
+      sources."has-unicode-2.0.1"
+      sources."hasha-2.2.0"
+      sources."hawk-3.1.3"
+      sources."hoek-2.16.3"
+      sources."hooker-0.2.3"
+      sources."hosted-git-info-2.7.1"
+      (sources."htmlparser2-3.8.3" // {
+        dependencies = [
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
+      sources."http-signature-1.1.1"
+      (sources."hydrolysis-1.25.0" // {
+        dependencies = [
+          sources."dom5-1.1.0"
+        ];
+      })
+      sources."iconv-lite-0.2.11"
+      sources."image-size-0.5.5"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."is-builtin-module-1.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-0.0.1"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jquery-1.11.3"
+      sources."js-yaml-2.0.5"
+      sources."jsbn-0.1.1"
+      (sources."jshint-2.9.6" // {
+        dependencies = [
+          sources."lodash-4.17.10"
+          sources."minimatch-3.0.4"
+        ];
+      })
+      sources."json-schema-0.2.3"
+      sources."json-stable-stringify-1.0.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-1.0.1"
+      sources."jsonify-0.0.0"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."kew-0.7.0"
+      (sources."klaw-1.3.1" // {
+        dependencies = [
+          sources."graceful-fs-4.1.11"
+        ];
+      })
+      (sources."less-2.7.3" // {
         dependencies = [
           sources."graceful-fs-4.1.11"
           sources."source-map-0.5.7"
         ];
       })
-      sources."errno-0.1.4"
-      sources."image-size-0.5.5"
-      sources."mime-1.4.0"
-      sources."mkdirp-0.5.1"
-      sources."promise-7.3.1"
-      sources."request-2.82.0"
-      sources."prr-0.0.0"
+      sources."levn-0.3.0"
+      sources."lodash-0.9.2"
+      sources."lru-cache-2.7.3"
+      sources."mime-1.6.0"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."minimatch-0.2.14"
       sources."minimist-0.0.8"
-      sources."asap-2.0.6"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.6.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
-      sources."har-validator-5.0.3"
-      sources."hawk-6.0.2"
-      sources."http-signature-1.2.0"
-      sources."is-typedarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.17"
-      sources."oauth-sign-0.8.2"
-      sources."performance-now-2.1.0"
-      sources."qs-6.5.1"
-      sources."safe-buffer-5.1.1"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-5.2.2"
-      sources."har-schema-2.0.0"
-      sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-1.0.1"
-      sources."jsonify-0.0.0"
-      sources."hoek-4.2.0"
-      sources."boom-4.3.1"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
-      sources."sntp-2.0.2"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
-      sources."core-util-is-1.0.2"
-      sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
-      sources."jsbn-0.1.1"
-      sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.30.0"
-      sources."punycode-1.4.1"
-      sources."gaze-0.5.2"
-      (sources."tiny-lr-fork-0.0.5" // {
-        dependencies = [
-          sources."qs-0.5.6"
-        ];
-      })
-      (sources."globule-0.1.0" // {
-        dependencies = [
-          sources."lodash-1.0.2"
-        ];
-      })
-      sources."faye-websocket-0.4.4"
+      sources."minipass-2.3.3"
+      sources."minizlib-1.1.0"
+      sources."mkdirp-0.5.1"
+      sources."moment-2.22.2"
+      sources."mousetrap-1.6.2"
+      sources."ms-2.0.0"
+      sources."ncp-0.4.2"
+      sources."nijs-0.0.25"
+      sources."node2nix-1.6.0"
+      sources."nopt-1.0.10"
       (sources."noptify-0.0.3" // {
         dependencies = [
           sources."nopt-2.0.0"
         ];
       })
-      sources."debug-0.7.4"
-      sources."command-line-args-3.0.5"
-      sources."command-line-usage-3.0.8"
-      sources."dom5-1.3.6"
-      sources."array-back-1.0.4"
-      sources."feature-detect-es6-1.3.1"
-      sources."find-replace-1.0.3"
-      sources."typical-2.6.1"
-      sources."test-value-2.1.0"
-      sources."ansi-escape-sequences-3.0.0"
-      sources."table-layout-0.3.0"
-      sources."core-js-2.5.1"
-      sources."deep-extend-0.4.2"
-      sources."wordwrapjs-2.0.0"
-      sources."reduce-flatten-1.0.1"
-      sources."@types/clone-0.1.30"
-      sources."@types/node-4.2.20"
-      (sources."@types/parse5-0.0.31" // {
-        dependencies = [
-          sources."@types/node-6.0.88"
-        ];
-      })
-      sources."clone-1.0.2"
-      sources."parse5-1.5.1"
-      sources."es6-promise-2.3.0"
-      (sources."hydrolysis-1.25.0" // {
-        dependencies = [
-          sources."dom5-1.1.0"
-        ];
-      })
-      sources."path-posix-1.0.0"
-      sources."acorn-3.3.0"
-      sources."babel-polyfill-6.26.0"
-      sources."doctrine-0.7.2"
-      (sources."escodegen-1.9.0" // {
-        dependencies = [
-          sources."estraverse-4.2.0"
-          sources."esutils-2.0.2"
-          sources."esprima-3.1.3"
-          sources."source-map-0.5.7"
-        ];
-      })
-      (sources."espree-3.5.1" // {
-        dependencies = [
-          sources."acorn-5.1.2"
-        ];
-      })
-      sources."estraverse-3.1.0"
-      sources."path-is-absolute-1.0.1"
-      (sources."babel-runtime-6.26.0" // {
-        dependencies = [
-          sources."regenerator-runtime-0.11.0"
-        ];
-      })
-      sources."regenerator-runtime-0.10.5"
-      sources."esutils-1.1.6"
-      sources."isarray-0.0.1"
-      sources."optionator-0.8.2"
-      sources."prelude-ls-1.1.2"
-      sources."deep-is-0.1.3"
-      sources."wordwrap-1.0.0"
-      sources."type-check-0.3.2"
-      sources."levn-0.3.0"
-      sources."fast-levenshtein-2.0.6"
-      sources."acorn-jsx-3.0.1"
-      sources."object-assign-4.1.1"
-      sources."optparse-1.0.5"
-      sources."semver-5.4.1"
-      (sources."npm-registry-client-8.4.0" // {
+      sources."normalize-package-data-2.4.0"
+      sources."npm-package-arg-6.1.0"
+      (sources."npm-registry-client-8.5.1" // {
         dependencies = [
           sources."graceful-fs-4.1.11"
         ];
       })
-      (sources."npmconf-2.1.2" // {
+      (sources."npmconf-2.1.3" // {
         dependencies = [
           sources."nopt-3.0.6"
           sources."once-1.3.3"
           sources."semver-4.3.6"
         ];
       })
-      sources."tar-3.1.15"
-      sources."temp-0.8.3"
-      (sources."fs.extra-1.3.2" // {
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."oauth-sign-0.8.2"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."optionator-0.8.2"
+      sources."optparse-1.0.5"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      sources."parse5-1.5.1"
+      sources."path-is-absolute-1.0.1"
+      sources."path-posix-1.0.0"
+      sources."pend-1.2.0"
+      sources."performance-now-0.2.0"
+      sources."phantom-4.0.12"
+      (sources."phantomjs-prebuilt-2.1.16" // {
         dependencies = [
-          sources."mkdirp-0.3.5"
+          sources."es6-promise-4.2.4"
+          sources."fs-extra-1.0.0"
+          sources."graceful-fs-4.1.11"
+          sources."jsonfile-2.4.0"
+          sources."which-1.3.1"
         ];
       })
-      sources."findit-2.0.0"
-      sources."base64-js-1.2.1"
-      sources."slasp-0.0.4"
-      sources."nijs-0.0.23"
-      sources."concat-stream-1.6.0"
-      sources."normalize-package-data-2.4.0"
-      sources."npm-package-arg-5.1.2"
-      sources."once-1.4.0"
-      sources."retry-0.10.1"
-      sources."slide-1.1.6"
-      sources."ssri-4.1.6"
-      sources."npmlog-4.1.2"
-      sources."typedarray-0.0.6"
-      (sources."readable-stream-2.3.3" // {
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."prelude-ls-1.1.2"
+      sources."process-nextick-args-2.0.0"
+      sources."progress-1.1.8"
+      sources."promise-7.3.1"
+      sources."proto-list-1.2.4"
+      sources."prr-1.0.1"
+      sources."punycode-1.4.1"
+      sources."qrious-4.0.2"
+      sources."qs-6.4.0"
+      (sources."readable-stream-2.3.6" // {
         dependencies = [
           sources."isarray-1.0.0"
         ];
       })
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.3"
-      sources."util-deprecate-1.0.2"
-      sources."hosted-git-info-2.5.0"
-      sources."is-builtin-module-1.0.0"
-      sources."validate-npm-package-license-3.0.1"
-      sources."builtin-modules-1.1.1"
-      sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.4"
-      sources."spdx-license-ids-1.2.2"
-      sources."osenv-0.1.4"
-      sources."validate-npm-package-name-3.0.0"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."builtins-1.0.3"
-      sources."wrappy-1.0.2"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.4"
+      sources."reduce-flatten-1.0.1"
+      sources."regenerator-runtime-0.10.5"
+      sources."request-2.81.0"
+      sources."request-progress-2.0.1"
+      sources."retry-0.10.1"
+      sources."rimraf-2.2.8"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."select-1.1.2"
+      sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."aproba-1.2.0"
-      sources."has-unicode-2.0.1"
+      sources."shelljs-0.3.0"
+      sources."sigmund-1.0.1"
       sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."wide-align-1.1.2"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."config-chain-1.1.11"
-      sources."ini-1.3.4"
-      sources."uid-number-0.0.5"
-      sources."proto-list-1.2.4"
-      sources."minipass-2.2.1"
-      sources."minizlib-1.0.3"
-      sources."yallist-3.0.2"
-      (sources."fs-extra-0.6.4" // {
+      sources."slasp-0.0.4"
+      sources."slide-1.1.6"
+      sources."sntp-1.0.9"
+      sources."source-map-0.3.0"
+      sources."spdx-correct-3.0.0"
+      sources."spdx-exceptions-2.1.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.0"
+      sources."split-1.0.1"
+      (sources."sshpk-1.14.2" // {
         dependencies = [
-          sources."mkdirp-0.3.5"
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."walk-2.3.9"
-      sources."ncp-0.4.2"
-      sources."jsonfile-1.0.1"
-      sources."foreachasync-3.0.0"
-      (sources."cli-1.0.1" // {
+      sources."ssri-5.3.0"
+      sources."stack-trace-0.0.10"
+      sources."string-width-1.0.2"
+      sources."string_decoder-1.1.1"
+      sources."stringstream-0.0.6"
+      sources."strip-ansi-3.0.1"
+      sources."strip-json-comments-1.0.4"
+      sources."supports-color-2.0.0"
+      sources."table-layout-0.3.0"
+      sources."tar-3.1.15"
+      sources."temp-0.8.3"
+      sources."test-value-2.1.0"
+      sources."throttleit-1.0.0"
+      sources."through-2.3.8"
+      sources."tiny-emitter-2.0.2"
+      (sources."tiny-lr-fork-0.0.5" // {
         dependencies = [
-          sources."glob-7.1.2"
-          sources."minimatch-3.0.4"
-        ];
-      })
-      sources."console-browserify-1.1.0"
-      (sources."htmlparser2-3.8.3" // {
-        dependencies = [
-          sources."readable-stream-1.1.14"
-          sources."string_decoder-0.10.31"
+          sources."qs-0.5.6"
         ];
       })
-      sources."shelljs-0.3.0"
-      sources."strip-json-comments-1.0.4"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."brace-expansion-1.1.8"
-      sources."balanced-match-1.0.0"
-      sources."concat-map-0.0.1"
-      sources."date-now-0.1.4"
-      sources."domhandler-2.3.0"
-      sources."domutils-1.5.1"
-      sources."domelementtype-1.3.0"
-      sources."entities-1.0.0"
-      (sources."dom-serializer-0.1.0" // {
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-check-0.3.2"
+      sources."typedarray-0.0.6"
+      sources."typical-2.6.1"
+      sources."uid-number-0.0.5"
+      sources."underscore-1.7.0"
+      sources."underscore.string-2.2.1"
+      sources."unicode-5.2.0-0.7.5"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."validate-npm-package-license-3.0.3"
+      sources."validate-npm-package-name-3.0.0"
+      (sources."verror-1.10.0" // {
         dependencies = [
-          sources."domelementtype-1.1.3"
-          sources."entities-1.1.1"
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."good-listener-1.2.2"
-      sources."select-1.1.2"
-      sources."tiny-emitter-2.0.2"
-      sources."delegate-3.1.3"
+      (sources."vulcanize-1.16.0" // {
+        dependencies = [
+          sources."nopt-3.0.6"
+        ];
+      })
+      sources."walk-2.3.14"
+      sources."which-1.0.9"
+      sources."wide-align-1.1.3"
+      (sources."winston-2.4.3" // {
+        dependencies = [
+          sources."async-1.0.0"
+          sources."colors-1.0.3"
+        ];
+      })
+      sources."wordwrap-1.0.0"
+      sources."wordwrapjs-2.0.0"
+      sources."wrappy-1.0.2"
+      sources."yallist-3.0.2"
+      sources."yauzl-2.4.1"
     ];
+    buildInputs = globalBuildInputs;
     meta = {
+      description = "RhodeCode JS packaged";
+      license = "SEE LICENSE IN LICENSE.txt";
     };
     production = false;
+    bypassCache = false;
   };
 in
 {
diff --git a/pkgs/patch-beaker-lock-func-debug.diff b/pkgs/patch_beaker/patch-beaker-lock-func-debug.diff
rename from pkgs/patch-beaker-lock-func-debug.diff
rename to pkgs/patch_beaker/patch-beaker-lock-func-debug.diff
diff --git a/pkgs/patch_beaker/patch-beaker-metadata-reuse.diff b/pkgs/patch_beaker/patch-beaker-metadata-reuse.diff
new file mode 100644
--- /dev/null
+++ b/pkgs/patch_beaker/patch-beaker-metadata-reuse.diff
@@ -0,0 +1,13 @@
+diff -rup Beaker-1.9.1-orig/beaker/ext/database.py Beaker-1.9.1/beaker/ext/database.py
+--- Beaker-1.9.1-orig/beaker/ext/database.py	2018-05-22 18:22:34.802619619 +0200
++++ Beaker-1.9.1/beaker/ext/database.py	2018-05-22 17:07:14.048335196 +0200
+@@ -91,7 +91,8 @@ class DatabaseNamespaceManager(OpenResou
+                              sa.Column('created', types.DateTime, nullable=False),
+                              sa.Column('data', types.PickleType, nullable=False),
+                              sa.UniqueConstraint('namespace'),
+-                             schema=schema_name if schema_name else meta.schema
++                             schema=schema_name if schema_name else meta.schema,
++                             extend_existing=True
+             )
+             cache.create(checkfirst=True)
+             return cache
diff --git a/pkgs/python-packages-overrides.nix b/pkgs/python-packages-overrides.nix
--- a/pkgs/python-packages-overrides.nix
+++ b/pkgs/python-packages-overrides.nix
@@ -4,10 +4,13 @@
 # python-packages.nix. The main objective is to add needed dependencies of C
 # libraries and tweak the build instructions where needed.
 
-{ pkgs, basePythonPackages }:
+{ pkgs
+, basePythonPackages
+}:
 
 let
   sed = "sed -i";
+
   localLicenses = {
     repoze = {
       fullName = "Repoze License";
@@ -19,32 +22,41 @@ in
 
 self: super: {
 
-  appenlight-client = super.appenlight-client.override (attrs: {
+  "appenlight-client" = super."appenlight-client".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   });
 
-  Beaker = super.Beaker.override (attrs: {
+  "beaker" = super."beaker".override (attrs: {
     patches = [
-      ./patch-beaker-lock-func-debug.diff
+      ./patch_beaker/patch-beaker-lock-func-debug.diff
+      ./patch_beaker/patch-beaker-metadata-reuse.diff
     ];
   });
 
-  future = super.future.override (attrs: {
+  "gevent" = super."gevent".override (attrs: {
+    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+      # NOTE: (marcink) odd requirements from gevent aren't set properly,
+      # thus we need to inject psutil manually
+      self."psutil"
+    ];
+  });
+
+  "future" = super."future".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   });
 
-  testpath = super.testpath.override (attrs: {
+  "testpath" = super."testpath".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   });
 
-  gnureadline = super.gnureadline.override (attrs: {
-    buildInputs = attrs.buildInputs ++ [
+  "gnureadline" = super."gnureadline".override (attrs: {
+    buildInputs = [
       pkgs.ncurses
     ];
     patchPhase = ''
@@ -52,56 +64,50 @@ self: super: {
     '';
   });
 
-  gunicorn = super.gunicorn.override (attrs: {
-    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+  "gunicorn" = super."gunicorn".override (attrs: {
+    propagatedBuildInputs = [
       # johbo: futures is needed as long as we are on Python 2, otherwise
       # gunicorn explodes if used with multiple threads per worker.
-      self.futures
+      self."futures"
     ];
   });
 
-  nbconvert = super.nbconvert.override (attrs: {
+ "nbconvert" = super."nbconvert".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       # marcink: plug in jupyter-client for notebook rendering
-      self.jupyter-client
+      self."jupyter-client"
     ];
   });
 
-  ipython = super.ipython.override (attrs: {
+  "ipython" = super."ipython".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
-      self.gnureadline
+      self."gnureadline"
     ];
   });
 
-  lxml = super.lxml.override (attrs: {
-    # johbo: On 16.09 we need this to compile on darwin, otherwise compilation
-    # fails on Darwin.
-    hardeningDisable = if pkgs.stdenv.isDarwin then [ "format" ] else null;
-    buildInputs = with self; [
+  "lxml" = super."lxml".override (attrs: {
+    buildInputs = [
       pkgs.libxml2
       pkgs.libxslt
     ];
+    propagatedBuildInputs = [
+      # Needed, so that "setup.py bdist_wheel" does work
+      self."wheel"
+    ];
   });
 
-  MySQL-python = super.MySQL-python.override (attrs: {
-    buildInputs = attrs.buildInputs ++ [
+  "mysql-python" = super."mysql-python".override (attrs: {
+    buildInputs = [
       pkgs.openssl
     ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+    propagatedBuildInputs = [
       pkgs.libmysql
       pkgs.zlib
     ];
   });
 
-  psutil = super.psutil.override (attrs: {
-    buildInputs = attrs.buildInputs ++
-      pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.IOKit;
-  });
-
-  psycopg2 = super.psycopg2.override (attrs: {
-    buildInputs = attrs.buildInputs ++
-      pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.openssl;
-    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+  "psycopg2" = super."psycopg2".override (attrs: {
+    propagatedBuildInputs = [
       pkgs.postgresql
     ];
     meta = {
@@ -109,8 +115,8 @@ self: super: {
     };
   });
 
-  pycurl = super.pycurl.override (attrs: {
-    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+  "pycurl" = super."pycurl".override (attrs: {
+    propagatedBuildInputs = [
       pkgs.curl
       pkgs.openssl
     ];
@@ -119,30 +125,23 @@ self: super: {
       export PYCURL_SSL_LIBRARY=openssl
     '';
     meta = {
-      # TODO: It is LGPL and MIT
       license = pkgs.lib.licenses.mit;
     };
   });
 
-  pyramid = super.pyramid.override (attrs: {
-    postFixup = ''
-      wrapPythonPrograms
-      # TODO: johbo: "wrapPython" adds this magic line which
-      # confuses pserve.
-      ${sed} '/import sys; sys.argv/d' $out/bin/.pserve-wrapped
-    '';
+  "pyramid" = super."pyramid".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  pyramid-debugtoolbar = super.pyramid-debugtoolbar.override (attrs: {
+  "pyramid-debugtoolbar" = super."pyramid-debugtoolbar".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal localLicenses.repoze ];
     };
   });
 
-  pysqlite = super.pysqlite.override (attrs: {
+  "pysqlite" = super."pysqlite".override (attrs: {
     propagatedBuildInputs = [
       pkgs.sqlite
     ];
@@ -151,41 +150,39 @@ self: super: {
     };
   });
 
-  pytest-runner = super.pytest-runner.override (attrs: {
+  "pytest-runner" = super."pytest-runner".override (attrs: {
     propagatedBuildInputs = [
-      self.setuptools-scm
+      self."setuptools-scm"
+    ];
+  });
+
+  "python-ldap" = super."python-ldap".override (attrs: {
+    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+      pkgs.openldap
+      pkgs.cyrus_sasl
+      pkgs.openssl
     ];
   });
 
-  python-ldap = super.python-ldap.override (attrs: {
-    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
-      pkgs.cyrus_sasl
-      pkgs.openldap
-      pkgs.openssl
+  "python-pam" = super."python-pam".override (attrs: {
+    propagatedBuildInputs = [
+        pkgs.pam
     ];
-    # TODO: johbo: Remove the "or" once we drop 16.03 support.
-    NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl.dev or pkgs.cyrus_sasl}/include/sasl";
+    # TODO: johbo: Check if this can be avoided, or transform into
+    # a real patch
+    patchPhase = ''
+      substituteInPlace pam.py \
+        --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so.0"'
+    '';
+    });
+
+  "pyzmq" = super."pyzmq".override (attrs: {
+    buildInputs = [
+      pkgs.czmq
+    ];
   });
 
-  python-pam = super.python-pam.override (attrs:
-    let
-      includeLibPam = pkgs.stdenv.isLinux;
-    in {
-      # TODO: johbo: Move the option up into the default.nix, we should
-      # include python-pam only on supported platforms.
-      propagatedBuildInputs = attrs.propagatedBuildInputs ++
-        pkgs.lib.optional includeLibPam [
-          pkgs.pam
-        ];
-      # TODO: johbo: Check if this can be avoided, or transform into
-      # a real patch
-      patchPhase = pkgs.lib.optionals includeLibPam ''
-        substituteInPlace pam.py \
-          --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so.0"'
-      '';
-    });
-
-  URLObject = super.URLObject.override (attrs: {
+  "urlobject" = super."urlobject".override (attrs: {
     meta = {
       license = {
         spdxId = "Unlicense";
@@ -195,56 +192,56 @@ self: super: {
     };
   });
 
-  docutils = super.docutils.override (attrs: {
+  "docutils" = super."docutils".override (attrs: {
     meta = {
       license = pkgs.lib.licenses.bsd2;
     };
   });
 
-  colander = super.colander.override (attrs: {
+  "colander" = super."colander".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  pyramid-beaker  = super.pyramid-beaker.override (attrs: {
+  "pyramid-beaker"  = super."pyramid-beaker".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  pyramid-mako = super.pyramid-mako.override (attrs: {
+  "pyramid-mako" = super."pyramid-mako".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  repoze.lru = super.repoze.lru.override (attrs: {
+  "repoze.lru" = super."repoze.lru".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  python-editor = super.python-editor.override (attrs: {
+  "python-editor" = super."python-editor".override (attrs: {
     meta = {
       license = pkgs.lib.licenses.asl20;
     };
   });
 
-  translationstring = super.translationstring.override (attrs: {
+  "translationstring" = super."translationstring".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  venusian = super.venusian.override (attrs: {
+  "venusian" = super."venusian".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
-  # Avoid that setuptools is replaced, this leads to trouble
-  # with buildPythonPackage.
-  setuptools = basePythonPackages.setuptools;
+  # Avoid that base packages screw up the build process
+  inherit (basePythonPackages)
+    setuptools;
 
 }
diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -1,2082 +1,2276 @@
-# Generated by pip2nix 0.4.0
+# Generated by pip2nix 0.8.0.dev1
 # See https://github.com/johbo/pip2nix
 
-{
-  Babel = super.buildPythonPackage {
-    name = "Babel-1.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [pytz];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/33/27/e3978243a03a76398c384c83f7ca879bc6e8f1511233a621fcada135606e/Babel-1.3.tar.gz";
-      md5 = "5264ceb02717843cbc9ffce8e6e06bdb";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  Beaker = super.buildPythonPackage {
-    name = "Beaker-1.9.1";
-    buildInputs = with self; [];
+{ pkgs, fetchurl, fetchgit, fetchhg }:
+
+self: super: {
+  "alembic" = super.buildPythonPackage {
+    name = "alembic-0.9.9";
     doCheck = false;
-    propagatedBuildInputs = with self; [funcsigs];
+    propagatedBuildInputs = [
+      self."sqlalchemy"
+      self."mako"
+      self."python-editor"
+      self."python-dateutil"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/ca/14/a626188d0d0c7b55dd7cf1902046c2743bd392a7078bb53073e13280eb1e/Beaker-1.9.1.tar.gz";
-      md5 = "46fda0a164e2b0d24ccbda51a2310301";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  CProfileV = super.buildPythonPackage {
-    name = "CProfileV-1.0.7";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [bottle];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/df/50/d8c1ada7d537c64b0f76453fa31dedb6af6e27b82fcf0331e5f71a4cf98b/CProfileV-1.0.7.tar.gz";
-      md5 = "db4c7640438aa3d8887e194c81c7a019";
+      url = "https://files.pythonhosted.org/packages/89/03/756d5b8e1c90bf283c3f435766aa3f20208d1c3887579dd8f2122e01d5f4/alembic-0.9.9.tar.gz";
+      sha256 = "0bmkq6isjbmy4p7nxfvfpknjsx7rb3xn9g00169y891hcfkkxgc5";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Chameleon = super.buildPythonPackage {
-    name = "Chameleon-2.24";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/5a/9e/637379ffa13c5172b5c0e704833ffea6bf51cec7567f93fd6e903d53ed74/Chameleon-2.24.tar.gz";
-      md5 = "1b01f1f6533a8a11d0d2f2366dec5342";
-    };
-    meta = {
-      license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
-    };
-  };
-  FormEncode = super.buildPythonPackage {
-    name = "FormEncode-1.2.4";
-    buildInputs = with self; [];
+  "amqp" = super.buildPythonPackage {
+    name = "amqp-2.3.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."vine"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/8e/59/0174271a6f004512e0201188593e6d319db139d14cb7490e488bbb078015/FormEncode-1.2.4.tar.gz";
-      md5 = "6bc17fb9aed8aea198975e888e2077f4";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.psfl ];
-    };
-  };
-  Jinja2 = super.buildPythonPackage {
-    name = "Jinja2-2.9.6";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [MarkupSafe];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
-      md5 = "6411537324b4dba0956aaa8109f3c77b";
+      url = "https://files.pythonhosted.org/packages/1b/32/242ff76cd802766f11c89c72f3389b5c8de4bdfbab406137b90c5fae8b05/amqp-2.3.1.tar.gz";
+      sha256 = "0wlfnvhmfrn7c8qif2jyvsm63ibdxp02ss564qwrvqfhz0di72s0";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  Mako = super.buildPythonPackage {
-    name = "Mako-1.0.7";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [MarkupSafe];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/eb/f3/67579bb486517c0d49547f9697e36582cd19dafb5df9e687ed8e22de57fa/Mako-1.0.7.tar.gz";
-      md5 = "5836cc997b1b773ef389bf6629c30e65";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  Markdown = super.buildPythonPackage {
-    name = "Markdown-2.6.11";
-    buildInputs = with self; [];
+  "appenlight-client" = super.buildPythonPackage {
+    name = "appenlight-client-0.6.25";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."webob"
+      self."requests"
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b3/73/fc5c850f44af5889192dff783b7b0d8f3fe8d30b65c8e3f78f8f0265fecf/Markdown-2.6.11.tar.gz";
-      md5 = "a67c1b2914f7d74eeede2ebe0fdae470";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  MarkupSafe = super.buildPythonPackage {
-    name = "MarkupSafe-1.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
-      md5 = "2fcedc9284d50e577b5192e8e3578355";
+      url = "https://files.pythonhosted.org/packages/fa/44/2911ef85ea4f4fe65058fd22959d8dad598fab6a3c84e5bcb569d15c8783/appenlight_client-0.6.25.tar.gz";
+      sha256 = "1r9l2rfg677nxhamdbyb9y4fs1zgy2dy1p19c68fnvqkxz40y627";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  MySQL-python = super.buildPythonPackage {
-    name = "MySQL-python-1.2.5";
-    buildInputs = with self; [];
+  "atomicwrites" = super.buildPythonPackage {
+    name = "atomicwrites-1.1.5";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a5/e9/51b544da85a36a68debe7a7091f068d802fc515a3a202652828c73453cad/MySQL-python-1.2.5.zip";
-      md5 = "654f75b302db6ed8dc5a898c625e030c";
+      url = "https://files.pythonhosted.org/packages/a1/e1/2d9bc76838e6e6667fde5814aa25d7feb93d6fa471bf6816daac2596e8b2/atomicwrites-1.1.5.tar.gz";
+      sha256 = "11bm90fwm2avvf4f3ib8g925w7jr4m11vcsinn1bi6ns4bm32214";
     };
     meta = {
-      license = [ pkgs.lib.licenses.gpl1 ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Paste = super.buildPythonPackage {
-    name = "Paste-2.0.3";
-    buildInputs = with self; [];
+  "attrs" = super.buildPythonPackage {
+    name = "attrs-18.1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/30/c3/5c2f7c7a02e4f58d4454353fa1c32c94f79fa4e36d07a67c0ac295ea369e/Paste-2.0.3.tar.gz";
-      md5 = "1231e14eae62fa7ed76e9130b04bc61e";
+      url = "https://files.pythonhosted.org/packages/e4/ac/a04671e118b57bee87dabca1e0f2d3bda816b7a551036012d0ca24190e71/attrs-18.1.0.tar.gz";
+      sha256 = "0yzqz8wv3w1srav5683a55v49i0szkm47dyrnkd56fqs8j8ypl70";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  PasteDeploy = super.buildPythonPackage {
-    name = "PasteDeploy-1.5.2";
-    buildInputs = with self; [];
+  "authomatic" = super.buildPythonPackage {
+    name = "authomatic-0.1.0.post1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/0f/90/8e20cdae206c543ea10793cbf4136eb9a8b3f417e04e40a29d72d9922cbd/PasteDeploy-1.5.2.tar.gz";
-      md5 = "352b7205c78c8de4987578d19431af3b";
+      url = "https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801";
+      sha256 = "1cgk0a86sbsjbri06gf5z5l4npwkjdxw6fdnwl4vvfmxs2sx9yxw";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  PasteScript = super.buildPythonPackage {
-    name = "PasteScript-2.0.2";
-    buildInputs = with self; [];
+  "babel" = super.buildPythonPackage {
+    name = "babel-1.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [Paste PasteDeploy six];
+    propagatedBuildInputs = [
+      self."pytz"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e5/f0/78e766c3dcc61a4f3a6f71dd8c95168ae9c7a31722b5663d19c1fdf62cb6/PasteScript-2.0.2.tar.gz";
-      md5 = "ccb3045445097192ca71a13b746c77b2";
+      url = "https://files.pythonhosted.org/packages/33/27/e3978243a03a76398c384c83f7ca879bc6e8f1511233a621fcada135606e/Babel-1.3.tar.gz";
+      sha256 = "0bnin777lc53nxd1hp3apq410jj5wx92n08h7h4izpl4f4sx00lz";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "backports.shutil-get-terminal-size" = super.buildPythonPackage {
+    name = "backports.shutil-get-terminal-size-1.0.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b/backports.shutil_get_terminal_size-1.0.0.tar.gz";
+      sha256 = "107cmn7g3jnbkp826zlj8rrj19fam301qvaqf0f3905f5217lgki";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Pygments = super.buildPythonPackage {
-    name = "Pygments-2.2.0";
-    buildInputs = with self; [];
+  "beaker" = super.buildPythonPackage {
+    name = "beaker-1.9.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."funcsigs"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
-      md5 = "13037baca42f16917cbd5ad2fab50844";
+      url = "https://files.pythonhosted.org/packages/ca/14/a626188d0d0c7b55dd7cf1902046c2743bd392a7078bb53073e13280eb1e/Beaker-1.9.1.tar.gz";
+      sha256 = "08arsn61r255lhz6hcpn2lsiqpg30clla805ysx06wmbhvb6w9rj";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  Routes = super.buildPythonPackage {
-    name = "Routes-2.4.1";
-    buildInputs = with self; [];
+  "beautifulsoup4" = super.buildPythonPackage {
+    name = "beautifulsoup4-4.6.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [six repoze.lru];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/33/38/ea827837e68d9c7dde4cff7ec122a93c319f0effc08ce92a17095576603f/Routes-2.4.1.tar.gz";
-      md5 = "c058dff6832941dec47e0d0052548ad8";
+      url = "https://files.pythonhosted.org/packages/88/df/86bffad6309f74f3ff85ea69344a078fc30003270c8df6894fca7a3c72ff/beautifulsoup4-4.6.3.tar.gz";
+      sha256 = "041dhalzjciw6qyzzq7a2k4h1yvyk76xigp35hv5ibnn448ydy4h";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  SQLAlchemy = super.buildPythonPackage {
-    name = "SQLAlchemy-1.1.15";
-    buildInputs = with self; [];
+  "billiard" = super.buildPythonPackage {
+    name = "billiard-3.5.0.3";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/39/ac/f5571210cca2e4f4532e38aaff242f26c8654c5e2436bee966c230647ccc/billiard-3.5.0.3.tar.gz";
+      sha256 = "1riwiiwgb141151md4ykx49qrz749akj5k8g290ji9bsqjyj4yqx";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "bleach" = super.buildPythonPackage {
+    name = "bleach-2.1.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+      self."html5lib"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c2/f6/11fcc1ce19a7cb81b1c9377f4e27ce3813265611922e355905e57c44d164/SQLAlchemy-1.1.15.tar.gz";
-      md5 = "077f9bd3339957f53068b5572a152674";
+      url = "https://files.pythonhosted.org/packages/7a/b7/fa555afb61462b030abaf9ed1479b8ea031510f58c7706b06113be9f82ea/bleach-2.1.4.tar.gz";
+      sha256 = "1n337zbdml6z6zia0b1qgv6xiddx3qlwmcg9vk2mk60jcxhmzs8f";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "bottle" = super.buildPythonPackage {
+    name = "bottle-0.12.13";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c/bottle-0.12.13.tar.gz";
+      sha256 = "0m9k2a7yxvggc4kw8fsvj381vgsvfcdshg5nzy6vwrxiw2p53drr";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Tempita = super.buildPythonPackage {
-    name = "Tempita-0.5.2";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/56/c8/8ed6eee83dbddf7b0fc64dd5d4454bc05e6ccaafff47991f73f2894d9ff4/Tempita-0.5.2.tar.gz";
-      md5 = "4c2f17bb9d481821c41b6fbee904cea1";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  URLObject = super.buildPythonPackage {
-    name = "URLObject-2.4.0";
-    buildInputs = with self; [];
+  "bumpversion" = super.buildPythonPackage {
+    name = "bumpversion-0.5.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/cb/b6/e25e58500f9caef85d664bec71ec67c116897bfebf8622c32cb75d1ca199/URLObject-2.4.0.tar.gz";
-      md5 = "2ed819738a9f0a3051f31dc9924e3065";
-    };
-    meta = {
-      license = [  ];
-    };
-  };
-  WebError = super.buildPythonPackage {
-    name = "WebError-0.10.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [WebOb Tempita Pygments Paste];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/35/76/e7e5c2ce7e9c7f31b54c1ff295a495886d1279a002557d74dd8957346a79/WebError-0.10.3.tar.gz";
-      md5 = "84b9990b0baae6fd440b1e60cdd06f9a";
+      url = "https://files.pythonhosted.org/packages/14/41/8c9da3549f8e00c84f0432c3a8cf8ed6898374714676aab91501d48760db/bumpversion-0.5.3.tar.gz";
+      sha256 = "0zn7694yfipxg35ikkfh7kvgl2fissha3dnqad2c5bvsvmrwhi37";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  WebHelpers = super.buildPythonPackage {
-    name = "WebHelpers-1.3";
-    buildInputs = with self; [];
+  "celery" = super.buildPythonPackage {
+    name = "celery-4.1.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."pytz"
+      self."billiard"
+      self."kombu"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/e9/cf/a4c0597effca20c57eb586324e41d1180bc8f13a933da41e0646cff69f02/celery-4.1.1.tar.gz";
+      sha256 = "1xbir4vw42n2ir9lanhwl7w69zpmj7lbi66fxm2b7pyvkcss7wni";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "chameleon" = super.buildPythonPackage {
+    name = "chameleon-2.24";
     doCheck = false;
-    propagatedBuildInputs = with self; [MarkupSafe];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/ee/68/4d07672821d514184357f1552f2dad923324f597e722de3b016ca4f7844f/WebHelpers-1.3.tar.gz";
-      md5 = "32749ffadfc40fea51075a7def32588b";
+      url = "https://files.pythonhosted.org/packages/5a/9e/637379ffa13c5172b5c0e704833ffea6bf51cec7567f93fd6e903d53ed74/Chameleon-2.24.tar.gz";
+      sha256 = "0ykqr7syxfa6h9adjfnsv1gdsca2xzm22vmic8859n0f0j09abj5";
+    };
+    meta = {
+      license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
+    };
+  };
+  "channelstream" = super.buildPythonPackage {
+    name = "channelstream-0.5.2";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."gevent"
+      self."ws4py"
+      self."pyramid"
+      self."pyramid-jinja2"
+      self."itsdangerous"
+      self."requests"
+      self."six"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/2b/31/29a8e085cf5bf97fa88e7b947adabfc581a18a3463adf77fb6dada34a65f/channelstream-0.5.2.tar.gz";
+      sha256 = "1qbm4xdl5hfkja683x546bncg3rqq8qv79w1m1a1wd48cqqzb6rm";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  WebHelpers2 = super.buildPythonPackage {
-    name = "WebHelpers2-2.0";
-    buildInputs = with self; [];
+  "click" = super.buildPythonPackage {
+    name = "click-6.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [MarkupSafe six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/ff/30/56342c6ea522439e3662427c8d7b5e5b390dff4ff2dc92d8afcb8ab68b75/WebHelpers2-2.0.tar.gz";
-      md5 = "0f6b68d70c12ee0aed48c00b24da13d3";
+      url = "https://files.pythonhosted.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
+      sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  WebOb = super.buildPythonPackage {
-    name = "WebOb-1.7.4";
-    buildInputs = with self; [];
+  "colander" = super.buildPythonPackage {
+    name = "colander-1.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."translationstring"
+      self."iso8601"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/75/34/731e23f52371852dfe7490a61644826ba7fe70fd52a377aaca0f4956ba7f/WebOb-1.7.4.tar.gz";
-      md5 = "397e46892d7f199b1a07eb20a2d3d9bd";
+      url = "https://files.pythonhosted.org/packages/cc/e2/c4e716ac4a426d8ad4dfe306c34f0018a22275d2420815784005bf771c84/colander-1.4.tar.gz";
+      sha256 = "0wjfphyr5aakv5hw73q287lbc15cbm0aardajv7i2mqf377rl3p2";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  WebTest = super.buildPythonPackage {
-    name = "WebTest-2.0.29";
-    buildInputs = with self; [];
+  "configobj" = super.buildPythonPackage {
+    name = "configobj-5.0.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [six WebOb waitress beautifulsoup4];
+    propagatedBuildInputs = [
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/94/de/8f94738be649997da99c47b104aa3c3984ecec51a1d8153ed09638253d56/WebTest-2.0.29.tar.gz";
-      md5 = "30b4cf0d340b9a5335fac4389e6f84fc";
+      url = "https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c";
+      sha256 = "1hhcxirwvg58grlfr177b3awhbq8hlx1l3lh69ifl1ki7lfd1s1x";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "configparser" = super.buildPythonPackage {
+    name = "configparser-3.5.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/7c/69/c2ce7e91c89dc073eb1aa74c0621c3eefbffe8216b3f9af9d3885265c01c/configparser-3.5.0.tar.gz";
+      sha256 = "0fi7vf09vi1588jd8f16a021m5y6ih2hy7rpbjb408xw45qb822k";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Whoosh = super.buildPythonPackage {
-    name = "Whoosh-2.7.4";
-    buildInputs = with self; [];
+  "cov-core" = super.buildPythonPackage {
+    name = "cov-core-1.15.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."coverage"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/25/2b/6beed2107b148edc1321da0d489afc4617b9ed317ef7b72d4993cad9b684/Whoosh-2.7.4.tar.gz";
-      md5 = "c2710105f20b3e29936bd2357383c325";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.bsd2 ];
-    };
-  };
-  alembic = super.buildPythonPackage {
-    name = "alembic-0.9.8";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [SQLAlchemy Mako python-editor python-dateutil];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/a1/95/2252783859df9ec76b9a25d968c2827ed75a43ba34c6e8d38f87a5c0fb26/alembic-0.9.8.tar.gz";
-      md5 = "5cfef58641c9a94d4a5d547e951a7dda";
+      url = "https://files.pythonhosted.org/packages/4b/87/13e75a47b4ba1be06f29f6d807ca99638bedc6b57fa491cd3de891ca2923/cov-core-1.15.0.tar.gz";
+      sha256 = "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  amqp = super.buildPythonPackage {
-    name = "amqp-2.2.2";
-    buildInputs = with self; [];
+  "coverage" = super.buildPythonPackage {
+    name = "coverage-3.7.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [vine];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e0/70/9ab9ccd8247fb7d2adb717e9f6a0ed358c9e1ab2c349048b0352f9e80ee2/amqp-2.2.2.tar.gz";
-      md5 = "0971a3fd2d635ded45c349cfc17106bd";
+      url = "https://files.pythonhosted.org/packages/09/4f/89b06c7fdc09687bca507dc411c342556ef9c5a3b26756137a4878ff19bf/coverage-3.7.1.tar.gz";
+      sha256 = "0knlbq79g2ww6xzsyknj9rirrgrgc983dpa2d9nkdf31mb2a3bni";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  appenlight-client = super.buildPythonPackage {
-    name = "appenlight-client-0.6.25";
-    buildInputs = with self; [];
+  "cprofilev" = super.buildPythonPackage {
+    name = "cprofilev-1.0.7";
     doCheck = false;
-    propagatedBuildInputs = with self; [WebOb requests six];
+    propagatedBuildInputs = [
+      self."bottle"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/fa/44/2911ef85ea4f4fe65058fd22959d8dad598fab6a3c84e5bcb569d15c8783/appenlight_client-0.6.25.tar.gz";
-      md5 = "76dd2f9d42659fae8f290982078dc880";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  authomatic = super.buildPythonPackage {
-    name = "authomatic-0.1.0.post1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801";
-      md5 = "3c68720a1322b25254009518d1ff6801";
+      url = "https://files.pythonhosted.org/packages/df/50/d8c1ada7d537c64b0f76453fa31dedb6af6e27b82fcf0331e5f71a4cf98b/CProfileV-1.0.7.tar.gz";
+      sha256 = "0xwszfhxgndpcjkpq89dix6vi02hj1gzvhr7r716hd1x3y5p94c7";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  backports.shutil-get-terminal-size = super.buildPythonPackage {
-    name = "backports.shutil-get-terminal-size-1.0.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b/backports.shutil_get_terminal_size-1.0.0.tar.gz";
-      md5 = "03267762480bd86b50580dc19dff3c66";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  beautifulsoup4 = super.buildPythonPackage {
-    name = "beautifulsoup4-4.6.0";
-    buildInputs = with self; [];
+  "cssselect" = super.buildPythonPackage {
+    name = "cssselect-1.0.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/fa/8d/1d14391fdaed5abada4e0f63543fef49b8331a34ca60c88bd521bcf7f782/beautifulsoup4-4.6.0.tar.gz";
-      md5 = "c17714d0f91a23b708a592cb3c697728";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  billiard = super.buildPythonPackage {
-    name = "billiard-3.5.0.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/39/ac/f5571210cca2e4f4532e38aaff242f26c8654c5e2436bee966c230647ccc/billiard-3.5.0.3.tar.gz";
-      md5 = "113ba481e48400adbf6fbbf59a2f8554";
+      url = "https://files.pythonhosted.org/packages/52/ea/f31e1d2e9eb130fda2a631e22eac369dc644e8807345fbed5113f2d6f92b/cssselect-1.0.3.tar.gz";
+      sha256 = "011jqa2jhmydhi0iz4v1w3cr540z5zas8g2bw8brdw4s4b2qnv86";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  bleach = super.buildPythonPackage {
-    name = "bleach-2.1.2";
-    buildInputs = with self; [];
+  "decorator" = super.buildPythonPackage {
+    name = "decorator-4.1.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [six html5lib];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b3/5f/0da670d30d3ffbc57cc97fa82947f81bbe3eab8d441e2d42e661f215baf2/bleach-2.1.2.tar.gz";
-      md5 = "d0b14ae43a437ee0c650e04c6063eedd";
+      url = "https://files.pythonhosted.org/packages/bb/e0/f6e41e9091e130bf16d4437dabbac3993908e4d6485ecbc985ef1352db94/decorator-4.1.2.tar.gz";
+      sha256 = "1d8npb11kxyi36mrvjdpcjij76l5zfyrz2f820brf0l0rcw4vdkw";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "new BSD License"; } ];
+    };
+  };
+  "deform" = super.buildPythonPackage {
+    name = "deform-2.0.5";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."chameleon"
+      self."colander"
+      self."iso8601"
+      self."peppercorn"
+      self."translationstring"
+      self."zope.deprecation"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/0c/b1/ba711d5808c12538c8504f534d79c124ed834f19ac36f0ac5391c3bbd1c1/deform-2.0.5.tar.gz";
+      sha256 = "0ybg9zsnfac1kaxrjanmkjk0xaklf4d3piywxwr08l1cl1336kc7";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
+  };
+  "docutils" = super.buildPythonPackage {
+    name = "docutils-0.14";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
+      sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.publicDomain pkgs.lib.licenses.gpl1 { fullName = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)"; } pkgs.lib.licenses.psfl ];
     };
   };
-  bottle = super.buildPythonPackage {
-    name = "bottle-0.12.13";
-    buildInputs = with self; [];
+  "dogpile.cache" = super.buildPythonPackage {
+    name = "dogpile.cache-0.6.6";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/48/ca/604154d835c3668efb8a31bd979b0ea4bf39c2934a40ffecc0662296cb51/dogpile.cache-0.6.6.tar.gz";
+      sha256 = "1h8n1lxd4l2qvahfkiinljkqz7pww7w3sgag0j8j9ixbl2h4wk84";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "dogpile.core" = super.buildPythonPackage {
+    name = "dogpile.core-0.4.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c/bottle-0.12.13.tar.gz";
-      md5 = "d2fe1b48c1d49217e78bf326b1cad437";
+      url = "https://files.pythonhosted.org/packages/0e/77/e72abc04c22aedf874301861e5c1e761231c288b5de369c18be8f4b5c9bb/dogpile.core-0.4.1.tar.gz";
+      sha256 = "0xpdvg4kr1isfkrh1rfsh7za4q5a5s6l2kf9wpvndbwf3aqjyrdy";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "ecdsa" = super.buildPythonPackage {
+    name = "ecdsa-0.13";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/f9/e5/99ebb176e47f150ac115ffeda5fedb6a3dbb3c00c74a59fd84ddf12f5857/ecdsa-0.13.tar.gz";
+      sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  bumpversion = super.buildPythonPackage {
-    name = "bumpversion-0.5.3";
-    buildInputs = with self; [];
+  "elasticsearch" = super.buildPythonPackage {
+    name = "elasticsearch-2.3.0";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."urllib3"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/10/35/5fd52c5f0b0ee405ed4b5195e8bce44c5e041787680dc7b94b8071cac600/elasticsearch-2.3.0.tar.gz";
+      sha256 = "10ad2dk73xsys9vajwsncibs69asa63w1hgwz6lz1prjpyi80c5y";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "elasticsearch-dsl" = super.buildPythonPackage {
+    name = "elasticsearch-dsl-2.2.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+      self."python-dateutil"
+      self."elasticsearch"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/14/41/8c9da3549f8e00c84f0432c3a8cf8ed6898374714676aab91501d48760db/bumpversion-0.5.3.tar.gz";
-      md5 = "c66a3492eafcf5ad4b024be9fca29820";
+      url = "https://files.pythonhosted.org/packages/66/2f/52a086968788e58461641570f45c3207a52d46ebbe9b77dc22b6a8ffda66/elasticsearch-dsl-2.2.0.tar.gz";
+      sha256 = "1g4kxzxsdwlsl2a9kscmx11pafgimhj7y8wrfksv8pgvpkfb9fwr";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "entrypoints" = super.buildPythonPackage {
+    name = "entrypoints-0.2.2";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."configparser"
+    ];
+    src = fetchurl {
+      url = "https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313";
+      sha256 = "0bihrdp8ahsys437kxdhk52gz6kib8rxjv71i93wkw7594fcaxll";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  celery = super.buildPythonPackage {
-    name = "celery-4.1.0";
-    buildInputs = with self; [];
+  "enum34" = super.buildPythonPackage {
+    name = "enum34-1.1.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [pytz billiard kombu];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/07/65/88a2a45fc80f487872c93121a701a53bbbc3d3d832016876fac84fc8d46a/celery-4.1.0.tar.gz";
-      md5 = "db91e1d26936381127f01e150fe3054a";
+      url = "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz";
+      sha256 = "1cgm5ng2gcfrkrm3hc22brl6chdmv67b9zvva9sfs7gn7dwc9n4a";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  channelstream = super.buildPythonPackage {
-    name = "channelstream-0.5.2";
-    buildInputs = with self; [];
+  "formencode" = super.buildPythonPackage {
+    name = "formencode-1.2.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [gevent ws4py pyramid pyramid-jinja2 itsdangerous requests six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/2b/31/29a8e085cf5bf97fa88e7b947adabfc581a18a3463adf77fb6dada34a65f/channelstream-0.5.2.tar.gz";
-      md5 = "1c5eb2a8a405be6f1073da94da6d81d3";
+      url = "https://files.pythonhosted.org/packages/8e/59/0174271a6f004512e0201188593e6d319db139d14cb7490e488bbb078015/FormEncode-1.2.4.tar.gz";
+      sha256 = "1fgy04sdy4yry5xcjls3x3xy30dqwj58ycnkndim819jx0788w42";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.psfl ];
     };
   };
-  click = super.buildPythonPackage {
-    name = "click-6.6";
-    buildInputs = with self; [];
+  "funcsigs" = super.buildPythonPackage {
+    name = "funcsigs-1.0.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
-      md5 = "d0b09582123605220ad6977175f3e51d";
+      url = "https://files.pythonhosted.org/packages/94/4a/db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/funcsigs-1.0.2.tar.gz";
+      sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ { fullName = "ASL"; } pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "functools32" = super.buildPythonPackage {
+    name = "functools32-3.2.3.post2";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz";
+      sha256 = "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.psfl ];
     };
   };
-  colander = super.buildPythonPackage {
-    name = "colander-1.4";
-    buildInputs = with self; [];
+  "future" = super.buildPythonPackage {
+    name = "future-0.14.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [translationstring iso8601];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/cc/e2/c4e716ac4a426d8ad4dfe306c34f0018a22275d2420815784005bf771c84/colander-1.4.tar.gz";
-      md5 = "cbb8e403c2ba05aeaa419d51fdb93736";
+      url = "https://files.pythonhosted.org/packages/83/80/8ef3a11a15f8eaafafa0937b20c1b3f73527e69ab6b3fa1cf94a5a96aabb/future-0.14.3.tar.gz";
+      sha256 = "1savk7jx7hal032f522c5ajhh8fra6gmnadrj9adv5qxi18pv1b2";
     };
     meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+      license = [ { fullName = "OSI Approved"; } pkgs.lib.licenses.mit ];
     };
   };
-  configobj = super.buildPythonPackage {
-    name = "configobj-5.0.6";
-    buildInputs = with self; [];
+  "futures" = super.buildPythonPackage {
+    name = "futures-3.0.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab/configobj-5.0.6.tar.gz";
-      md5 = "e472a3a1c2a67bb0ec9b5d54c13a47d6";
+      url = "https://files.pythonhosted.org/packages/f8/e7/fc0fcbeb9193ba2d4de00b065e7fd5aecd0679e93ce95a07322b2b1434f4/futures-3.0.2.tar.gz";
+      sha256 = "0mz2pbgxbc2nbib1szifi07whjbfs4r02pv2z390z7p410awjgyw";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  configparser = super.buildPythonPackage {
-    name = "configparser-3.5.0";
-    buildInputs = with self; [];
+  "gevent" = super.buildPythonPackage {
+    name = "gevent-1.3.5";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."greenlet"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/7c/69/c2ce7e91c89dc073eb1aa74c0621c3eefbffe8216b3f9af9d3885265c01c/configparser-3.5.0.tar.gz";
-      md5 = "cfdd915a5b7a6c09917a64a573140538";
+      url = "https://files.pythonhosted.org/packages/e6/0a/fc345c6e6161f84484870dbcaa58e427c10bd9bdcd08a69bed3d6b398bf1/gevent-1.3.5.tar.gz";
+      sha256 = "1w3gydxirgd2f60c5yv579w4903ds9s4g3587ik4jby97hgqc5bz";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  cov-core = super.buildPythonPackage {
-    name = "cov-core-1.15.0";
-    buildInputs = with self; [];
+  "gnureadline" = super.buildPythonPackage {
+    name = "gnureadline-6.3.8";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/50/64/86085c823cd78f9df9d8e33dce0baa71618016f8860460b82cf6610e1eb3/gnureadline-6.3.8.tar.gz";
+      sha256 = "0ddhj98x2nv45iz4aadk4b9m0b1kpsn1xhcbypn5cd556knhiqjq";
+    };
+    meta = {
+      license = [ { fullName = "GNU General Public License v3 (GPLv3)"; } pkgs.lib.licenses.gpl1 ];
+    };
+  };
+  "gprof2dot" = super.buildPythonPackage {
+    name = "gprof2dot-2017.9.19";
     doCheck = false;
-    propagatedBuildInputs = with self; [coverage];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/9d/36/f977122502979f3dfb50704979c9ed70e6b620787942b089bf1af15f5aba/gprof2dot-2017.9.19.tar.gz";
+      sha256 = "17ih23ld2nzgc3xwgbay911l6lh96jp1zshmskm17n1gg2i7mg6f";
+    };
+    meta = {
+      license = [ { fullName = "GNU Lesser General Public License v3 or later (LGPLv3+)"; } { fullName = "LGPL"; } ];
+    };
+  };
+  "graphviz" = super.buildPythonPackage {
+    name = "graphviz-0.9";
+    doCheck = false;
     src = fetchurl {
-      url = "https://pypi.python.org/packages/4b/87/13e75a47b4ba1be06f29f6d807ca99638bedc6b57fa491cd3de891ca2923/cov-core-1.15.0.tar.gz";
-      md5 = "f519d4cb4c4e52856afb14af52919fe6";
+      url = "https://files.pythonhosted.org/packages/2b/e6/71521bab8fb99833133f08f6ac0460e2f6b425a7f75ac4b02323c3c3b512/graphviz-0.9.zip";
+      sha256 = "14r9brj4r31b3qy1nnn34v3l4h0n39bqxg9sn2fz4p3pp5mglnl6";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "greenlet" = super.buildPythonPackage {
+    name = "greenlet-0.4.13";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/13/de/ba92335e9e76040ca7274224942282a80d54f85e342a5e33c5277c7f87eb/greenlet-0.4.13.tar.gz";
+      sha256 = "1r412gfx25jrdiv444prmz5a8igrfabwnwqyr6b52ypq7ga87vqg";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  coverage = super.buildPythonPackage {
-    name = "coverage-3.7.1";
-    buildInputs = with self; [];
+  "gunicorn" = super.buildPythonPackage {
+    name = "gunicorn-19.9.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/09/4f/89b06c7fdc09687bca507dc411c342556ef9c5a3b26756137a4878ff19bf/coverage-3.7.1.tar.gz";
-      md5 = "c47b36ceb17eaff3ecfab3bcd347d0df";
+      url = "https://files.pythonhosted.org/packages/47/52/68ba8e5e8ba251e54006a49441f7ccabca83b6bef5aedacb4890596c7911/gunicorn-19.9.0.tar.gz";
+      sha256 = "1wzlf4xmn6qjirh5w81l6i6kqjnab1n1qqkh7zsj1yb6gh4n49ps";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  cssselect = super.buildPythonPackage {
-    name = "cssselect-1.0.1";
-    buildInputs = with self; [];
+  "html5lib" = super.buildPythonPackage {
+    name = "html5lib-1.0.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+      self."webencodings"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/77/ff/9c865275cd19290feba56344eba570e719efb7ca5b34d67ed12b22ebbb0d/cssselect-1.0.1.tar.gz";
-      md5 = "3fa03bf82a9f0b1223c0f1eb1369e139";
+      url = "https://files.pythonhosted.org/packages/85/3e/cf449cf1b5004e87510b9368e7a5f1acd8831c2d6691edd3c62a0823f98f/html5lib-1.0.1.tar.gz";
+      sha256 = "0dipzfrycv6j1jw82v9b7d8lzggx3x8xngx6l4xrqkxwvg7hvjv6";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  decorator = super.buildPythonPackage {
-    name = "decorator-4.1.2";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/bb/e0/f6e41e9091e130bf16d4437dabbac3993908e4d6485ecbc985ef1352db94/decorator-4.1.2.tar.gz";
-      md5 = "a0f7f4fe00ae2dde93494d90c192cf8c";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "new BSD License"; } ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  deform = super.buildPythonPackage {
-    name = "deform-2.0.4";
-    buildInputs = with self; [];
+  "hupper" = super.buildPythonPackage {
+    name = "hupper-1.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [Chameleon colander iso8601 peppercorn translationstring zope.deprecation];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/66/3b/eefcb07abcab7a97f6665aa2d0cf1af741d9d6e78a2e4657fd2b89f89880/deform-2.0.4.tar.gz";
-      md5 = "34756e42cf50dd4b4430809116c4ec0a";
-    };
-    meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
-    };
-  };
-  docutils = super.buildPythonPackage {
-    name = "docutils-0.14";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
-      md5 = "c53768d63db3873b7d452833553469de";
+      url = "https://files.pythonhosted.org/packages/51/0c/96335b1f2f32245fb871eea5bb9773196505ddb71fad15190056a282df9e/hupper-1.3.tar.gz";
+      sha256 = "1pkyrm9c2crc32ps00k1ahnc5clj3pjwiarc7j0x8aykwih7ff10";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.publicDomain pkgs.lib.licenses.gpl1 { fullName = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)"; } pkgs.lib.licenses.psfl ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  dogpile.cache = super.buildPythonPackage {
-    name = "dogpile.cache-0.6.4";
-    buildInputs = with self; [];
+  "infrae.cache" = super.buildPythonPackage {
+    name = "infrae.cache-1.0.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."beaker"
+      self."repoze.lru"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b6/3d/35c05ca01c070bb70d9d422f2c4858ecb021b05b21af438fec5ccd7b945c/dogpile.cache-0.6.4.tar.gz";
-      md5 = "66e0a6cae6c08cb1ea25f89d0eadfeb0";
+      url = "https://files.pythonhosted.org/packages/bb/f0/e7d5e984cf6592fd2807dc7bc44a93f9d18e04e6a61f87fdfb2622422d74/infrae.cache-1.0.1.tar.gz";
+      sha256 = "1dvqsjn8vw253wz9d1pz17j79mf4bs53dvp2qxck2qdp1am1njw4";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
-  dogpile.core = super.buildPythonPackage {
-    name = "dogpile.core-0.4.1";
-    buildInputs = with self; [];
+  "invoke" = super.buildPythonPackage {
+    name = "invoke-0.13.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/0e/77/e72abc04c22aedf874301861e5c1e761231c288b5de369c18be8f4b5c9bb/dogpile.core-0.4.1.tar.gz";
-      md5 = "01cb19f52bba3e95c9b560f39341f045";
+      url = "https://files.pythonhosted.org/packages/47/bf/d07ef52fa1ac645468858bbac7cb95b246a972a045e821493d17d89c81be/invoke-0.13.0.tar.gz";
+      sha256 = "0794vhgxfmkh0vzkkg5cfv1w82g3jc3xr18wim29far9qpx9468s";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  ecdsa = super.buildPythonPackage {
-    name = "ecdsa-0.13";
-    buildInputs = with self; [];
+  "ipaddress" = super.buildPythonPackage {
+    name = "ipaddress-1.0.22";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f9/e5/99ebb176e47f150ac115ffeda5fedb6a3dbb3c00c74a59fd84ddf12f5857/ecdsa-0.13.tar.gz";
-      md5 = "1f60eda9cb5c46722856db41a3ae6670";
+      url = "https://files.pythonhosted.org/packages/97/8d/77b8cedcfbf93676148518036c6b1ce7f8e14bf07e95d7fd4ddcb8cc052f/ipaddress-1.0.22.tar.gz";
+      sha256 = "0b570bm6xqpjwqis15pvdy6lyvvzfndjvkynilcddjj5x98wfimi";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.psfl ];
     };
   };
-  elasticsearch = super.buildPythonPackage {
-    name = "elasticsearch-2.3.0";
-    buildInputs = with self; [];
+  "ipdb" = super.buildPythonPackage {
+    name = "ipdb-0.11";
     doCheck = false;
-    propagatedBuildInputs = with self; [urllib3];
+    propagatedBuildInputs = [
+      self."setuptools"
+      self."ipython"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/10/35/5fd52c5f0b0ee405ed4b5195e8bce44c5e041787680dc7b94b8071cac600/elasticsearch-2.3.0.tar.gz";
-      md5 = "2550f3b51629cf1ef9636608af92c340";
+      url = "https://files.pythonhosted.org/packages/80/fe/4564de08f174f3846364b3add8426d14cebee228f741c27e702b2877e85b/ipdb-0.11.tar.gz";
+      sha256 = "02m0l8wrhhd3z7dg3czn5ys1g5pxib516hpshdzp7rxzsxgcd0bh";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  elasticsearch-dsl = super.buildPythonPackage {
-    name = "elasticsearch-dsl-2.2.0";
-    buildInputs = with self; [];
+  "ipython" = super.buildPythonPackage {
+    name = "ipython-5.1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [six python-dateutil elasticsearch];
+    propagatedBuildInputs = [
+      self."setuptools"
+      self."decorator"
+      self."pickleshare"
+      self."simplegeneric"
+      self."traitlets"
+      self."prompt-toolkit"
+      self."pygments"
+      self."pexpect"
+      self."backports.shutil-get-terminal-size"
+      self."pathlib2"
+      self."pexpect"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/66/2f/52a086968788e58461641570f45c3207a52d46ebbe9b77dc22b6a8ffda66/elasticsearch-dsl-2.2.0.tar.gz";
-      md5 = "fa6bd3c87ea3caa8f0f051bc37c53221";
+      url = "https://files.pythonhosted.org/packages/89/63/a9292f7cd9d0090a0f995e1167f3f17d5889dcbc9a175261719c513b9848/ipython-5.1.0.tar.gz";
+      sha256 = "0qdrf6aj9kvjczd5chj1my8y2iq09am9l8bb2a1334a52d76kx3y";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  entrypoints = super.buildPythonPackage {
-    name = "entrypoints-0.2.2";
-    buildInputs = with self; [];
+  "ipython-genutils" = super.buildPythonPackage {
+    name = "ipython-genutils-0.2.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [configparser];
     src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313";
-      md5 = "7db37771aea9ac9fefe093e5d6987313";
+      url = "https://files.pythonhosted.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz";
+      sha256 = "1a4bc9y8hnvq6cp08qs4mckgm6i6ajpndp4g496rvvzcfmp12bpb";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "iso8601" = super.buildPythonPackage {
+    name = "iso8601-0.1.11";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/c0/75/c9209ee4d1b5975eb8c2cba4428bde6b61bd55664a98290dd015cdb18e98/iso8601-0.1.11.tar.gz";
+      sha256 = "0c7gh3lsdjds262h0v1sqc66l7hqgfwbakn96qrhdbl0i3vm5yz8";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  enum34 = super.buildPythonPackage {
-    name = "enum34-1.1.6";
-    buildInputs = with self; [];
+  "itsdangerous" = super.buildPythonPackage {
+    name = "itsdangerous-0.24";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz";
-      md5 = "5f13a0841a61f7fc295c514490d120d0";
+      url = "https://files.pythonhosted.org/packages/dc/b4/a60bcdba945c00f6d608d8975131ab3f25b22f2bcfe1dab221165194b2d4/itsdangerous-0.24.tar.gz";
+      sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  funcsigs = super.buildPythonPackage {
-    name = "funcsigs-1.0.2";
-    buildInputs = with self; [];
+  "jinja2" = super.buildPythonPackage {
+    name = "jinja2-2.9.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/94/4a/db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/funcsigs-1.0.2.tar.gz";
-      md5 = "7e583285b1fb8a76305d6d68f4ccc14e";
-    };
-    meta = {
-      license = [ { fullName = "ASL"; } pkgs.lib.licenses.asl20 ];
-    };
-  };
-  functools32 = super.buildPythonPackage {
-    name = "functools32-3.2.3.post2";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."markupsafe"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz";
-      md5 = "09f24ffd9af9f6cd0f63cb9f4e23d4b2";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.psfl ];
-    };
-  };
-  future = super.buildPythonPackage {
-    name = "future-0.14.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/83/80/8ef3a11a15f8eaafafa0937b20c1b3f73527e69ab6b3fa1cf94a5a96aabb/future-0.14.3.tar.gz";
-      md5 = "e94079b0bd1fc054929e8769fc0f6083";
-    };
-    meta = {
-      license = [ { fullName = "OSI Approved"; } pkgs.lib.licenses.mit ];
-    };
-  };
-  futures = super.buildPythonPackage {
-    name = "futures-3.0.2";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/f8/e7/fc0fcbeb9193ba2d4de00b065e7fd5aecd0679e93ce95a07322b2b1434f4/futures-3.0.2.tar.gz";
-      md5 = "42aaf1e4de48d6e871d77dc1f9d96d5a";
+      url = "https://files.pythonhosted.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
+      sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  gevent = super.buildPythonPackage {
-    name = "gevent-1.2.2";
-    buildInputs = with self; [];
+  "jsonschema" = super.buildPythonPackage {
+    name = "jsonschema-2.6.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [greenlet];
+    propagatedBuildInputs = [
+      self."functools32"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/1b/92/b111f76e54d2be11375b47b213b56687214f258fd9dae703546d30b837be/gevent-1.2.2.tar.gz";
-      md5 = "7f0baf355384fe5ff2ecf66853422554";
+      url = "https://files.pythonhosted.org/packages/58/b9/171dbb07e18c6346090a37f03c7e74410a1a56123f847efed59af260a298/jsonschema-2.6.0.tar.gz";
+      sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  gnureadline = super.buildPythonPackage {
-    name = "gnureadline-6.3.8";
-    buildInputs = with self; [];
+  "jupyter-client" = super.buildPythonPackage {
+    name = "jupyter-client-5.0.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."traitlets"
+      self."jupyter-core"
+      self."pyzmq"
+      self."python-dateutil"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/50/64/86085c823cd78f9df9d8e33dce0baa71618016f8860460b82cf6610e1eb3/gnureadline-6.3.8.tar.gz";
-      md5 = "ba341f4b907250bd1f47dbc06290604f";
+      url = "https://files.pythonhosted.org/packages/e5/6f/65412ed462202b90134b7e761b0b7e7f949e07a549c1755475333727b3d0/jupyter_client-5.0.0.tar.gz";
+      sha256 = "0nxw4rqk4wsjhc87gjqd7pv89cb9dnimcfnmcmp85bmrvv1gjri7";
     };
     meta = {
-      license = [ { fullName = "GNU General Public License v3 (GPLv3)"; } pkgs.lib.licenses.gpl1 ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  gprof2dot = super.buildPythonPackage {
-    name = "gprof2dot-2017.9.19";
-    buildInputs = with self; [];
+  "jupyter-core" = super.buildPythonPackage {
+    name = "jupyter-core-4.4.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."traitlets"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/9d/36/f977122502979f3dfb50704979c9ed70e6b620787942b089bf1af15f5aba/gprof2dot-2017.9.19.tar.gz";
-      md5 = "cda2d552bb0d0b9f16e6824a9aabd225";
+      url = "https://files.pythonhosted.org/packages/b6/2d/2804f4de3a95583f65e5dcb4d7c8c7183124882323758996e867f47e72af/jupyter_core-4.4.0.tar.gz";
+      sha256 = "1dy083rarba8prn9f9srxq3c7n7vyql02ycrqq306c40lr57aw5s";
     };
     meta = {
-      license = [ { fullName = "GNU Lesser General Public License v3 or later (LGPLv3+)"; } { fullName = "LGPL"; } ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "kombu" = super.buildPythonPackage {
+    name = "kombu-4.2.0";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."amqp"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ab/b1/46a7a8babf5e60f3b2ca081a100af8edfcf132078a726375f52a054e70cf/kombu-4.2.0.tar.gz";
+      sha256 = "1yz19qlqf0inl1mnwlpq9j6kj9r67clpy0xg99phyg4329rw80fn";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  graphviz = super.buildPythonPackage {
-    name = "graphviz-0.8.2";
-    buildInputs = with self; [];
+  "lxml" = super.buildPythonPackage {
+    name = "lxml-3.7.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/fa/d1/63b62dee9e55368f60b5ea445e6afb361bb47e692fc27553f3672e16efb8/graphviz-0.8.2.zip";
-      md5 = "50866e780f43e1cb0d073c70424fcaff";
+      url = "https://files.pythonhosted.org/packages/39/e8/a8e0b1fa65dd021d48fe21464f71783655f39a41f218293c1c590d54eb82/lxml-3.7.3.tar.gz";
+      sha256 = "1iv1jgkqn1hdh1xyxri6g0y1s67h01jzjkw2nhkx3rqylmw2sl5a";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  greenlet = super.buildPythonPackage {
-    name = "greenlet-0.4.13";
-    buildInputs = with self; [];
+  "mako" = super.buildPythonPackage {
+    name = "mako-1.0.7";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."markupsafe"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/13/de/ba92335e9e76040ca7274224942282a80d54f85e342a5e33c5277c7f87eb/greenlet-0.4.13.tar.gz";
-      md5 = "6e0b9dd5385f81d478451ec8ed1d62b3";
+      url = "https://files.pythonhosted.org/packages/eb/f3/67579bb486517c0d49547f9697e36582cd19dafb5df9e687ed8e22de57fa/Mako-1.0.7.tar.gz";
+      sha256 = "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  gunicorn = super.buildPythonPackage {
-    name = "gunicorn-19.7.1";
-    buildInputs = with self; [];
+  "markdown" = super.buildPythonPackage {
+    name = "markdown-2.6.11";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/30/3a/10bb213cede0cc4d13ac2263316c872a64bf4c819000c8ccd801f1d5f822/gunicorn-19.7.1.tar.gz";
-      md5 = "174d3c3cd670a5be0404d84c484e590c";
+      url = "https://files.pythonhosted.org/packages/b3/73/fc5c850f44af5889192dff783b7b0d8f3fe8d30b65c8e3f78f8f0265fecf/Markdown-2.6.11.tar.gz";
+      sha256 = "108g80ryzykh8bj0i7jfp71510wrcixdi771lf2asyghgyf8cmm8";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  html5lib = super.buildPythonPackage {
-    name = "html5lib-1.0.1";
-    buildInputs = with self; [];
+  "markupsafe" = super.buildPythonPackage {
+    name = "markupsafe-1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [six webencodings];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/85/3e/cf449cf1b5004e87510b9368e7a5f1acd8831c2d6691edd3c62a0823f98f/html5lib-1.0.1.tar.gz";
-      md5 = "942a0688d6bdf20d087c9805c40182ad";
+      url = "https://files.pythonhosted.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
+      sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  hupper = super.buildPythonPackage {
-    name = "hupper-1.0";
-    buildInputs = with self; [];
+  "meld3" = super.buildPythonPackage {
+    name = "meld3-1.0.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/2e/07/df892c564dc09bb3cf6f6deb976c26adf9117db75ba218cb4353dbc9d826/hupper-1.0.tar.gz";
-      md5 = "26e77da7d5ac5858f59af050d1a6eb5a";
+      url = "https://files.pythonhosted.org/packages/45/a0/317c6422b26c12fe0161e936fc35f36552069ba8e6f7ecbd99bbffe32a5f/meld3-1.0.2.tar.gz";
+      sha256 = "0n4mkwlpsqnmn0dm0wm5hn9nkda0nafl0jdy5sdl5977znh59dzp";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  infrae.cache = super.buildPythonPackage {
-    name = "infrae.cache-1.0.1";
-    buildInputs = with self; [];
+  "mistune" = super.buildPythonPackage {
+    name = "mistune-0.8.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [Beaker repoze.lru];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/bb/f0/e7d5e984cf6592fd2807dc7bc44a93f9d18e04e6a61f87fdfb2622422d74/infrae.cache-1.0.1.tar.gz";
-      md5 = "b09076a766747e6ed2a755cc62088e32";
+      url = "https://files.pythonhosted.org/packages/9d/be/e06d4346cc608a01dec6bf770d7d0303a4fd6db588b318ced18f5f257145/mistune-0.8.3.tar.gz";
+      sha256 = "06b662p6kf46wh2jsabaqhaq4bz1srh2zxkrnx4yg96azlxw645w";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  invoke = super.buildPythonPackage {
-    name = "invoke-0.13.0";
-    buildInputs = with self; [];
+  "mock" = super.buildPythonPackage {
+    name = "mock-1.0.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/47/bf/d07ef52fa1ac645468858bbac7cb95b246a972a045e821493d17d89c81be/invoke-0.13.0.tar.gz";
-      md5 = "c0d1ed4bfb34eaab551662d8cfee6540";
+      url = "https://files.pythonhosted.org/packages/a2/52/7edcd94f0afb721a2d559a5b9aae8af4f8f2c79bc63fdbe8a8a6c9b23bbe/mock-1.0.1.tar.gz";
+      sha256 = "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  ipaddress = super.buildPythonPackage {
-    name = "ipaddress-1.0.19";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/f0/ba/860a4a3e283456d6b7e2ab39ce5cf11a3490ee1a363652ac50abf9f0f5df/ipaddress-1.0.19.tar.gz";
-      md5 = "d0687efaf93a32476d81e90ba0609c57";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.psfl ];
-    };
-  };
-  ipdb = super.buildPythonPackage {
-    name = "ipdb-0.10.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [setuptools ipython];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/ad/cc/0e7298e1fbf2efd52667c9354a12aa69fb6f796ce230cca03525051718ef/ipdb-0.10.3.tar.gz";
-      md5 = "def1f6ac075d54bdee07e6501263d4fa";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  ipython = super.buildPythonPackage {
-    name = "ipython-5.1.0";
-    buildInputs = with self; [];
+  "more-itertools" = super.buildPythonPackage {
+    name = "more-itertools-4.3.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools decorator pickleshare simplegeneric traitlets prompt-toolkit Pygments pexpect backports.shutil-get-terminal-size pathlib2 pexpect];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/89/63/a9292f7cd9d0090a0f995e1167f3f17d5889dcbc9a175261719c513b9848/ipython-5.1.0.tar.gz";
-      md5 = "47c8122420f65b58784cb4b9b4af35e3";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  ipython-genutils = super.buildPythonPackage {
-    name = "ipython-genutils-0.2.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz";
-      md5 = "5a4f9781f78466da0ea1a648f3e1f79f";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  iso8601 = super.buildPythonPackage {
-    name = "iso8601-0.1.12";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/45/13/3db24895497345fb44c4248c08b16da34a9eb02643cea2754b21b5ed08b0/iso8601-0.1.12.tar.gz";
-      md5 = "4de940f691c5ea759fb254384c8ddcf6";
+      url = "https://files.pythonhosted.org/packages/88/ff/6d485d7362f39880810278bdc906c13300db05485d9c65971dec1142da6a/more-itertools-4.3.0.tar.gz";
+      sha256 = "17h3na0rdh8xq30w4b9pizgkdxmm51896bxw600x84jflg9vaxn4";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  itsdangerous = super.buildPythonPackage {
-    name = "itsdangerous-0.24";
-    buildInputs = with self; [];
+  "msgpack-python" = super.buildPythonPackage {
+    name = "msgpack-python-0.5.6";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/8a/20/6eca772d1a5830336f84aca1d8198e5a3f4715cd1c7fc36d3cc7f7185091/msgpack-python-0.5.6.tar.gz";
+      sha256 = "16wh8qgybmfh4pjp8vfv78mdlkxfmcasg78lzlnm6nslsfkci31p";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "mysql-python" = super.buildPythonPackage {
+    name = "mysql-python-1.2.5";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/dc/b4/a60bcdba945c00f6d608d8975131ab3f25b22f2bcfe1dab221165194b2d4/itsdangerous-0.24.tar.gz";
-      md5 = "a3d55aa79369aef5345c036a8a26307f";
+      url = "https://files.pythonhosted.org/packages/a5/e9/51b544da85a36a68debe7a7091f068d802fc515a3a202652828c73453cad/MySQL-python-1.2.5.zip";
+      sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.gpl1 ];
+    };
+  };
+  "nbconvert" = super.buildPythonPackage {
+    name = "nbconvert-5.3.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."mistune"
+      self."jinja2"
+      self."pygments"
+      self."traitlets"
+      self."jupyter-core"
+      self."nbformat"
+      self."entrypoints"
+      self."bleach"
+      self."pandocfilters"
+      self."testpath"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/b9/a4/d0a0938ad6f5eeb4dea4e73d255c617ef94b0b2849d51194c9bbdb838412/nbconvert-5.3.1.tar.gz";
+      sha256 = "1f9dkvpx186xjm4xab0qbph588mncp4vqk3fmxrsnqs43mks9c8j";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  jsonschema = super.buildPythonPackage {
-    name = "jsonschema-2.6.0";
-    buildInputs = with self; [];
+  "nbformat" = super.buildPythonPackage {
+    name = "nbformat-4.4.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [functools32];
+    propagatedBuildInputs = [
+      self."ipython-genutils"
+      self."traitlets"
+      self."jsonschema"
+      self."jupyter-core"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/58/b9/171dbb07e18c6346090a37f03c7e74410a1a56123f847efed59af260a298/jsonschema-2.6.0.tar.gz";
-      md5 = "50c6b69a373a8b55ff1e0ec6e78f13f4";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  jupyter-client = super.buildPythonPackage {
-    name = "jupyter-client-5.0.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [traitlets jupyter-core pyzmq python-dateutil];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/e5/6f/65412ed462202b90134b7e761b0b7e7f949e07a549c1755475333727b3d0/jupyter_client-5.0.0.tar.gz";
-      md5 = "1acd331b5c9fb4d79dae9939e79f2426";
+      url = "https://files.pythonhosted.org/packages/6e/0e/160754f7ae3e984863f585a3743b0ed1702043a81245907c8fae2d537155/nbformat-4.4.0.tar.gz";
+      sha256 = "00nlf08h8yc4q73nphfvfhxrcnilaqanb8z0mdy6nxk0vzq4wjgp";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  jupyter-core = super.buildPythonPackage {
-    name = "jupyter-core-4.4.0";
-    buildInputs = with self; [];
+  "objgraph" = super.buildPythonPackage {
+    name = "objgraph-3.1.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [traitlets];
+    propagatedBuildInputs = [
+      self."graphviz"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b6/2d/2804f4de3a95583f65e5dcb4d7c8c7183124882323758996e867f47e72af/jupyter_core-4.4.0.tar.gz";
-      md5 = "7829fc07884ed98459e170f217e2a5ba";
+      url = "https://files.pythonhosted.org/packages/be/58/9ca81a20cc837054e94866df1475d899caaa94f3732b8a46006858b015f7/objgraph-3.1.1.tar.gz";
+      sha256 = "17aq4cwainiwvj8x61j0hx45c313bkwza5fijnmmw8v8glyy2bcc";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "packaging" = super.buildPythonPackage {
+    name = "packaging-15.2";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/24/c4/185da1304f07047dc9e0c46c31db75c0351bd73458ac3efad7da3dbcfbe1/packaging-15.2.tar.gz";
+      sha256 = "1zn60w84bxvw6wypffka18ca66pa1k2cfrq3cq8fnsfja5m3k4ng";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "pandocfilters" = super.buildPythonPackage {
+    name = "pandocfilters-1.4.2";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/4c/ea/236e2584af67bb6df960832731a6e5325fd4441de001767da328c33368ce/pandocfilters-1.4.2.tar.gz";
+      sha256 = "1a8d9b7s48gmq9zj0pmbyv2sivn5i7m6mybgpkk4jm5vd7hp1pdk";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  kombu = super.buildPythonPackage {
-    name = "kombu-4.1.0";
-    buildInputs = with self; [];
+  "paste" = super.buildPythonPackage {
+    name = "paste-2.0.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [amqp];
+    propagatedBuildInputs = [
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/03/5e/1a47d1e543d4943d65330af4e4406049f443878818fb65bfdc651bb93a96/kombu-4.1.0.tar.gz";
-      md5 = "2fb2be9fec0e6514231bba23a3779439";
+      url = "https://files.pythonhosted.org/packages/30/c3/5c2f7c7a02e4f58d4454353fa1c32c94f79fa4e36d07a67c0ac295ea369e/Paste-2.0.3.tar.gz";
+      sha256 = "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "pastedeploy" = super.buildPythonPackage {
+    name = "pastedeploy-1.5.2";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/0f/90/8e20cdae206c543ea10793cbf4136eb9a8b3f417e04e40a29d72d9922cbd/PasteDeploy-1.5.2.tar.gz";
+      sha256 = "1jz3m4hq8v6hyhfjz9425nd3nvn52cvbfipdcd72krjmla4qz1fm";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  lxml = super.buildPythonPackage {
-    name = "lxml-3.7.3";
-    buildInputs = with self; [];
+  "pastescript" = super.buildPythonPackage {
+    name = "pastescript-2.0.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."paste"
+      self."pastedeploy"
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/39/e8/a8e0b1fa65dd021d48fe21464f71783655f39a41f218293c1c590d54eb82/lxml-3.7.3.tar.gz";
-      md5 = "075692ce442e69bbd604d44e21c02753";
+      url = "https://files.pythonhosted.org/packages/e5/f0/78e766c3dcc61a4f3a6f71dd8c95168ae9c7a31722b5663d19c1fdf62cb6/PasteScript-2.0.2.tar.gz";
+      sha256 = "1h3nnhn45kf4pbcv669ik4faw04j58k8vbj1hwrc532k0nc28gy0";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  meld3 = super.buildPythonPackage {
-    name = "meld3-1.0.2";
-    buildInputs = with self; [];
+  "pathlib2" = super.buildPythonPackage {
+    name = "pathlib2-2.3.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+      self."scandir"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/45/a0/317c6422b26c12fe0161e936fc35f36552069ba8e6f7ecbd99bbffe32a5f/meld3-1.0.2.tar.gz";
-      md5 = "3ccc78cd79cffd63a751ad7684c02c91";
+      url = "https://files.pythonhosted.org/packages/a1/14/df0deb867c2733f7d857523c10942b3d6612a1b222502fdffa9439943dfb/pathlib2-2.3.0.tar.gz";
+      sha256 = "1cx5gs2v9j2vnzmcrbq5l8fq2mwrr1h6pyf1sjdji2w1bavm09fk";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "peppercorn" = super.buildPythonPackage {
+    name = "peppercorn-0.5";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/45/ec/a62ec317d1324a01567c5221b420742f094f05ee48097e5157d32be3755c/peppercorn-0.5.tar.gz";
+      sha256 = "0jvp144zn7yqk9kbpxc059167mlqk85i5lpvl1niw8gsa5fvl74j";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  mistune = super.buildPythonPackage {
-    name = "mistune-0.8.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/9d/be/e06d4346cc608a01dec6bf770d7d0303a4fd6db588b318ced18f5f257145/mistune-0.8.3.tar.gz";
-      md5 = "a5e4043e93fb8f9082e27f29eeb5e054";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  mock = super.buildPythonPackage {
-    name = "mock-1.0.1";
-    buildInputs = with self; [];
+  "pexpect" = super.buildPythonPackage {
+    name = "pexpect-4.6.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."ptyprocess"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a2/52/7edcd94f0afb721a2d559a5b9aae8af4f8f2c79bc63fdbe8a8a6c9b23bbe/mock-1.0.1.tar.gz";
-      md5 = "c3971991738caa55ec7c356bbc154ee2";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  msgpack-python = super.buildPythonPackage {
-    name = "msgpack-python-0.4.8";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/21/27/8a1d82041c7a2a51fcc73675875a5f9ea06c2663e02fcfeb708be1d081a0/msgpack-python-0.4.8.tar.gz";
-      md5 = "dcd854fb41ee7584ebbf35e049e6be98";
+      url = "https://files.pythonhosted.org/packages/89/43/07d07654ee3e25235d8cea4164cdee0ec39d1fda8e9203156ebe403ffda4/pexpect-4.6.0.tar.gz";
+      sha256 = "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
-    };
-  };
-  nbconvert = super.buildPythonPackage {
-    name = "nbconvert-5.3.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [mistune Jinja2 Pygments traitlets jupyter-core nbformat entrypoints bleach pandocfilters testpath];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/b9/a4/d0a0938ad6f5eeb4dea4e73d255c617ef94b0b2849d51194c9bbdb838412/nbconvert-5.3.1.tar.gz";
-      md5 = "c128d0d93d02f70a85429a383dae96d2";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ];
     };
   };
-  nbformat = super.buildPythonPackage {
-    name = "nbformat-4.4.0";
-    buildInputs = with self; [];
+  "pickleshare" = super.buildPythonPackage {
+    name = "pickleshare-0.7.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [ipython-genutils traitlets jsonschema jupyter-core];
+    propagatedBuildInputs = [
+      self."pathlib2"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/6e/0e/160754f7ae3e984863f585a3743b0ed1702043a81245907c8fae2d537155/nbformat-4.4.0.tar.gz";
-      md5 = "2d5f873138d9fbc2a3f9eaaebca3b8a1";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  objgraph = super.buildPythonPackage {
-    name = "objgraph-3.1.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [graphviz];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/be/58/9ca81a20cc837054e94866df1475d899caaa94f3732b8a46006858b015f7/objgraph-3.1.1.tar.gz";
-      md5 = "253af9944763377877c3678d8aaebb8b";
+      url = "https://files.pythonhosted.org/packages/69/fe/dd137d84daa0fd13a709e448138e310d9ea93070620c9db5454e234af525/pickleshare-0.7.4.tar.gz";
+      sha256 = "0yvk14dzxk7g6qpr7iw23vzqbsr0dh4ij4xynkhnzpfz4xr2bac4";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  packaging = super.buildPythonPackage {
-    name = "packaging-15.2";
-    buildInputs = with self; [];
+  "plaster" = super.buildPythonPackage {
+    name = "plaster-1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."setuptools"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/24/c4/185da1304f07047dc9e0c46c31db75c0351bd73458ac3efad7da3dbcfbe1/packaging-15.2.tar.gz";
-      md5 = "c16093476f6ced42128bf610e5db3784";
+      url = "https://files.pythonhosted.org/packages/37/e1/56d04382d718d32751017d32f351214384e529b794084eee20bb52405563/plaster-1.0.tar.gz";
+      sha256 = "1hy8k0nv2mxq94y5aysk6hjk9ryb4bsd13g83m60hcyzxz3wflc3";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pandocfilters = super.buildPythonPackage {
-    name = "pandocfilters-1.4.2";
-    buildInputs = with self; [];
+  "plaster-pastedeploy" = super.buildPythonPackage {
+    name = "plaster-pastedeploy-0.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."pastedeploy"
+      self."plaster"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/4c/ea/236e2584af67bb6df960832731a6e5325fd4441de001767da328c33368ce/pandocfilters-1.4.2.tar.gz";
-      md5 = "dc391791ef54c7de1572d7b46b63361f";
+      url = "https://files.pythonhosted.org/packages/3f/e7/6a6833158d2038ec40085433308a1e164fd1dac595513f6dd556d5669bb8/plaster_pastedeploy-0.6.tar.gz";
+      sha256 = "1bkggk18f4z2bmsmxyxabvf62znvjwbivzh880419r3ap0616cf2";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pathlib2 = super.buildPythonPackage {
-    name = "pathlib2-2.3.0";
-    buildInputs = with self; [];
+  "pluggy" = super.buildPythonPackage {
+    name = "pluggy-0.6.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [six scandir];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a1/14/df0deb867c2733f7d857523c10942b3d6612a1b222502fdffa9439943dfb/pathlib2-2.3.0.tar.gz";
-      md5 = "89c90409d11fd5947966b6a30a47d18c";
+      url = "https://files.pythonhosted.org/packages/11/bf/cbeb8cdfaffa9f2ea154a30ae31a9d04a1209312e2919138b4171a1f8199/pluggy-0.6.0.tar.gz";
+      sha256 = "1zqckndfn85l1cd8pndw212zg1bq9fkg1nnj32kp2mppppsyg2kz";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  peppercorn = super.buildPythonPackage {
-    name = "peppercorn-0.5";
-    buildInputs = with self; [];
+  "prompt-toolkit" = super.buildPythonPackage {
+    name = "prompt-toolkit-1.0.15";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+      self."wcwidth"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/45/ec/a62ec317d1324a01567c5221b420742f094f05ee48097e5157d32be3755c/peppercorn-0.5.tar.gz";
-      md5 = "f08efbca5790019ab45d76b7244abd40";
+      url = "https://files.pythonhosted.org/packages/8a/ad/cf6b128866e78ad6d7f1dc5b7f99885fb813393d9860778b2984582e81b5/prompt_toolkit-1.0.15.tar.gz";
+      sha256 = "05v9h5nydljwpj5nm8n804ms0glajwfy1zagrzqrg91wk3qqi1c5";
     };
     meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  pexpect = super.buildPythonPackage {
-    name = "pexpect-4.4.0";
-    buildInputs = with self; [];
+  "psutil" = super.buildPythonPackage {
+    name = "psutil-5.4.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [ptyprocess];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/fa/c3/60c0cbf96f242d0b47a82e9ca634dcd6dcb043832cf05e17540812e1c707/pexpect-4.4.0.tar.gz";
-      md5 = "e9b07f0765df8245ac72201d757baaef";
+      url = "https://files.pythonhosted.org/packages/51/9e/0f8f5423ce28c9109807024f7bdde776ed0b1161de20b408875de7e030c3/psutil-5.4.6.tar.gz";
+      sha256 = "1xmw4qi6hnrhw81xqzkvmsm9im7j2vkk4v26ycjwq2jczqsmlvk8";
     };
     meta = {
-      license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "psycopg2" = super.buildPythonPackage {
+    name = "psycopg2-2.7.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/74/83/51580322ed0e82cba7ad8e0af590b8fb2cf11bd5aaa1ed872661bd36f462/psycopg2-2.7.4.tar.gz";
+      sha256 = "02b2yaf1hlwb91xkscbzmajpfj5z3d8yikzh5r48fs8gss8i3xcb";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.zpl21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ];
     };
   };
-  pickleshare = super.buildPythonPackage {
-    name = "pickleshare-0.7.4";
-    buildInputs = with self; [];
+  "ptyprocess" = super.buildPythonPackage {
+    name = "ptyprocess-0.6.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [pathlib2];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/69/fe/dd137d84daa0fd13a709e448138e310d9ea93070620c9db5454e234af525/pickleshare-0.7.4.tar.gz";
-      md5 = "6a9e5dd8dfc023031f6b7b3f824cab12";
+      url = "https://files.pythonhosted.org/packages/7d/2d/e4b8733cf79b7309d84c9081a4ab558c89d8c89da5961bf4ddb050ca1ce0/ptyprocess-0.6.0.tar.gz";
+      sha256 = "1h4lcd3w5nrxnsk436ar7fwkiy5rfn5wj2xwy9l0r4mdqnf2jgwj";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [  ];
     };
   };
-  plaster = super.buildPythonPackage {
-    name = "plaster-1.0";
-    buildInputs = with self; [];
+  "py" = super.buildPythonPackage {
+    name = "py-1.5.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/37/e1/56d04382d718d32751017d32f351214384e529b794084eee20bb52405563/plaster-1.0.tar.gz";
-      md5 = "80e6beb4760c16fea31754babcc0576e";
+      url = "https://files.pythonhosted.org/packages/f7/84/b4c6e84672c4ceb94f727f3da8344037b62cee960d80e999b1cd9b832d83/py-1.5.3.tar.gz";
+      sha256 = "10gq2lckvgwlk9w6yzijhzkarx44hsaknd0ypa08wlnpjnsgmj99";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  plaster-pastedeploy = super.buildPythonPackage {
-    name = "plaster-pastedeploy-0.4.2";
-    buildInputs = with self; [];
+  "py-bcrypt" = super.buildPythonPackage {
+    name = "py-bcrypt-0.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [PasteDeploy plaster];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/2c/62/0daf9c0be958e785023e583e51baac15863699e956bfb3d448898d80edd8/plaster_pastedeploy-0.4.2.tar.gz";
-      md5 = "58fd7852002909378e818c9d5b71e90a";
+      url = "https://files.pythonhosted.org/packages/68/b1/1c3068c5c4d2e35c48b38dcc865301ebfdf45f54507086ac65ced1fd3b3d/py-bcrypt-0.4.tar.gz";
+      sha256 = "0y6smdggwi5s72v6p1nn53dg6w05hna3d264cq6kas0lap73p8az";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  prompt-toolkit = super.buildPythonPackage {
-    name = "prompt-toolkit-1.0.15";
-    buildInputs = with self; [];
+  "py-gfm" = super.buildPythonPackage {
+    name = "py-gfm-0.1.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [six wcwidth];
+    propagatedBuildInputs = [
+      self."setuptools"
+      self."markdown"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/8a/ad/cf6b128866e78ad6d7f1dc5b7f99885fb813393d9860778b2984582e81b5/prompt_toolkit-1.0.15.tar.gz";
-      md5 = "8fe70295006dbc8afedd43e5eba99032";
+      url = "https://files.pythonhosted.org/packages/12/e4/6b3d8678da04f97d7490d8264d8de51c2dc9fb91209ccee9c515c95e14c5/py-gfm-0.1.3.tar.gz";
+      sha256 = "162ggwwj0af9g3s1k8m4bfwbvis03x9pinnf35mj79pb90rf81zi";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "pyasn1" = super.buildPythonPackage {
+    name = "pyasn1-0.4.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/10/46/059775dc8e50f722d205452bced4b3cc965d27e8c3389156acd3b1123ae3/pyasn1-0.4.4.tar.gz";
+      sha256 = "0drilmx5j25aplfr5wrml0030cs5fgxp9yp94fhllxgx28yjm3zm";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  psutil = super.buildPythonPackage {
-    name = "psutil-5.4.3";
-    buildInputs = with self; [];
+  "pyasn1-modules" = super.buildPythonPackage {
+    name = "pyasn1-modules-0.2.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."pyasn1"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e2/e1/600326635f97fee89bf8426fef14c5c29f4849c79f68fd79f433d8c1bd96/psutil-5.4.3.tar.gz";
-      md5 = "3b291833dbea631db9d271aa602a169a";
+      url = "https://files.pythonhosted.org/packages/37/33/74ebdc52be534e683dc91faf263931bc00ae05c6073909fde53999088541/pyasn1-modules-0.2.2.tar.gz";
+      sha256 = "0ivm850yi7ajjbi8j115qpsj95bgxdsx48nbjzg0zip788c3xkx0";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  psycopg2 = super.buildPythonPackage {
-    name = "psycopg2-2.7.3.2";
-    buildInputs = with self; [];
+  "pycrypto" = super.buildPythonPackage {
+    name = "pycrypto-2.6.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/dd/47/000b405d73ca22980684fd7bd3318690cc03cfa3b2ae1c5b7fff8050b28a/psycopg2-2.7.3.2.tar.gz";
-      md5 = "8114e672d5f23fa5329874a4314fbd6f";
+      url = "https://files.pythonhosted.org/packages/60/db/645aa9af249f059cc3a368b118de33889219e0362141e75d4eaf6f80f163/pycrypto-2.6.1.tar.gz";
+      sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ];
+      license = [ pkgs.lib.licenses.publicDomain ];
     };
   };
-  ptyprocess = super.buildPythonPackage {
-    name = "ptyprocess-0.5.2";
-    buildInputs = with self; [];
+  "pycurl" = super.buildPythonPackage {
+    name = "pycurl-7.43.0.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/51/83/5d07dc35534640b06f9d9f1a1d2bc2513fb9cc7595a1b0e28ae5477056ce/ptyprocess-0.5.2.tar.gz";
-      md5 = "d3b8febae1b8c53b054bd818d0bb8665";
+      url = "https://files.pythonhosted.org/packages/e8/e4/0dbb8735407189f00b33d84122b9be52c790c7c3b25286826f4e1bdb7bde/pycurl-7.43.0.2.tar.gz";
+      sha256 = "1915kb04k1j4y6k1dx1sgnbddxrl9r1n4q928if2lkrdm73xy30g";
     };
     meta = {
-      license = [  ];
+      license = [ pkgs.lib.licenses.mit { fullName = "LGPL/MIT"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
     };
   };
-  py = super.buildPythonPackage {
-    name = "py-1.5.2";
-    buildInputs = with self; [];
+  "pyflakes" = super.buildPythonPackage {
+    name = "pyflakes-0.8.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/90/e3/e075127d39d35f09a500ebb4a90afd10f9ef0a1d28a6d09abeec0e444fdd/py-1.5.2.tar.gz";
-      md5 = "279ca69c632069e1b71e11b14641ca28";
+      url = "https://files.pythonhosted.org/packages/75/22/a90ec0252f4f87f3ffb6336504de71fe16a49d69c4538dae2f12b9360a38/pyflakes-0.8.1.tar.gz";
+      sha256 = "0sbpq6pqm1i9wqi41mlfrsc5rk92jv4mskvlyxmnhlbdnc80ma1z";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  py-bcrypt = super.buildPythonPackage {
-    name = "py-bcrypt-0.4";
-    buildInputs = with self; [];
+  "pygments" = super.buildPythonPackage {
+    name = "pygments-2.2.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/68/b1/1c3068c5c4d2e35c48b38dcc865301ebfdf45f54507086ac65ced1fd3b3d/py-bcrypt-0.4.tar.gz";
-      md5 = "dd8b367d6b716a2ea2e72392525f4e36";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  py-gfm = super.buildPythonPackage {
-    name = "py-gfm-0.1.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [setuptools Markdown];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/12/e4/6b3d8678da04f97d7490d8264d8de51c2dc9fb91209ccee9c515c95e14c5/py-gfm-0.1.3.tar.gz";
-      md5 = "e588d9e69640a241b97e2c59c22527a6";
+      url = "https://files.pythonhosted.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
+      sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  pycrypto = super.buildPythonPackage {
-    name = "pycrypto-2.6.1";
-    buildInputs = with self; [];
+  "pygments-markdown-lexer" = super.buildPythonPackage {
+    name = "pygments-markdown-lexer-0.1.0.dev39";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."pygments"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/60/db/645aa9af249f059cc3a368b118de33889219e0362141e75d4eaf6f80f163/pycrypto-2.6.1.tar.gz";
-      md5 = "55a61a054aa66812daf5161a0d5d7eda";
+      url = "https://files.pythonhosted.org/packages/c3/12/674cdee66635d638cedb2c5d9c85ce507b7b2f91bdba29e482f1b1160ff6/pygments-markdown-lexer-0.1.0.dev39.zip";
+      sha256 = "1pzb5wy23q3fhs0rqzasjnw6hdzwjngpakb73i98cn0b8lk8q4jc";
     };
     meta = {
-      license = [ pkgs.lib.licenses.publicDomain ];
+      license = [ pkgs.lib.licenses.asl20 ];
     };
   };
-  pycurl = super.buildPythonPackage {
-    name = "pycurl-7.19.5";
-    buildInputs = with self; [];
+  "pymysql" = super.buildPythonPackage {
+    name = "pymysql-0.8.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/6c/48/13bad289ef6f4869b1d8fc11ae54de8cfb3cc4a2eb9f7419c506f763be46/pycurl-7.19.5.tar.gz";
-      md5 = "47b4eac84118e2606658122104e62072";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit { fullName = "LGPL/MIT"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
-    };
-  };
-  pyflakes = super.buildPythonPackage {
-    name = "pyflakes-0.8.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/75/22/a90ec0252f4f87f3ffb6336504de71fe16a49d69c4538dae2f12b9360a38/pyflakes-0.8.1.tar.gz";
-      md5 = "905fe91ad14b912807e8fdc2ac2e2c23";
+      url = "https://files.pythonhosted.org/packages/44/39/6bcb83cae0095a31b6be4511707fdf2009d3e29903a55a0494d3a9a2fac0/PyMySQL-0.8.1.tar.gz";
+      sha256 = "0a96crz55bw4h6myh833skrli7b0ck89m3x673y2z2ryy7zrpq9l";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pygments-markdown-lexer = super.buildPythonPackage {
-    name = "pygments-markdown-lexer-0.1.0.dev39";
-    buildInputs = with self; [];
+  "pyotp" = super.buildPythonPackage {
+    name = "pyotp-2.2.6";
     doCheck = false;
-    propagatedBuildInputs = with self; [Pygments];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c3/12/674cdee66635d638cedb2c5d9c85ce507b7b2f91bdba29e482f1b1160ff6/pygments-markdown-lexer-0.1.0.dev39.zip";
-      md5 = "6360fe0f6d1f896e35b7a0142ce6459c";
+      url = "https://files.pythonhosted.org/packages/67/69/131f5ad63de40c30f3be88d891e4a2ea1b69398528db99bc1e5c543422fa/pyotp-2.2.6.tar.gz";
+      sha256 = "0sdxxvr3j4j0pk26v258jpxhgpbnpmyqhvzhl24hsd50j7fk14fx";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  pyparsing = super.buildPythonPackage {
+  "pyparsing" = super.buildPythonPackage {
     name = "pyparsing-1.5.7";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/6f/2c/47457771c02a8ff0f302b695e094ec309e30452232bd79198ee94fda689f/pyparsing-1.5.7.tar.gz";
-      md5 = "9be0fcdcc595199c646ab317c1d9a709";
+      url = "https://files.pythonhosted.org/packages/6f/2c/47457771c02a8ff0f302b695e094ec309e30452232bd79198ee94fda689f/pyparsing-1.5.7.tar.gz";
+      sha256 = "17z7ws076z977sclj628fvwrp8y9j2rvdjcsq42v129n1gwi8vk4";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pyramid = super.buildPythonPackage {
-    name = "pyramid-1.9.1";
-    buildInputs = with self; [];
+  "pyramid" = super.buildPythonPackage {
+    name = "pyramid-1.9.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools WebOb repoze.lru zope.interface zope.deprecation venusian translationstring PasteDeploy plaster plaster-pastedeploy hupper];
+    propagatedBuildInputs = [
+      self."setuptools"
+      self."webob"
+      self."repoze.lru"
+      self."zope.interface"
+      self."zope.deprecation"
+      self."venusian"
+      self."translationstring"
+      self."pastedeploy"
+      self."plaster"
+      self."plaster-pastedeploy"
+      self."hupper"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/9a/57/73447be9e7d0512d601e3f0a1fb9d7d1efb941911f49efdfe036d2826507/pyramid-1.9.1.tar.gz";
-      md5 = "0163e19c58c2d12976a3b6fdb57e052d";
+      url = "https://files.pythonhosted.org/packages/a0/c1/b321d07cfc4870541989ad131c86a1d593bfe802af0eca9718a0dadfb97a/pyramid-1.9.2.tar.gz";
+      sha256 = "09drsl0346nchgxp2j7sa5hlk7mkhfld9wvbd0wicacrp26a92fg";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  pyramid-beaker = super.buildPythonPackage {
+  "pyramid-beaker" = super.buildPythonPackage {
     name = "pyramid-beaker-0.8";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [pyramid Beaker];
+    propagatedBuildInputs = [
+      self."pyramid"
+      self."beaker"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/d9/6e/b85426e00fd3d57f4545f74e1c3828552d8700f13ededeef9233f7bca8be/pyramid_beaker-0.8.tar.gz";
-      md5 = "22f14be31b06549f80890e2c63a93834";
+      url = "https://files.pythonhosted.org/packages/d9/6e/b85426e00fd3d57f4545f74e1c3828552d8700f13ededeef9233f7bca8be/pyramid_beaker-0.8.tar.gz";
+      sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  pyramid-debugtoolbar = super.buildPythonPackage {
-    name = "pyramid-debugtoolbar-4.3";
-    buildInputs = with self; [];
+  "pyramid-debugtoolbar" = super.buildPythonPackage {
+    name = "pyramid-debugtoolbar-4.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [pyramid pyramid-mako repoze.lru Pygments ipaddress];
+    propagatedBuildInputs = [
+      self."pyramid"
+      self."pyramid-mako"
+      self."repoze.lru"
+      self."pygments"
+      self."ipaddress"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a4/40/f09d8800bfc3c09bdb6c95f37bb61c890dc62c19c4e7caa304da7aa77403/pyramid_debugtoolbar-4.3.tar.gz";
-      md5 = "9c49029e9f0695130499ef6416ffaaf8";
+      url = "https://files.pythonhosted.org/packages/00/6f/c04eb4e715a7a5a4b24079ab7ffd1dceb1f70b2e24fc17686a2922dbac0a/pyramid_debugtoolbar-4.4.tar.gz";
+      sha256 = "17p7nxvapvy2hab1rah3ndq2kbs4v83pixj8x2n4m7008ai9lxsz";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  pyramid-jinja2 = super.buildPythonPackage {
+  "pyramid-jinja2" = super.buildPythonPackage {
     name = "pyramid-jinja2-2.7";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [pyramid zope.deprecation Jinja2 MarkupSafe];
+    propagatedBuildInputs = [
+      self."pyramid"
+      self."zope.deprecation"
+      self."jinja2"
+      self."markupsafe"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/d8/80/d60a7233823de22ce77bd864a8a83736a1fe8b49884b08303a2e68b2c853/pyramid_jinja2-2.7.tar.gz";
-      md5 = "c2f8b2cd7b73a6f1d9a311fcfaf4fb92";
+      url = "https://files.pythonhosted.org/packages/d8/80/d60a7233823de22ce77bd864a8a83736a1fe8b49884b08303a2e68b2c853/pyramid_jinja2-2.7.tar.gz";
+      sha256 = "1sz5s0pp5jqhf4w22w9527yz8hgdi4mhr6apd6vw1gm5clghh8aw";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  pyramid-mako = super.buildPythonPackage {
+  "pyramid-mako" = super.buildPythonPackage {
     name = "pyramid-mako-1.0.2";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [pyramid Mako];
+    propagatedBuildInputs = [
+      self."pyramid"
+      self."mako"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f1/92/7e69bcf09676d286a71cb3bbb887b16595b96f9ba7adbdc239ffdd4b1eb9/pyramid_mako-1.0.2.tar.gz";
-      md5 = "ee25343a97eb76bd90abdc2a774eb48a";
+      url = "https://files.pythonhosted.org/packages/f1/92/7e69bcf09676d286a71cb3bbb887b16595b96f9ba7adbdc239ffdd4b1eb9/pyramid_mako-1.0.2.tar.gz";
+      sha256 = "18gk2vliq8z4acblsl6yzgbvnr9rlxjlcqir47km7kvlk1xri83d";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  pysqlite = super.buildPythonPackage {
+  "pysqlite" = super.buildPythonPackage {
     name = "pysqlite-2.8.3";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/42/02/981b6703e3c83c5b25a829c6e77aad059f9481b0bbacb47e6e8ca12bd731/pysqlite-2.8.3.tar.gz";
-      md5 = "033f17b8644577715aee55e8832ac9fc";
+      url = "https://files.pythonhosted.org/packages/42/02/981b6703e3c83c5b25a829c6e77aad059f9481b0bbacb47e6e8ca12bd731/pysqlite-2.8.3.tar.gz";
+      sha256 = "1424gwq9sil2ffmnizk60q36vydkv8rxs6m7xs987kz8cdc37lqp";
     };
     meta = {
       license = [ { fullName = "zlib/libpng License"; } { fullName = "zlib/libpng license"; } ];
     };
   };
-  pytest = super.buildPythonPackage {
-    name = "pytest-3.2.5";
-    buildInputs = with self; [];
+  "pytest" = super.buildPythonPackage {
+    name = "pytest-3.6.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [py setuptools];
+    propagatedBuildInputs = [
+      self."py"
+      self."six"
+      self."setuptools"
+      self."attrs"
+      self."more-itertools"
+      self."atomicwrites"
+      self."pluggy"
+      self."funcsigs"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/1f/f8/8cd74c16952163ce0db0bd95fdd8810cbf093c08be00e6e665ebf0dc3138/pytest-3.2.5.tar.gz";
-      md5 = "6dbe9bb093883f75394a689a1426ac6f";
+      url = "https://files.pythonhosted.org/packages/67/6a/5bcdc22f8dbada1d2910d6e1a3a03f6b14306c78f81122890735b28be4bf/pytest-3.6.0.tar.gz";
+      sha256 = "0bdfazvjjbxssqzyvkb3m2x2in7xv56ipr899l00s87k7815sm9r";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pytest-catchlog = super.buildPythonPackage {
-    name = "pytest-catchlog-1.2.2";
-    buildInputs = with self; [];
+  "pytest-cov" = super.buildPythonPackage {
+    name = "pytest-cov-2.5.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [py pytest];
+    propagatedBuildInputs = [
+      self."pytest"
+      self."coverage"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f2/2b/2faccdb1a978fab9dd0bf31cca9f6847fbe9184a0bdcc3011ac41dd44191/pytest-catchlog-1.2.2.zip";
-      md5 = "09d890c54c7456c818102b7ff8c182c8";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  pytest-cov = super.buildPythonPackage {
-    name = "pytest-cov-2.5.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [pytest coverage];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/24/b4/7290d65b2f3633db51393bdf8ae66309b37620bc3ec116c5e357e3e37238/pytest-cov-2.5.1.tar.gz";
-      md5 = "5acf38d4909e19819eb5c1754fbfc0ac";
+      url = "https://files.pythonhosted.org/packages/24/b4/7290d65b2f3633db51393bdf8ae66309b37620bc3ec116c5e357e3e37238/pytest-cov-2.5.1.tar.gz";
+      sha256 = "0bbfpwdh9k3636bxc88vz9fa7vf4akchgn513ql1vd0xy4n7bah3";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.mit ];
     };
   };
-  pytest-profiling = super.buildPythonPackage {
-    name = "pytest-profiling-1.2.11";
-    buildInputs = with self; [];
+  "pytest-profiling" = super.buildPythonPackage {
+    name = "pytest-profiling-1.3.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [six pytest gprof2dot];
+    propagatedBuildInputs = [
+      self."six"
+      self."pytest"
+      self."gprof2dot"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c0/4a/b4aa786e93c07a86f1f87c581a36bf355a9e06a9da7e00dbd05047626bd2/pytest-profiling-1.2.11.tar.gz";
-      md5 = "9ef6b60248731be5d44477980408e8f7";
+      url = "https://files.pythonhosted.org/packages/f5/34/4626126e041a51ef50a80d0619519b18d20aef249aac25b0d0fdd47e57ee/pytest-profiling-1.3.0.tar.gz";
+      sha256 = "08r5afx5z22yvpmsnl91l4amsy1yxn8qsmm61mhp06mz8zjs51kb";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pytest-runner = super.buildPythonPackage {
-    name = "pytest-runner-3.0";
-    buildInputs = with self; [];
+  "pytest-runner" = super.buildPythonPackage {
+    name = "pytest-runner-4.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/65/b4/ae89338cd2d81e2cc54bd6db2e962bfe948f612303610d68ab24539ac2d1/pytest-runner-3.0.tar.gz";
-      md5 = "8f8363a52bbabc4cedd5e239beb2ba11";
+      url = "https://files.pythonhosted.org/packages/9e/b7/fe6e8f87f9a756fd06722216f1b6698ccba4d269eac6329d9f0c441d0f93/pytest-runner-4.2.tar.gz";
+      sha256 = "1gkpyphawxz38ni1gdq1fmwyqcg02m7ypzqvv46z06crwdxi2gyj";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  pytest-sugar = super.buildPythonPackage {
-    name = "pytest-sugar-0.9.0";
-    buildInputs = with self; [];
+  "pytest-sugar" = super.buildPythonPackage {
+    name = "pytest-sugar-0.9.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [pytest termcolor];
+    propagatedBuildInputs = [
+      self."pytest"
+      self."termcolor"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/49/d8/c5ff6cca3ce2ebd8b73eec89779bf6b4a7737456a70e8ea4d44c1ff90f71/pytest-sugar-0.9.0.tar.gz";
-      md5 = "89fbff17277fa6a95a560a04b68cb9f9";
+      url = "https://files.pythonhosted.org/packages/3e/6a/a3f909083079d03bde11d06ab23088886bbe25f2c97fbe4bb865e2bf05bc/pytest-sugar-0.9.1.tar.gz";
+      sha256 = "0b4av40dv30727m54v211r0nzwjp2ajkjgxix6j484qjmwpw935b";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  pytest-timeout = super.buildPythonPackage {
-    name = "pytest-timeout-1.2.0";
-    buildInputs = with self; [];
+  "pytest-timeout" = super.buildPythonPackage {
+    name = "pytest-timeout-1.2.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [pytest];
+    propagatedBuildInputs = [
+      self."pytest"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/cc/b7/b2a61365ea6b6d2e8881360ae7ed8dad0327ad2df89f2f0be4a02304deb2/pytest-timeout-1.2.0.tar.gz";
-      md5 = "83607d91aa163562c7ee835da57d061d";
+      url = "https://files.pythonhosted.org/packages/be/e9/a9106b8bc87521c6813060f50f7d1fdc15665bc1bbbe71c0ffc1c571aaa2/pytest-timeout-1.2.1.tar.gz";
+      sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit { fullName = "DFSG approved"; } ];
     };
   };
-  python-dateutil = super.buildPythonPackage {
-    name = "python-dateutil-2.6.1";
-    buildInputs = with self; [];
+  "python-dateutil" = super.buildPythonPackage {
+    name = "python-dateutil-2.7.3";
     doCheck = false;
-    propagatedBuildInputs = with self; [six];
+    propagatedBuildInputs = [
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/54/bb/f1db86504f7a49e1d9b9301531181b00a1c7325dc85a29160ee3eaa73a54/python-dateutil-2.6.1.tar.gz";
-      md5 = "db38f6b4511cefd76014745bb0cc45a4";
+      url = "https://files.pythonhosted.org/packages/a0/b0/a4e3241d2dee665fea11baec21389aec6886655cd4db7647ddf96c3fad15/python-dateutil-2.7.3.tar.gz";
+      sha256 = "1f7h54lg0w2ckch7592xpjkh8dg87k2br256h0iw49zn6bg02w72";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "Simplified BSD"; } ];
+      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.asl20 { fullName = "Dual License"; } ];
     };
   };
-  python-editor = super.buildPythonPackage {
+  "python-editor" = super.buildPythonPackage {
     name = "python-editor-1.0.3";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/65/1e/adf6e000ea5dc909aa420352d6ba37f16434c8a3c2fa030445411a1ed545/python-editor-1.0.3.tar.gz";
-      md5 = "0aca5f2ef176ce68e98a5b7e31372835";
+      url = "https://files.pythonhosted.org/packages/65/1e/adf6e000ea5dc909aa420352d6ba37f16434c8a3c2fa030445411a1ed545/python-editor-1.0.3.tar.gz";
+      sha256 = "0rf5xz8vw93v7mhdcvind7fkykipzga430wkcd7wk892xsn6dh53";
     };
     meta = {
       license = [ pkgs.lib.licenses.asl20 { fullName = "Apache"; } ];
     };
   };
-  python-ldap = super.buildPythonPackage {
-    name = "python-ldap-2.4.45";
-    buildInputs = with self; [];
+  "python-ldap" = super.buildPythonPackage {
+    name = "python-ldap-3.1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools];
+    propagatedBuildInputs = [
+      self."pyasn1"
+      self."pyasn1-modules"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/ce/52/6b5372d0166820f4a4b0a88ed73dc7504219355049fc1d266d8ccdb7942e/python-ldap-2.4.45.tar.gz";
-      md5 = "6108e189a44eea8bc7d1cc281c222978";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.psfl ];
-    };
-  };
-  python-memcached = super.buildPythonPackage {
-    name = "python-memcached-1.58";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [six];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/f7/62/14b2448cfb04427366f24104c9da97cf8ea380d7258a3233f066a951a8d8/python-memcached-1.58.tar.gz";
-      md5 = "23b258105013d14d899828d334e6b044";
+      url = "https://files.pythonhosted.org/packages/7f/1c/28d721dff2fcd2fef9d55b40df63a00be26ec8a11e8c6fc612ae642f9cfd/python-ldap-3.1.0.tar.gz";
+      sha256 = "1i97nwfnraylyn0myxlf3vciicrf5h6fymrcff9c00k581wmx5s1";
     };
     meta = {
       license = [ pkgs.lib.licenses.psfl ];
     };
   };
-  python-pam = super.buildPythonPackage {
-    name = "python-pam-1.8.2";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/de/8c/f8f5d38b4f26893af267ea0b39023d4951705ab0413a39e0cf7cf4900505/python-pam-1.8.2.tar.gz";
-      md5 = "db71b6b999246fb05d78ecfbe166629d";
-    };
-    meta = {
-      license = [ { fullName = "License :: OSI Approved :: MIT License"; } pkgs.lib.licenses.mit ];
-    };
-  };
-  pytz = super.buildPythonPackage {
-    name = "pytz-2018.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/1b/50/4cdc62fc0753595fc16c8f722a89740f487c6e5670c644eb8983946777be/pytz-2018.3.tar.gz";
-      md5 = "abb07c09c79f78d7c04f222a550c99ef";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  pyzmq = super.buildPythonPackage {
-    name = "pyzmq-14.6.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/8a/3b/5463d5a9d712cd8bbdac335daece0d69f6a6792da4e3dd89956c0db4e4e6/pyzmq-14.6.0.tar.gz";
-      md5 = "395b5de95a931afa5b14c9349a5b8024";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "LGPL+BSD"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
-    };
-  };
-  redis = super.buildPythonPackage {
-    name = "redis-2.10.6";
-    buildInputs = with self; [];
+  "python-memcached" = super.buildPythonPackage {
+    name = "python-memcached-1.59";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/09/8d/6d34b75326bf96d4139a2ddd8e74b80840f800a0a79f9294399e212cb9a7/redis-2.10.6.tar.gz";
-      md5 = "048348d8cfe0b5d0bba2f4d835005c3b";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  repoze.lru = super.buildPythonPackage {
-    name = "repoze.lru-0.7";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/12/bc/595a77c4b5e204847fdf19268314ef59c85193a9dc9f83630fc459c0fee5/repoze.lru-0.7.tar.gz";
-      md5 = "c08cc030387e0b1fc53c5c7d964b35e2";
-    };
-    meta = {
-      license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
-    };
-  };
-  requests = super.buildPythonPackage {
-    name = "requests-2.9.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/f9/6d/07c44fb1ebe04d069459a189e7dab9e4abfe9432adcd4477367c25332748/requests-2.9.1.tar.gz";
-      md5 = "0b7f480d19012ec52bab78292efd976d";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
-    };
-  };
-  rhodecode-enterprise-ce = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.12.4";
-    buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage configobj];
-    doCheck = true;
-    propagatedBuildInputs = with self; [setuptools-scm amqp authomatic Babel Beaker celery Chameleon channelstream click colander configobj cssselect decorator deform docutils dogpile.cache dogpile.core ecdsa FormEncode future futures gnureadline infrae.cache iso8601 itsdangerous Jinja2 billiard kombu lxml Mako Markdown MarkupSafe msgpack-python MySQL-python objgraph packaging Paste PasteDeploy PasteScript pathlib2 peppercorn psutil psycopg2 py-bcrypt pycrypto pycurl pyflakes pygments-markdown-lexer Pygments pyparsing pyramid-beaker pyramid-debugtoolbar pyramid-jinja2 pyramid-mako pyramid pysqlite python-dateutil python-ldap python-memcached python-pam pytz tzlocal pyzmq py-gfm redis repoze.lru requests Routes setproctitle simplejson six SQLAlchemy sshpubkeys subprocess32 supervisor Tempita translationstring trollius urllib3 URLObject venusian WebError WebHelpers2 WebHelpers WebOb Whoosh wsgiref zope.cachedescriptors zope.deprecation zope.event zope.interface nbconvert bleach nbformat jupyter-client alembic invoke bumpversion transifex-client gevent greenlet gunicorn waitress uWSGI ipdb ipython CProfileV bottle rhodecode-tools appenlight-client pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage];
-    src = ./.;
-    meta = {
-      license = [ { fullName = "Affero GNU General Public License v3 or later (AGPLv3+)"; } { fullName = "AGPLv3, and Commercial License"; } ];
-    };
-  };
-  rhodecode-tools = super.buildPythonPackage {
-    name = "rhodecode-tools-0.14.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [click future six Mako MarkupSafe requests elasticsearch elasticsearch-dsl urllib3 Whoosh];
-    src = fetchurl {
-      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.14.1.tar.gz?md5=0b9c2caad160b68889f8172ea54af7b2";
-      md5 = "0b9c2caad160b68889f8172ea54af7b2";
-    };
-    meta = {
-      license = [ { fullName = "AGPLv3 and Proprietary"; } ];
-    };
-  };
-  scandir = super.buildPythonPackage {
-    name = "scandir-1.7";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/13/bb/e541b74230bbf7a20a3949a2ee6631be299378a784f5445aa5d0047c192b/scandir-1.7.tar.gz";
-      md5 = "037e5f24d1a0e78b17faca72dea9555f";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "New BSD License"; } ];
-    };
-  };
-  setproctitle = super.buildPythonPackage {
-    name = "setproctitle-1.1.10";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/5a/0d/dc0d2234aacba6cf1a729964383e3452c52096dc695581248b548786f2b3/setproctitle-1.1.10.tar.gz";
-      md5 = "2dcdd1b761700a5a13252fea3dfd1977";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  setuptools = super.buildPythonPackage {
-    name = "setuptools-30.1.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/1e/43/002c8616db9a3e7be23c2556e39b90a32bb40ba0dc652de1999d5334d372/setuptools-30.1.0.tar.gz";
-      md5 = "cac497f42e5096ac8df29e38d3f81c3e";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  setuptools-scm = super.buildPythonPackage {
-    name = "setuptools-scm-1.15.6";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/03/6d/aafdd01edd227ee879b691455bf19895091872af7e48192bea1758c82032/setuptools_scm-1.15.6.tar.gz";
-      md5 = "f17493d53f0d842bb0152f214775640b";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  simplegeneric = super.buildPythonPackage {
-    name = "simplegeneric-0.8.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip";
-      md5 = "f9c1fab00fd981be588fc32759f474e3";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
-    };
-  };
-  simplejson = super.buildPythonPackage {
-    name = "simplejson-3.11.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/08/48/c97b668d6da7d7bebe7ea1817a6f76394b0ec959cb04214ca833c34359df/simplejson-3.11.1.tar.gz";
-      md5 = "6e2f1bd5fb0a926facf5d89d217a7183";
-    };
-    meta = {
-      license = [ { fullName = "Academic Free License (AFL)"; } pkgs.lib.licenses.mit ];
-    };
-  };
-  six = super.buildPythonPackage {
-    name = "six-1.11.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
-      md5 = "d12789f9baf7e9fb2524c0c64f1773f8";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  sshpubkeys = super.buildPythonPackage {
-    name = "sshpubkeys-2.2.0";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [pycrypto ecdsa];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/27/da/337fabeb3dca6b62039a93ceaa636f25065e0ae92b575b1235342076cf0a/sshpubkeys-2.2.0.tar.gz";
-      md5 = "458e45f6b92b1afa84f0ffe1f1c90935";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  subprocess32 = super.buildPythonPackage {
-    name = "subprocess32-3.2.7";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/b8/2f/49e53b0d0e94611a2dc624a1ad24d41b6d94d0f1b0a078443407ea2214c2/subprocess32-3.2.7.tar.gz";
-      md5 = "824c801e479d3e916879aae3e9c15e16";
+      url = "https://files.pythonhosted.org/packages/90/59/5faf6e3cd8a568dd4f737ddae4f2e54204fd8c51f90bf8df99aca6c22318/python-memcached-1.59.tar.gz";
+      sha256 = "0kvyapavbirk2x3n1jx4yb9nyigrj1s3x15nm3qhpvhkpqvqdqm2";
     };
     meta = {
       license = [ pkgs.lib.licenses.psfl ];
     };
   };
-  supervisor = super.buildPythonPackage {
-    name = "supervisor-3.3.4";
-    buildInputs = with self; [];
+  "python-pam" = super.buildPythonPackage {
+    name = "python-pam-1.8.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [meld3];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/44/60/698e54b4a4a9b956b2d709b4b7b676119c833d811d53ee2500f1b5e96dc3/supervisor-3.3.4.tar.gz";
-      md5 = "f1814d71d820ddfa8c86d46a72314cec";
+      url = "https://files.pythonhosted.org/packages/01/16/544d01cae9f28e0292dbd092b6b8b0bf222b528f362ee768a5bed2140111/python-pam-1.8.4.tar.gz";
+      sha256 = "16whhc0vr7gxsbzvsnq65nq8fs3wwmx755cavm8kkczdkz4djmn8";
+    };
+    meta = {
+      license = [ { fullName = "License :: OSI Approved :: MIT License"; } pkgs.lib.licenses.mit ];
+    };
+  };
+  "pytz" = super.buildPythonPackage {
+    name = "pytz-2018.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/10/76/52efda4ef98e7544321fd8d5d512e11739c1df18b0649551aeccfb1c8376/pytz-2018.4.tar.gz";
+      sha256 = "0jgpqx3kk2rhv81j1izjxvmx8d0x7hzs1857pgqnixic5wq2ar60";
     };
     meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  termcolor = super.buildPythonPackage {
-    name = "termcolor-1.1.0";
-    buildInputs = with self; [];
+  "pyzmq" = super.buildPythonPackage {
+    name = "pyzmq-14.6.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz";
-      md5 = "043e89644f8909d462fbbfa511c768df";
+      url = "https://files.pythonhosted.org/packages/8a/3b/5463d5a9d712cd8bbdac335daece0d69f6a6792da4e3dd89956c0db4e4e6/pyzmq-14.6.0.tar.gz";
+      sha256 = "1frmbjykvhmdg64g7sn20c9fpamrsfxwci1nhhg8q7jgz5pq0ikp";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "LGPL+BSD"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
+    };
+  };
+  "redis" = super.buildPythonPackage {
+    name = "redis-2.10.6";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/09/8d/6d34b75326bf96d4139a2ddd8e74b80840f800a0a79f9294399e212cb9a7/redis-2.10.6.tar.gz";
+      sha256 = "03vcgklykny0g0wpvqmy8p6azi2s078317wgb2xjv5m2rs9sjb52";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  testpath = super.buildPythonPackage {
-    name = "testpath-0.3.1";
-    buildInputs = with self; [];
+  "repoze.lru" = super.buildPythonPackage {
+    name = "repoze.lru-0.7";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/12/bc/595a77c4b5e204847fdf19268314ef59c85193a9dc9f83630fc459c0fee5/repoze.lru-0.7.tar.gz";
+      sha256 = "0xzz1aw2smy8hdszrq8yhnklx6w1r1mf55061kalw3iq35gafa84";
+    };
+    meta = {
+      license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
+  };
+  "requests" = super.buildPythonPackage {
+    name = "requests-2.9.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f4/8b/b71e9ee10e5f751e9d959bc750ab122ba04187f5aa52aabdc4e63b0e31a7/testpath-0.3.1.tar.gz";
-      md5 = "2cd5ed5522fda781bb497c9d80ae2fc9";
+      url = "https://files.pythonhosted.org/packages/f9/6d/07c44fb1ebe04d069459a189e7dab9e4abfe9432adcd4477367c25332748/requests-2.9.1.tar.gz";
+      sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "rhodecode-enterprise-ce" = super.buildPythonPackage {
+    name = "rhodecode-enterprise-ce-4.13.0";
+    buildInputs = [
+      self."pytest"
+      self."py"
+      self."pytest-cov"
+      self."pytest-sugar"
+      self."pytest-runner"
+      self."pytest-profiling"
+      self."gprof2dot"
+      self."pytest-timeout"
+      self."mock"
+      self."webtest"
+      self."cov-core"
+      self."coverage"
+      self."configobj"
+    ];
+    doCheck = true;
+    propagatedBuildInputs = [
+      self."setuptools-scm"
+      self."amqp"
+      self."authomatic"
+      self."babel"
+      self."beaker"
+      self."celery"
+      self."chameleon"
+      self."channelstream"
+      self."click"
+      self."colander"
+      self."configobj"
+      self."cssselect"
+      self."decorator"
+      self."deform"
+      self."docutils"
+      self."dogpile.cache"
+      self."dogpile.core"
+      self."ecdsa"
+      self."formencode"
+      self."future"
+      self."futures"
+      self."gnureadline"
+      self."infrae.cache"
+      self."iso8601"
+      self."itsdangerous"
+      self."jinja2"
+      self."billiard"
+      self."kombu"
+      self."lxml"
+      self."mako"
+      self."markdown"
+      self."markupsafe"
+      self."msgpack-python"
+      self."mysql-python"
+      self."pymysql"
+      self."pyotp"
+      self."objgraph"
+      self."packaging"
+      self."paste"
+      self."pastedeploy"
+      self."pastescript"
+      self."pathlib2"
+      self."peppercorn"
+      self."psutil"
+      self."psycopg2"
+      self."py-bcrypt"
+      self."pycrypto"
+      self."pycurl"
+      self."pyflakes"
+      self."pygments-markdown-lexer"
+      self."pygments"
+      self."pyparsing"
+      self."pyramid-beaker"
+      self."pyramid-debugtoolbar"
+      self."pyramid-jinja2"
+      self."pyramid-mako"
+      self."pyramid"
+      self."pysqlite"
+      self."python-dateutil"
+      self."python-ldap"
+      self."python-memcached"
+      self."python-pam"
+      self."pytz"
+      self."tzlocal"
+      self."pyzmq"
+      self."py-gfm"
+      self."redis"
+      self."repoze.lru"
+      self."requests"
+      self."routes"
+      self."setproctitle"
+      self."simplejson"
+      self."six"
+      self."sqlalchemy"
+      self."sshpubkeys"
+      self."subprocess32"
+      self."supervisor"
+      self."tempita"
+      self."translationstring"
+      self."trollius"
+      self."urllib3"
+      self."urlobject"
+      self."venusian"
+      self."weberror"
+      self."webhelpers2"
+      self."webhelpers"
+      self."webob"
+      self."whoosh"
+      self."wsgiref"
+      self."zope.cachedescriptors"
+      self."zope.deprecation"
+      self."zope.event"
+      self."zope.interface"
+      self."nbconvert"
+      self."bleach"
+      self."nbformat"
+      self."jupyter-client"
+      self."alembic"
+      self."invoke"
+      self."bumpversion"
+      self."gevent"
+      self."greenlet"
+      self."gunicorn"
+      self."waitress"
+      self."ipdb"
+      self."ipython"
+      self."cprofilev"
+      self."bottle"
+      self."rhodecode-tools"
+      self."appenlight-client"
+      self."pytest"
+      self."py"
+      self."pytest-cov"
+      self."pytest-sugar"
+      self."pytest-runner"
+      self."pytest-profiling"
+      self."gprof2dot"
+      self."pytest-timeout"
+      self."mock"
+      self."webtest"
+      self."cov-core"
+      self."coverage"
+    ];
+    src = ./.;
+    meta = {
+      license = [ { fullName = "Affero GNU General Public License v3 or later (AGPLv3+)"; } { fullName = "AGPLv3, and Commercial License"; } ];
+    };
+  };
+  "rhodecode-tools" = super.buildPythonPackage {
+    name = "rhodecode-tools-0.16.0";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."click"
+      self."future"
+      self."six"
+      self."mako"
+      self."markupsafe"
+      self."requests"
+      self."elasticsearch"
+      self."elasticsearch-dsl"
+      self."urllib3"
+      self."whoosh"
+    ];
+    src = fetchurl {
+      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.16.0.tar.gz?md5=87f81286b49156c2ac36f1a1acfa2164";
+      sha256 = "00xcc2mj99lx9d0ksml0p2xrd00kf5ypwyigg58cc9j9bznx7mzr";
+    };
+    meta = {
+      license = [ { fullName = "AGPLv3 and Proprietary"; } ];
+    };
+  };
+  "routes" = super.buildPythonPackage {
+    name = "routes-2.4.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."six"
+      self."repoze.lru"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/33/38/ea827837e68d9c7dde4cff7ec122a93c319f0effc08ce92a17095576603f/Routes-2.4.1.tar.gz";
+      sha256 = "1zamff3m0kc4vyfniyhxpkkcqv1rrgnmh37ykxv34nna1ws47vi6";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  traitlets = super.buildPythonPackage {
-    name = "traitlets-4.3.2";
-    buildInputs = with self; [];
+  "scandir" = super.buildPythonPackage {
+    name = "scandir-1.9.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [ipython-genutils six decorator enum34];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a5/98/7f5ef2fe9e9e071813aaf9cb91d1a732e0a68b6c44a32b38cb8e14c3f069/traitlets-4.3.2.tar.gz";
-      md5 = "3068663f2f38fd939a9eb3a500ccc154";
+      url = "https://files.pythonhosted.org/packages/16/2a/557af1181e6b4e30254d5a6163b18f5053791ca66e251e77ab08887e8fe3/scandir-1.9.0.tar.gz";
+      sha256 = "0r3hvf1a9jm1rkqgx40gxkmccknkaiqjavs8lccgq9s8khh5x5s4";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "New BSD License"; } ];
+    };
+  };
+  "setproctitle" = super.buildPythonPackage {
+    name = "setproctitle-1.1.10";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/5a/0d/dc0d2234aacba6cf1a729964383e3452c52096dc695581248b548786f2b3/setproctitle-1.1.10.tar.gz";
+      sha256 = "163kplw9dcrw0lffq1bvli5yws3rngpnvrxrzdw89pbphjjvg0v2";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  transifex-client = super.buildPythonPackage {
-    name = "transifex-client-0.12.5";
-    buildInputs = with self; [];
+  "setuptools" = super.buildPythonPackage {
+    name = "setuptools-40.1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [urllib3 six];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/7b/86/60f31a0c9b8d0b1266ce15b6c80b55f88522140c8acfc395d5aec5e23475/transifex-client-0.12.5.tar.gz";
-      md5 = "e6e278117b23f60702c06e203b7e51ae";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.gpl2 ];
-    };
-  };
-  translationstring = super.buildPythonPackage {
-    name = "translationstring-1.3";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/5e/eb/bee578cc150b44c653b63f5ebe258b5d0d812ddac12497e5f80fcad5d0b4/translationstring-1.3.tar.gz";
-      md5 = "a4b62e0f3c189c783a1685b3027f7c90";
+      url = "https://files.pythonhosted.org/packages/5a/df/b2e3d9693bb0dcbeac516a73dd7a9eb82b126ae52e4a74605a9b01beddd5/setuptools-40.1.0.zip";
+      sha256 = "0w1blx5ajga5y15dci0mddk49cf2xpq0mp7rp7jrqr2diqk00ib6";
     };
     meta = {
-      license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
+      license = [ pkgs.lib.licenses.mit ];
     };
   };
-  trollius = super.buildPythonPackage {
-    name = "trollius-1.0.4";
-    buildInputs = with self; [];
+  "setuptools-scm" = super.buildPythonPackage {
+    name = "setuptools-scm-2.1.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [futures];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/aa/e6/4141db437f55e6ee7a3fb69663239e3fde7841a811b4bef293145ad6c836/trollius-1.0.4.tar.gz";
-      md5 = "3631a464d49d0cbfd30ab2918ef2b783";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
-    };
-  };
-  tzlocal = super.buildPythonPackage {
-    name = "tzlocal-1.5.1";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [pytz];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/cb/89/e3687d3ed99bc882793f82634e9824e62499fdfdc4b1ae39e211c5b05017/tzlocal-1.5.1.tar.gz";
-      md5 = "4553be891efa0812c4adfb0c6e818eec";
+      url = "https://files.pythonhosted.org/packages/e5/62/f9e1ac314464eb5945c97542acb6bf6f3381dfa5d7a658de7730c36f31a1/setuptools_scm-2.1.0.tar.gz";
+      sha256 = "0yb364cgk15sfw3x8ln4ssh98z1dj6n8iiz4r2rw1cfsxhgi8rx7";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  uWSGI = super.buildPythonPackage {
-    name = "uWSGI-2.0.15";
-    buildInputs = with self; [];
+  "simplegeneric" = super.buildPythonPackage {
+    name = "simplegeneric-0.8.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/bb/0a/45e5aa80dc135889594bb371c082d20fb7ee7303b174874c996888cc8511/uwsgi-2.0.15.tar.gz";
-      md5 = "fc50bd9e83b7602fa474b032167010a7";
+      url = "https://files.pythonhosted.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip";
+      sha256 = "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.zpl21 ];
+    };
+  };
+  "simplejson" = super.buildPythonPackage {
+    name = "simplejson-3.11.1";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/08/48/c97b668d6da7d7bebe7ea1817a6f76394b0ec959cb04214ca833c34359df/simplejson-3.11.1.tar.gz";
+      sha256 = "1rr58dppsq73p0qcd9bsw066cdd3v63sqv7j6sqni8frvm4jv8h1";
     };
     meta = {
-      license = [ pkgs.lib.licenses.gpl2 ];
+      license = [ { fullName = "Academic Free License (AFL)"; } pkgs.lib.licenses.mit ];
     };
   };
-  urllib3 = super.buildPythonPackage {
-    name = "urllib3-1.16";
-    buildInputs = with self; [];
+  "six" = super.buildPythonPackage {
+    name = "six-1.11.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/3b/f0/e763169124e3f5db0926bc3dbfcd580a105f9ca44cf5d8e6c7a803c9f6b5/urllib3-1.16.tar.gz";
-      md5 = "fcaab1c5385c57deeb7053d3d7d81d59";
+      url = "https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
+      sha256 = "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "sqlalchemy" = super.buildPythonPackage {
+    name = "sqlalchemy-1.1.18";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/cc/4d/96d93ff77cd67aca7618e402191eee3490d8f5f245d6ab7622d35fe504f4/SQLAlchemy-1.1.18.tar.gz";
+      sha256 = "1ab4ysip6irajfbxl9wy27kv76miaz8h6759hfx92499z4dcf3lb";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  venusian = super.buildPythonPackage {
-    name = "venusian-1.1.0";
-    buildInputs = with self; [];
+  "sshpubkeys" = super.buildPythonPackage {
+    name = "sshpubkeys-2.2.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."pycrypto"
+      self."ecdsa"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/38/24/b4b470ab9e0a2e2e9b9030c7735828c8934b4c6b45befd1bb713ec2aeb2d/venusian-1.1.0.tar.gz";
-      md5 = "56bc5e6756e4bda37bcdb94f74a72b8f";
-    };
-    meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
-    };
-  };
-  vine = super.buildPythonPackage {
-    name = "vine-1.1.4";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/32/23/36284986e011f3c130d802c3c66abd8f1aef371eae110ddf80c5ae22e1ff/vine-1.1.4.tar.gz";
-      md5 = "9fdb971e7fd15b181b84f3bfcf20d11c";
+      url = "https://files.pythonhosted.org/packages/27/da/337fabeb3dca6b62039a93ceaa636f25065e0ae92b575b1235342076cf0a/sshpubkeys-2.2.0.tar.gz";
+      sha256 = "0r4kpwzmg96a2x56pllik7dmc3fnqk189v3sfgsi07q2ryrhr6xm";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  waitress = super.buildPythonPackage {
-    name = "waitress-1.1.0";
-    buildInputs = with self; [];
+  "subprocess32" = super.buildPythonPackage {
+    name = "subprocess32-3.5.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/3c/68/1c10dd5c556872ceebe88483b0436140048d39de83a84a06a8baa8136f4f/waitress-1.1.0.tar.gz";
-      md5 = "0f1eb7fdfdbf2e6d18decbda1733045c";
+      url = "https://files.pythonhosted.org/packages/de/fb/fd3e91507021e2aecdb081d1b920082628d6b8869ead845e3e87b3d2e2ca/subprocess32-3.5.1.tar.gz";
+      sha256 = "0wgi3bfnssid1g6h0v803z3k1wjal6il16nr3r9c587cfzwfkv0q";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
+      license = [ pkgs.lib.licenses.psfl ];
+    };
+  };
+  "supervisor" = super.buildPythonPackage {
+    name = "supervisor-3.3.4";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."meld3"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/44/60/698e54b4a4a9b956b2d709b4b7b676119c833d811d53ee2500f1b5e96dc3/supervisor-3.3.4.tar.gz";
+      sha256 = "0wp62z9xprvz2krg02xnbwcnq6pxfq3byd8cxx8c2d8xznih28i1";
+    };
+    meta = {
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  wcwidth = super.buildPythonPackage {
-    name = "wcwidth-0.1.7";
-    buildInputs = with self; [];
+  "tempita" = super.buildPythonPackage {
+    name = "tempita-0.5.2";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/55/11/e4a2bb08bb450fdbd42cc709dd40de4ed2c472cf0ccb9e64af22279c5495/wcwidth-0.1.7.tar.gz";
-      md5 = "b3b6a0a08f0c8a34d1de8cf44150a4ad";
+      url = "https://files.pythonhosted.org/packages/56/c8/8ed6eee83dbddf7b0fc64dd5d4454bc05e6ccaafff47991f73f2894d9ff4/Tempita-0.5.2.tar.gz";
+      sha256 = "177wwq45slfyajd8csy477bmdmzipyw0dm7i85k3akb7m85wzkna";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "termcolor" = super.buildPythonPackage {
+    name = "termcolor-1.1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz";
+      sha256 = "0fv1vq14rpqwgazxg4981904lfyp84mnammw7y046491cv76jv8x";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  webencodings = super.buildPythonPackage {
-    name = "webencodings-0.5.1";
-    buildInputs = with self; [];
+  "testpath" = super.buildPythonPackage {
+    name = "testpath-0.3.1";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/f4/8b/b71e9ee10e5f751e9d959bc750ab122ba04187f5aa52aabdc4e63b0e31a7/testpath-0.3.1.tar.gz";
+      sha256 = "02bnmkvm6a8a1p5kcygylcd19v2s040qw3zp1n8ab3bqkj1kflqd";
+    };
+    meta = {
+      license = [  ];
+    };
+  };
+  "traitlets" = super.buildPythonPackage {
+    name = "traitlets-4.3.2";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."ipython-genutils"
+      self."six"
+      self."decorator"
+      self."enum34"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/a5/98/7f5ef2fe9e9e071813aaf9cb91d1a732e0a68b6c44a32b38cb8e14c3f069/traitlets-4.3.2.tar.gz";
+      sha256 = "0dbq7sx26xqz5ixs711k5nc88p8a0nqyz6162pwks5dpcz9d4jww";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "translationstring" = super.buildPythonPackage {
+    name = "translationstring-1.3";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/5e/eb/bee578cc150b44c653b63f5ebe258b5d0d812ddac12497e5f80fcad5d0b4/translationstring-1.3.tar.gz";
+      sha256 = "0bdpcnd9pv0131dl08h4zbcwmgc45lyvq3pa224xwan5b3x4rr2f";
+    };
+    meta = {
+      license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
+    };
+  };
+  "trollius" = super.buildPythonPackage {
+    name = "trollius-1.0.4";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."futures"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/aa/e6/4141db437f55e6ee7a3fb69663239e3fde7841a811b4bef293145ad6c836/trollius-1.0.4.tar.gz";
+      sha256 = "0xny8y12x3wrflmyn6xi8a7n3m3ac80fgmgzphx5jbbaxkjcm148";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
+  };
+  "tzlocal" = super.buildPythonPackage {
+    name = "tzlocal-1.5.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."pytz"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/cb/89/e3687d3ed99bc882793f82634e9824e62499fdfdc4b1ae39e211c5b05017/tzlocal-1.5.1.tar.gz";
+      sha256 = "0kiciwiqx0bv0fbc913idxibc4ygg4cb7f8rcpd9ij2shi4bigjf";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "urllib3" = super.buildPythonPackage {
+    name = "urllib3-1.21";
+    doCheck = false;
     src = fetchurl {
-      url = "https://pypi.python.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz";
-      md5 = "32f6e261d52e57bf7e1c4d41546d15b8";
+      url = "https://files.pythonhosted.org/packages/34/95/7b28259d0006ed681c424cd71a668363265eac92b67dddd018eb9a22bff8/urllib3-1.21.tar.gz";
+      sha256 = "0irnj4wvh2y36s4q3l2vas9qr9m766w6w418nb490j3mf8a8zw6h";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "urlobject" = super.buildPythonPackage {
+    name = "urlobject-2.4.3";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/e2/b8/1d0a916f4b34c4618846e6da0e4eeaa8fcb4a2f39e006434fe38acb74b34/URLObject-2.4.3.tar.gz";
+      sha256 = "1ahc8ficzfvr2avln71immfh4ls0zyv6cdaa5xmkdj5rd87f5cj7";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.publicDomain ];
+    };
+  };
+  "venusian" = super.buildPythonPackage {
+    name = "venusian-1.1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/38/24/b4b470ab9e0a2e2e9b9030c7735828c8934b4c6b45befd1bb713ec2aeb2d/venusian-1.1.0.tar.gz";
+      sha256 = "0zapz131686qm0gazwy8bh11vr57pr89jbwbl50s528sqy9f80lr";
+    };
+    meta = {
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
+  };
+  "vine" = super.buildPythonPackage {
+    name = "vine-1.1.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/32/23/36284986e011f3c130d802c3c66abd8f1aef371eae110ddf80c5ae22e1ff/vine-1.1.4.tar.gz";
+      sha256 = "0wkskb2hb494v9gixqnf4bl972p4ibcmxdykzpwjlfa5picns4aj";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  ws4py = super.buildPythonPackage {
-    name = "ws4py-0.4.3";
-    buildInputs = with self; [];
+  "waitress" = super.buildPythonPackage {
+    name = "waitress-1.1.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/3c/68/1c10dd5c556872ceebe88483b0436140048d39de83a84a06a8baa8136f4f/waitress-1.1.0.tar.gz";
+      sha256 = "1a85gyji0kajc3p0s1pwwfm06w4wfxjkvvl4rnrz3h164kbd6g6k";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.zpl21 ];
+    };
+  };
+  "wcwidth" = super.buildPythonPackage {
+    name = "wcwidth-0.1.7";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/55/11/e4a2bb08bb450fdbd42cc709dd40de4ed2c472cf0ccb9e64af22279c5495/wcwidth-0.1.7.tar.gz";
+      sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "webencodings" = super.buildPythonPackage {
+    name = "webencodings-0.5.1";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/fa/a1/33c43a4304ac3b4dc81deb93cbd329de9297dd034d75c47cce64fda806bc/ws4py-0.4.3.tar.gz";
-      md5 = "d5834cf7d3965bb0da31bbb02bd8513a";
+      url = "https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz";
+      sha256 = "08qrgrc4hrximb2gqnl69g01s93rhf2842jfxdjljc1dbwj1qsmk";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "weberror" = super.buildPythonPackage {
+    name = "weberror-0.10.3";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."webob"
+      self."tempita"
+      self."pygments"
+      self."paste"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/35/76/e7e5c2ce7e9c7f31b54c1ff295a495886d1279a002557d74dd8957346a79/WebError-0.10.3.tar.gz";
+      sha256 = "0frg4kvycqpj5bi8asfqfs6bxsr2cvjvb6b56c4d1ai1z57kbjx6";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "webhelpers" = super.buildPythonPackage {
+    name = "webhelpers-1.3";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."markupsafe"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ee/68/4d07672821d514184357f1552f2dad923324f597e722de3b016ca4f7844f/WebHelpers-1.3.tar.gz";
+      sha256 = "10x5i82qdkrvyw18gsybwggfhfpl869siaab89vnndi9x62g51pa";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  wsgiref = super.buildPythonPackage {
-    name = "wsgiref-0.1.2";
-    buildInputs = with self; [];
+  "webhelpers2" = super.buildPythonPackage {
+    name = "webhelpers2-2.0";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."markupsafe"
+      self."six"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ff/30/56342c6ea522439e3662427c8d7b5e5b390dff4ff2dc92d8afcb8ab68b75/WebHelpers2-2.0.tar.gz";
+      sha256 = "0aphva1qmxh83n01p53f5fd43m4srzbnfbz5ajvbx9aj2aipwmcs";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "webob" = super.buildPythonPackage {
+    name = "webob-1.7.4";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/75/34/731e23f52371852dfe7490a61644826ba7fe70fd52a377aaca0f4956ba7f/WebOb-1.7.4.tar.gz";
+      sha256 = "1na01ljg04z40il7vcrn8g29vaw7nvg1xvhk64cr4jys5wcay44d";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "webtest" = super.buildPythonPackage {
+    name = "webtest-2.0.29";
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = [
+      self."six"
+      self."webob"
+      self."waitress"
+      self."beautifulsoup4"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/94/de/8f94738be649997da99c47b104aa3c3984ecec51a1d8153ed09638253d56/WebTest-2.0.29.tar.gz";
+      sha256 = "0bcj1ica5lnmj5zbvk46x28kgphcsgh7sfnwjmn0cr94mhawrg6v";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
+  "whoosh" = super.buildPythonPackage {
+    name = "whoosh-2.7.4";
+    doCheck = false;
     src = fetchurl {
-      url = "https://pypi.python.org/packages/41/9e/309259ce8dff8c596e8c26df86dbc4e848b9249fd36797fd60be456f03fc/wsgiref-0.1.2.zip";
-      md5 = "29b146e6ebd0f9fb119fe321f7bcf6cb";
+      url = "https://files.pythonhosted.org/packages/25/2b/6beed2107b148edc1321da0d489afc4617b9ed317ef7b72d4993cad9b684/Whoosh-2.7.4.tar.gz";
+      sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.bsd2 ];
+    };
+  };
+  "ws4py" = super.buildPythonPackage {
+    name = "ws4py-0.5.1";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/53/20/4019a739b2eefe9282d3822ef6a225250af964b117356971bd55e274193c/ws4py-0.5.1.tar.gz";
+      sha256 = "10slbbf2jm4hpr92jx7kh7mhf48sjl01v2w4d8z3f1p0ybbp7l19";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "wsgiref" = super.buildPythonPackage {
+    name = "wsgiref-0.1.2";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/41/9e/309259ce8dff8c596e8c26df86dbc4e848b9249fd36797fd60be456f03fc/wsgiref-0.1.2.zip";
+      sha256 = "0y8fyjmpq7vwwm4x732w97qbkw78rjwal5409k04cw4m03411rn7";
     };
     meta = {
       license = [ { fullName = "PSF or ZPL"; } ];
     };
   };
-  zope.cachedescriptors = super.buildPythonPackage {
+  "zope.cachedescriptors" = super.buildPythonPackage {
     name = "zope.cachedescriptors-4.3.1";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools];
+    propagatedBuildInputs = [
+      self."setuptools"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/2f/89/ebe1890cc6d3291ebc935558fa764d5fffe571018dbbee200e9db78762cb/zope.cachedescriptors-4.3.1.tar.gz";
-      md5 = "42f3693f43bc93f3b1eb86940f58acf3";
+      url = "https://files.pythonhosted.org/packages/2f/89/ebe1890cc6d3291ebc935558fa764d5fffe571018dbbee200e9db78762cb/zope.cachedescriptors-4.3.1.tar.gz";
+      sha256 = "0jhr3m5p74c6r7k8iv0005b8bfsialih9d7zl5vx38rf5xq1lk8z";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
+      license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
-  zope.deprecation = super.buildPythonPackage {
+  "zope.deprecation" = super.buildPythonPackage {
     name = "zope.deprecation-4.3.0";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools];
+    propagatedBuildInputs = [
+      self."setuptools"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a1/18/2dc5e6bfe64fdc3b79411b67464c55bb0b43b127051a20f7f492ab767758/zope.deprecation-4.3.0.tar.gz";
-      md5 = "2166b2cb7e0e96a21104e6f8f9b696bb";
+      url = "https://files.pythonhosted.org/packages/a1/18/2dc5e6bfe64fdc3b79411b67464c55bb0b43b127051a20f7f492ab767758/zope.deprecation-4.3.0.tar.gz";
+      sha256 = "095jas41wbxgmw95kwdxqhbc3bgihw2hzj9b3qpdg85apcsf2lkx";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
+      license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
-  zope.event = super.buildPythonPackage {
+  "zope.event" = super.buildPythonPackage {
     name = "zope.event-4.3.0";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools];
+    propagatedBuildInputs = [
+      self."setuptools"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/9e/d0/54ba59f19a0635f6591b74be259cf6fbf67e73f4edda27b5cd0cf4d26efa/zope.event-4.3.0.tar.gz";
-      md5 = "8ca737960741c6fd112972f3313303bd";
+      url = "https://files.pythonhosted.org/packages/9e/d0/54ba59f19a0635f6591b74be259cf6fbf67e73f4edda27b5cd0cf4d26efa/zope.event-4.3.0.tar.gz";
+      sha256 = "1rrkyx42bcq8dkpj23c2v99kczlrg8d39c06q5qpr0vs4hjfmv70";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
+      license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
-  zope.interface = super.buildPythonPackage {
-    name = "zope.interface-4.4.3";
-    buildInputs = with self; [];
+  "zope.interface" = super.buildPythonPackage {
+    name = "zope.interface-4.5.0";
     doCheck = false;
-    propagatedBuildInputs = with self; [setuptools];
+    propagatedBuildInputs = [
+      self."setuptools"
+    ];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/bd/d2/25349ed41f9dcff7b3baf87bd88a4c82396cf6e02f1f42bb68657a3132af/zope.interface-4.4.3.tar.gz";
-      md5 = "8700a4f527c1203b34b10c2b4e7a6912";
+      url = "https://files.pythonhosted.org/packages/ac/8a/657532df378c2cd2a1fe6b12be3b4097521570769d4852ec02c24bd3594e/zope.interface-4.5.0.tar.gz";
+      sha256 = "0k67m60ij06wkg82n15qgyn96waf4pmrkhv0njpkfzpmv5q89hsp";
     };
     meta = {
-      license = [ pkgs.lib.licenses.zpt21 ];
+      license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
 
diff --git a/pkgs/shell-generate.nix b/pkgs/shell-generate.nix
new file mode 100755
--- /dev/null
+++ b/pkgs/shell-generate.nix
@@ -0,0 +1,53 @@
+{ pkgs ? (import <nixpkgs> {})
+, pythonPackages ? "python27Packages"
+}:
+
+with pkgs.lib;
+
+let _pythonPackages = pythonPackages; in
+let
+  pythonPackages = getAttr _pythonPackages pkgs;
+
+  pip2nix = import ./nix-common/pip2nix.nix {
+    inherit
+      pkgs
+      pythonPackages;
+  };
+
+in
+
+pkgs.stdenv.mkDerivation {
+  name = "pip2nix-generated";
+  buildInputs = [
+    # Allows to generate python packages
+    pip2nix.pip2nix
+    pythonPackages.pip-tools
+
+    # Allows to generate bower dependencies
+    pkgs.nodePackages.bower2nix
+
+    # Allows to generate node dependencies
+    pkgs.nodePackages.node2nix
+
+    # We need mysql_config to be around
+    pkgs.mysql
+
+    # We need postgresql to be around
+    pkgs.postgresql
+
+    # Curl is needed for pycurl
+    pkgs.curl
+  ];
+
+  shellHook = ''
+    runHook preShellHook
+    runHook postShellHook
+  '';
+
+  preShellHook = ''
+    echo "Starting Generate Shell"
+    # Custom prompt to distinguish from other dev envs.
+    export PS1="\n\[\033[1;32m\][Generate-shell:\w]$\[\033[0m\] "
+    export PYCURL_SSL_LIBRARY=openssl
+  '';
+}
diff --git a/pytest.ini b/pytest.ini
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,7 @@
 [pytest]
 testpaths = rhodecode
 norecursedirs = rhodecode/public rhodecode/templates tests/scripts
+cache_dir = /tmp/.pytest_cache
 
 pyramid_config = rhodecode/tests/rhodecode.ini
 vcsserver_protocol = http
diff --git a/release.nix b/release.nix
--- a/release.nix
+++ b/release.nix
@@ -1,232 +1,21 @@
-#
-# About
-# =====
-#
-# This file defines jobs for our CI system and the attribute "build" is used
-# as the input for packaging.
-#
-#
-# CI details
-# ==========
-#
-# This file defines an attribute set of derivations. Each of these attributes is
-# then used in our CI system as one job to run. This way we keep the
-# configuration for the CI jobs as well under version control.
-#
-# Run CI jobs locally
-# -------------------
-#
-# Since it is all based on normal Nix derivations, the jobs can be tested
-# locally with a run of "nix-build" like the following example:
-#
-#    nix-build release.nix -A test-api -I vcsserver=~/rhodecode-vcsserver
-#
-# Note: Replace "~/rhodecode-vcsserver" with a path where a clone of the
-# vcsserver resides.
+# This file defines how to "build" for packaging.
 
 { pkgs ? import <nixpkgs> {}
-, doCheck ? true
+, doCheck ? false
 }:
 
 let
-
-  inherit (pkgs)
-    stdenv
-    system;
-
-  testing = import <nixpkgs/nixos/lib/testing.nix> {
-    inherit system;
-  };
-
-  runInMachine = testing.runInMachine;
-
-  sphinx = import ./docs/default.nix {};
-
-  mkDocs = kind: stdenv.mkDerivation {
-    name = kind;
-    srcs = [
-      (./. + (builtins.toPath "/${kind}"))
-      (builtins.filterSource
-        (path: type: baseNameOf path == "VERSION")
-        ./rhodecode)
-    ];
-    sourceRoot = kind;
-    buildInputs = [ sphinx ];
-    configurePhase = null;
-    buildPhase = ''
-      make SPHINXBUILD=sphinx-build html
-    '';
-    installPhase = ''
-      mkdir -p $out
-      mv _build/html $out/
-
-      mkdir -p $out/nix-support
-      echo "doc manual $out/html index.html" >> \
-        "$out/nix-support/hydra-build-products"
-    '';
-  };
-
-  enterprise = import ./default.nix {
+  enterprise_ce = import ./default.nix {
     inherit
+      doCheck
       pkgs;
 
-    # TODO: for quick local testing
-    doCheck = false;
-  };
+    # disable checkPhase for build
+    checkPhase = ''
+    '';
 
-  test-cfg = stdenv.mkDerivation {
-    name = "test-cfg";
-    unpackPhase = "true";
-    buildInputs = [
-      enterprise.src
-    ];
-    installPhase = ''
-      mkdir -p $out/etc
-      cp ${enterprise.src}/test.ini $out/etc/enterprise.ini
-      # TODO: johbo: Needed, so that the login works, this causes
-      # probably some side effects
-      substituteInPlace $out/etc/enterprise.ini --replace "is_test = True" ""
-
-      # Gevent configuration
-      cp $out/etc/enterprise.ini $out/etc/enterprise-gevent.ini;
-      cat >> $out/etc/enterprise-gevent.ini <<EOF
-
-      [server:main]
-      use = egg:gunicorn#main
-      worker_class = gevent
-      EOF
-
-      cp ${enterprise.src}/vcsserver/test.ini $out/etc/vcsserver.ini
-    '';
-  };
-
-  ac-test-drv = import ./acceptance_tests {
-    withExternals = false;
   };
 
-  # TODO: johbo: Currently abusing buildPythonPackage to make the
-  # needed environment for the ac-test tools.
-  mkAcTests = {
-    # Path to an INI file which will be used to run Enterprise.
-    #
-    # Intended usage is to provide different configuration files to
-    # run the tests against a different configuration.
-    enterpriseCfg ? "${test-cfg}/etc/enterprise.ini"
-
-    # Path to an INI file which will be used to run the VCSServer.
-  , vcsserverCfg ? "${test-cfg}/etc/vcsserver.ini"
-  }: pkgs.pythonPackages.buildPythonPackage {
-    name = "enterprise-ac-tests";
-    src = ./acceptance_tests;
-
-    buildInputs = with pkgs; [
-      curl
-      enterprise
-      ac-test-drv
-    ];
-
-    buildPhase = ''
-      cp ${enterpriseCfg} enterprise.ini
-
-      echo "Creating a fake home directory"
-      mkdir fake-home
-      export HOME=$PWD/fake-home
-
-      echo "Creating a repository directory"
-      mkdir repos
-
-      echo "Preparing the database"
-      rc-setup-app \
-        --user=admin \
-        --email=admin@example.com \
-        --password=secret \
-        --api-key=9999999999999999999999999999999999999999 \
-        --force-yes \
-        --repos=$PWD/repos \
-        enterprise.ini > /dev/null
-
-      echo "Starting rc-server"
-      vcsserver --config ${vcsserverCfg} >vcsserver.log 2>&1 &
-      rc-server enterprise.ini >rc-server.log 2>&1 &
-
-      while ! curl -f -s http://localhost:5000 > /dev/null
-      do
-          echo "Waiting for server to be ready..."
-          sleep 3
-      done
-      echo "Webserver is ready."
-
-      echo "Starting the test run"
-      py.test -c example.ini -vs --maxfail=5 tests
-
-      echo "Kill rc-server"
-      kill %2
-      kill %1
-    '';
-
-    # TODO: johbo: Use the install phase again once the normal mkDerivation
-    # can be used again.
-    postInstall = ''
-      mkdir -p $out
-      cp enterprise.ini $out
-      cp ${vcsserverCfg} $out/vcsserver.ini
-      cp rc-server.log $out
-      cp vcsserver.log $out
-
-      mkdir -p $out/nix-support
-      echo "report config $out enterprise.ini" >> $out/nix-support/hydra-build-products
-      echo "report config $out vcsserver.ini" >> $out/nix-support/hydra-build-products
-      echo "report rc-server $out rc-server.log" >> $out/nix-support/hydra-build-products
-      echo "report vcsserver $out vcsserver.log" >> $out/nix-support/hydra-build-products
-    '';
-  };
-
-  vcsserver = import <vcsserver> {
-    inherit pkgs;
-
-    # TODO: johbo: Think of a more elegant solution to this problem
-    pythonExternalOverrides = self: super: (enterprise.myPythonPackagesUnfix self);
-  };
-
-  runTests = optionString: (enterprise.override (attrs: {
-    doCheck = true;
-    name = "test-run";
-    buildInputs = attrs.buildInputs ++ [
-      vcsserver
-    ];
-    checkPhase = ''
-      py.test ${optionString} -vv -ra
-    '';
-    buildPhase = attrs.shellHook;
-    installPhase = ''
-      echo "Intentionally not installing anything"
-    '';
-    meta.description = "Enterprise test run ${optionString}";
-  }));
-
-  jobs = {
-
-    build = enterprise;
-
-    # johbo: Currently this is simply running the tests against the sources. Nicer
-    # would be to run xdist and against the installed application, so that we also
-    # cover the impact of installing the application.
-    test-api = runTests "rhodecode/api";
-    test-functional = runTests "rhodecode/tests/functional";
-    test-rest = runTests "rhodecode/tests --ignore=rhodecode/tests/functional";
-    test-full = runTests "rhodecode";
-
-    docs = mkDocs "docs";
-
-    aggregate = pkgs.releaseTools.aggregate {
-      name = "aggregated-jobs";
-      constituents = [
-        jobs.build
-        jobs.test-api
-        jobs.test-rest
-        jobs.docs
-      ];
-    };
-  };
-
-in jobs
+in {
+  build = enterprise_ce;
+}
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,129 +1,129 @@
-## core
-setuptools==30.1.0
-setuptools-scm==1.15.6
+## dependencies
 
-amqp==2.2.2
+setuptools-scm==2.1.0
+amqp==2.3.1
 # not released authomatic that has updated some oauth providers
 https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801#egg=authomatic==0.1.0.post1
-Babel==1.3
-Beaker==1.9.1
-celery==4.1.0
-Chameleon==2.24
+babel==1.3
+beaker==1.9.1
+celery==4.1.1
+chameleon==2.24
 channelstream==0.5.2
 click==6.6
 colander==1.4.0
-configobj==5.0.6
-cssselect==1.0.1
+# our custom configobj
+https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c#egg=configobj==5.0.6
+cssselect==1.0.3
 decorator==4.1.2
-deform==2.0.4
+deform==2.0.5
 docutils==0.14.0
-dogpile.cache==0.6.4
+dogpile.cache==0.6.6
 dogpile.core==0.4.1
 ecdsa==0.13
-FormEncode==1.2.4
+formencode==1.2.4
 future==0.14.3
 futures==3.0.2
 gnureadline==6.3.8
 infrae.cache==1.0.1
-iso8601==0.1.12
+iso8601==0.1.11
 itsdangerous==0.24
-Jinja2==2.9.6
+jinja2==2.9.6
 billiard==3.5.0.3
-kombu==4.1.0
+kombu==4.2.0
 lxml==3.7.3
-Mako==1.0.7
-Markdown==2.6.11
-MarkupSafe==1.0.0
-msgpack-python==0.4.8
-MySQL-python==1.2.5
+mako==1.0.7
+markdown==2.6.11
+markupsafe==1.0.0
+msgpack-python==0.5.6
+mysql-python==1.2.5
+pymysql==0.8.1
+pyotp==2.2.6
 objgraph==3.1.1
 packaging==15.2
-Paste==2.0.3
-PasteDeploy==1.5.2
-PasteScript==2.0.2
+paste==2.0.3
+pastedeploy==1.5.2
+pastescript==2.0.2
 pathlib2==2.3.0
 peppercorn==0.5
-psutil==5.4.3
-psycopg2==2.7.3.2
+psutil==5.4.6
+psycopg2==2.7.4
 py-bcrypt==0.4
 pycrypto==2.6.1
-pycurl==7.19.5
+pycurl==7.43.0.2
 pyflakes==0.8.1
 pygments-markdown-lexer==0.1.0.dev39
-Pygments==2.2.0
+pygments==2.2.0
 pyparsing==1.5.7
 pyramid-beaker==0.8
-pyramid-debugtoolbar==4.3.0
+pyramid-debugtoolbar==4.4.0
 pyramid-jinja2==2.7
 pyramid-mako==1.0.2
-pyramid==1.9.1
+pyramid==1.9.2
 pysqlite==2.8.3
 python-dateutil
-python-ldap==2.4.45
-python-memcached==1.58
-python-pam==1.8.2
-pytz==2018.3
+python-ldap==3.1.0
+python-memcached==1.59
+python-pam==1.8.4
+pytz==2018.4
 tzlocal==1.5.1
 pyzmq==14.6.0
 py-gfm==0.1.3
 redis==2.10.6
 repoze.lru==0.7
 requests==2.9.1
-Routes==2.4.1
+routes==2.4.1
 setproctitle==1.1.10
 simplejson==3.11.1
 six==1.11.0
-SQLAlchemy==1.1.15
+sqlalchemy==1.1.18
 sshpubkeys==2.2.0
-subprocess32==3.2.7
+subprocess32==3.5.1
 supervisor==3.3.4
-Tempita==0.5.2
+tempita==0.5.2
 translationstring==1.3
 trollius==1.0.4
-urllib3==1.16
-URLObject==2.4.0
+urllib3==1.21
+urlobject==2.4.3
 venusian==1.1.0
-WebError==0.10.3
-WebHelpers2==2.0
-WebHelpers==1.3
-WebOb==1.7.4
-Whoosh==2.7.4
+weberror==0.10.3
+webhelpers2==2.0
+webhelpers==1.3
+webob==1.7.4
+whoosh==2.7.4
 wsgiref==0.1.2
 zope.cachedescriptors==4.3.1
 zope.deprecation==4.3.0
 zope.event==4.3.0
-zope.interface==4.4.3
+zope.interface==4.5.0
 
 
 # IPYTHON RENDERING
 # entrypoints backport, pypi version doesn't support egg installs
 https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313#egg=entrypoints==0.2.2.rhodecode-upstream1
 nbconvert==5.3.1
-bleach==2.1.2
+bleach==2.1.4
 nbformat==4.4.0
 jupyter_client==5.0.0
 
 ## cli tools
-alembic==0.9.8
+alembic==0.9.9
 invoke==0.13.0
 bumpversion==0.5.3
-transifex-client==0.12.5
 
 ## http servers
-gevent==1.2.2
+gevent==1.3.5
 greenlet==0.4.13
-gunicorn==19.7.1
+gunicorn==19.9.0
 waitress==1.1.0
-uWSGI==2.0.15
 
 ## debug
-ipdb==0.10.3
+ipdb==0.11.0
 ipython==5.1.0
-CProfileV==1.0.7
+cprofilev==1.0.7
 bottle==0.12.13
 
 ## rhodecode-tools, special case
-https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.14.1.tar.gz?md5=0b9c2caad160b68889f8172ea54af7b2#egg=rhodecode-tools==0.14.1
+https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.16.0.tar.gz?md5=87f81286b49156c2ac36f1a1acfa2164#egg=rhodecode-tools==0.16.0
 
 ## appenlight
 appenlight-client==0.6.25
diff --git a/requirements_test.txt b/requirements_test.txt
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,15 +1,14 @@
 # test related requirements
-pytest==3.2.5
-py==1.5.2
+pytest==3.6.0
+py==1.5.3
 pytest-cov==2.5.1
-pytest-sugar==0.9.0
-pytest-runner==3.0.0
-pytest-catchlog==1.2.2
-pytest-profiling==1.2.11
+pytest-sugar==0.9.1
+pytest-runner==4.2.0
+pytest-profiling==1.3.0
 gprof2dot==2017.9.19
-pytest-timeout==1.2.0
+pytest-timeout==1.2.1
 
 mock==1.0.1
-WebTest==2.0.29
+webtest==2.0.29
 cov-core==1.15.0
 coverage==3.7.1
diff --git a/rhodecode/VERSION b/rhodecode/VERSION
--- a/rhodecode/VERSION
+++ b/rhodecode/VERSION
@@ -1,1 +1,1 @@
-4.12.4
\ No newline at end of file
+4.13.0
\ No newline at end of file
diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -51,7 +51,7 @@ PYRAMID_SETTINGS = {}
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 86  # defines current db version for migrations
+__dbversion__ = 90  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'
diff --git a/rhodecode/api/__init__.py b/rhodecode/api/__init__.py
--- a/rhodecode/api/__init__.py
+++ b/rhodecode/api/__init__.py
@@ -208,6 +208,7 @@ def request_view(request):
 
         # register our auth-user
         request.rpc_user = auth_u
+        request.environ['rc_auth_user_id'] = auth_u.user_id
 
         # now check if token is valid for API
         auth_token = request.rpc_api_key
diff --git a/rhodecode/api/tests/test_create_pull_request.py b/rhodecode/api/tests/test_create_pull_request.py
--- a/rhodecode/api/tests/test_create_pull_request.py
+++ b/rhodecode/api/tests/test_create_pull_request.py
@@ -119,6 +119,7 @@ class TestCreatePullRequestApi(object):
              'mandatory': True},
         ]
         data['reviewers'] = reviewers
+
         id_, params = build_data(
             self.apikey_regular, 'create_pull_request', **data)
         response = api_call(self.app, params)
@@ -251,8 +252,9 @@ class TestCreatePullRequestApi(object):
         id_, params = build_data(
             self.apikey_regular, 'create_pull_request', **data)
         response = api_call(self.app, params)
-        expected_message = 'The specified branch `{}` does not exist'.format(
-            branch_name)
+        expected_message = 'The specified value:{type}:`{name}` ' \
+                           'does not exist, or is not allowed.'.format(type='branch',
+                                                                       name=branch_name)
         assert_error(id_, expected_message, given=response.body)
 
     @pytest.mark.backends("git", "hg")
@@ -316,6 +318,7 @@ class TestCreatePullRequestApi(object):
         self.commit_ids = backend.create_master_repo(commits)
         self.source = backend.create_repo(heads=[source_head])
         self.target = backend.create_repo(heads=[target_head])
+
         data = {
             'source_repo': self.source.repo_name,
             'target_repo': self.target.repo_name,
diff --git a/rhodecode/api/tests/test_update_user.py b/rhodecode/api/tests/test_update_user.py
--- a/rhodecode/api/tests/test_update_user.py
+++ b/rhodecode/api/tests/test_update_user.py
@@ -76,6 +76,8 @@ class TestUpdateUser(object):
             'user': ret
         }
         expected = ret
+        expected['user']['last_activity'] = response.json['result']['user'][
+            'last_activity']
         assert_ok(id_, expected, given=response.body)
 
     def test_api_update_user_by_user_id(self):
@@ -91,6 +93,8 @@ class TestUpdateUser(object):
             'user': ret
         }
         expected = ret
+        expected['user']['last_activity'] = response.json['result']['user'][
+            'last_activity']
         assert_ok(id_, expected, given=response.body)
 
     def test_api_update_user_default_user(self):
diff --git a/rhodecode/api/tests/test_utils.py b/rhodecode/api/tests/test_utils.py
--- a/rhodecode/api/tests/test_utils.py
+++ b/rhodecode/api/tests/test_utils.py
@@ -87,7 +87,8 @@ class TestResolveRefOrError(object):
         ref = 'ancestor:ref'
         with pytest.raises(JSONRPCError) as excinfo:
             utils.resolve_ref_or_error(ref, repo)
-        expected_message = 'The specified ancestor `ref` does not exist'
+        expected_message = (
+            'The specified value:ancestor:`ref` does not exist, or is not allowed.')
         assert excinfo.value.message == expected_message
 
     def test_branch_is_not_found(self):
@@ -99,7 +100,7 @@ class TestResolveRefOrError(object):
             with pytest.raises(JSONRPCError) as excinfo:
                 utils.resolve_ref_or_error(ref, repo)
         expected_message = (
-            'The specified branch `non-existing-one` does not exist')
+            'The specified value:branch:`non-existing-one` does not exist, or is not allowed.')
         assert excinfo.value.message == expected_message
 
     def test_bookmark_is_not_found(self):
@@ -111,7 +112,7 @@ class TestResolveRefOrError(object):
             with pytest.raises(JSONRPCError) as excinfo:
                 utils.resolve_ref_or_error(ref, repo)
         expected_message = (
-            'The specified bookmark `non-existing-one` does not exist')
+            'The specified value:bookmark:`non-existing-one` does not exist, or is not allowed.')
         assert excinfo.value.message == expected_message
 
     @pytest.mark.parametrize("ref", ['ref', '12345', 'a:b:c:d'])
diff --git a/rhodecode/api/utils.py b/rhodecode/api/utils.py
--- a/rhodecode/api/utils.py
+++ b/rhodecode/api/utils.py
@@ -403,7 +403,7 @@ def resolve_ref_or_error(ref, repo):
         ref_hash = ref_hash or _get_ref_hash(repo, ref_type, ref_name)
     except (KeyError, ValueError):
         raise JSONRPCError(
-            'The specified {type} `{name}` does not exist'.format(
+            'The specified value:{type}:`{name}` does not exist, or is not allowed.'.format(
                 type=ref_type, name=ref_name))
 
     return ':'.join([ref_type, ref_name, ref_hash])
@@ -431,7 +431,6 @@ def _get_commit_dict(
     }
 
 
-# TODO: mikhail: Think about moving this function to some library
 def _get_ref_hash(repo, type_, name):
     vcs_repo = repo.scm_instance()
     if type_ == 'branch' and vcs_repo.alias in ('hg', 'git'):
diff --git a/rhodecode/api/views/pull_request_api.py b/rhodecode/api/views/pull_request_api.py
--- a/rhodecode/api/views/pull_request_api.py
+++ b/rhodecode/api/views/pull_request_api.py
@@ -284,7 +284,7 @@ def merge_pull_request(
             raise JSONRPCError('userid is not the same as your user')
 
     check = MergeCheck.validate(
-        pull_request, user=apiuser, translator=request.translate)
+        pull_request, auth_user=apiuser, translator=request.translate)
     merge_possible = not check.failed
 
     if not merge_possible:
@@ -302,7 +302,7 @@ def merge_pull_request(
         request.environ, repo_name=target_repo.repo_name,
         username=apiuser.username, action='push',
         scm=target_repo.repo_type)
-    merge_response = PullRequestModel().merge(
+    merge_response = PullRequestModel().merge_repo(
         pull_request, apiuser, extras=extras)
     if merge_response.executed:
         PullRequestModel().close_pull_request(
@@ -548,7 +548,8 @@ def comment_pull_request(
         closing_pr=False,
         renderer=renderer,
         comment_type=comment_type,
-        resolves_comment_id=resolves_comment_id
+        resolves_comment_id=resolves_comment_id,
+        auth_user=apiuser
     )
 
     if allowed_to_change_status and status:
@@ -573,7 +574,8 @@ def comment_pull_request(
 @jsonrpc_method()
 def create_pull_request(
         request, apiuser, source_repo, target_repo, source_ref, target_ref,
-        title=Optional(''), description=Optional(''), reviewers=Optional(None)):
+        title=Optional(''), description=Optional(''), description_renderer=Optional(''),
+        reviewers=Optional(None)):
     """
     Creates a new pull request.
 
@@ -598,6 +600,10 @@ def create_pull_request(
     :type title: str
     :param description: Set the pull request description.
     :type description: Optional(str)
+    :type description_renderer: Optional(str)
+    :param description_renderer: Set pull request renderer for the description.
+        It should be 'rst', 'markdown' or 'plain'. If not give default
+        system renderer will be used
     :param reviewers: Set the new pull request reviewers list.
         Reviewer defined by review rules will be added automatically to the
         defined list.
@@ -607,7 +613,7 @@ def create_pull_request(
             [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
     """
 
-    source_db_repo =  get_repo_or_error(source_repo)
+    source_db_repo = get_repo_or_error(source_repo)
     target_db_repo = get_repo_or_error(target_repo)
     if not has_superadmin_permission(apiuser):
         _perms = ('repository.admin', 'repository.write', 'repository.read',)
@@ -678,7 +684,11 @@ def create_pull_request(
             source_ref=title_source_ref,
             target=target_repo
         )
+    # fetch renderer, if set fallback to plain in case of PR
+    rc_config = SettingsModel().get_all_settings()
+    default_system_renderer = rc_config.get('rhodecode_markup_renderer', 'plain')
     description = Optional.extract(description)
+    description_renderer = Optional.extract(description_renderer) or default_system_renderer
 
     pull_request = PullRequestModel().create(
         created_by=apiuser.user_id,
@@ -690,7 +700,9 @@ def create_pull_request(
         reviewers=reviewers,
         title=title,
         description=description,
+        description_renderer=description_renderer,
         reviewer_data=reviewer_rules,
+        auth_user=apiuser
     )
 
     Session().commit()
@@ -704,8 +716,8 @@ def create_pull_request(
 @jsonrpc_method()
 def update_pull_request(
         request, apiuser, pullrequestid, repoid=Optional(None),
-        title=Optional(''), description=Optional(''), reviewers=Optional(None),
-        update_commits=Optional(None)):
+        title=Optional(''), description=Optional(''), description_renderer=Optional(''),
+        reviewers=Optional(None), update_commits=Optional(None)):
     """
     Updates a pull request.
 
@@ -719,6 +731,9 @@ def update_pull_request(
     :type title: str
     :param description: Update pull request description.
     :type description: Optional(str)
+    :type description_renderer: Optional(str)
+    :param description_renderer: Update pull request renderer for the description.
+        It should be 'rst', 'markdown' or 'plain'
     :param reviewers: Update pull request reviewers list with new value.
     :type reviewers: Optional(list)
         Accepts username strings or objects of the format:
@@ -801,10 +816,15 @@ def update_pull_request(
 
     title = Optional.extract(title)
     description = Optional.extract(description)
+    description_renderer = Optional.extract(description_renderer)
+
     if title or description:
         PullRequestModel().edit(
-            pull_request, title or pull_request.title,
-            description or pull_request.description, apiuser)
+            pull_request,
+            title or pull_request.title,
+            description or pull_request.description,
+            description_renderer or pull_request.description_renderer,
+            apiuser)
         Session().commit()
 
     commit_changes = {"added": [], "common": [], "removed": []}
diff --git a/rhodecode/api/views/repo_api.py b/rhodecode/api/views/repo_api.py
--- a/rhodecode/api/views/repo_api.py
+++ b/rhodecode/api/views/repo_api.py
@@ -1469,7 +1469,8 @@ def comment_commit(
             status_change_type=status,
             renderer=renderer,
             comment_type=comment_type,
-            resolves_comment_id=resolves_comment_id
+            resolves_comment_id=resolves_comment_id,
+            auth_user=apiuser
         )
         if status:
             # also do a status change
diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -461,31 +461,38 @@ class RepoRoutePredicate(object):
     phash = text
 
     def __call__(self, info, request):
-
         if hasattr(request, 'vcs_call'):
             # skip vcs calls
             return
 
         repo_name = info['match']['repo_name']
         repo_model = repo.RepoModel()
-        by_name_match = repo_model.get_by_repo_name(repo_name, cache=True)
+
+        by_name_match = repo_model.get_by_repo_name(repo_name, cache=False)
 
-        def redirect_if_creating(db_repo):
+        def redirect_if_creating(route_info, db_repo):
+            skip_views = ['edit_repo_advanced_delete']
+            route = route_info['route']
+            # we should skip delete view so we can actually "remove" repositories
+            # if they get stuck in creating state.
+            if route.name in skip_views:
+                return
+
             if db_repo.repo_state in [repo.Repository.STATE_PENDING]:
-                raise HTTPFound(
-                    request.route_path('repo_creating',
-                                       repo_name=db_repo.repo_name))
+                repo_creating_url = request.route_path(
+                    'repo_creating', repo_name=db_repo.repo_name)
+                raise HTTPFound(repo_creating_url)
 
         if by_name_match:
             # register this as request object we can re-use later
             request.db_repo = by_name_match
-            redirect_if_creating(by_name_match)
+            redirect_if_creating(info, by_name_match)
             return True
 
         by_id_match = repo_model.get_repo_by_id(repo_name)
         if by_id_match:
             request.db_repo = by_id_match
-            redirect_if_creating(by_id_match)
+            redirect_if_creating(info, by_id_match)
             return True
 
         return False
@@ -516,7 +523,7 @@ class RepoTypeRoutePredicate(object):
         else:
             log.warning('Current view is not supported for repo type:%s',
                         rhodecode_db_repo.repo_type)
-            #
+
             # h.flash(h.literal(
             #     _('Action not supported for %s.' % rhodecode_repo.alias)),
             #     category='warning')
@@ -542,8 +549,7 @@ class RepoGroupRoutePredicate(object):
 
         repo_group_name = info['match']['repo_group_name']
         repo_group_model = repo_group.RepoGroupModel()
-        by_name_match = repo_group_model.get_by_group_name(
-            repo_group_name, cache=True)
+        by_name_match = repo_group_model.get_by_group_name(repo_group_name, cache=False)
 
         if by_name_match:
             # register this as request object we can re-use later
@@ -569,8 +575,7 @@ class UserGroupRoutePredicate(object):
 
         user_group_id = info['match']['user_group_id']
         user_group_model = user_group.UserGroup()
-        by_id_match = user_group_model.get(
-            user_group_id, cache=True)
+        by_id_match = user_group_model.get(user_group_id, cache=False)
 
         if by_id_match:
             # register this as request object we can re-use later
@@ -596,8 +601,7 @@ class UserRoutePredicateBase(object):
 
         user_id = info['match']['user_id']
         user_model = user.User()
-        by_id_match = user_model.get(
-            user_id, cache=True)
+        by_id_match = user_model.get(user_id, cache=False)
 
         if by_id_match:
             # register this as request object we can re-use later
diff --git a/rhodecode/apps/admin/__init__.py b/rhodecode/apps/admin/__init__.py
--- a/rhodecode/apps/admin/__init__.py
+++ b/rhodecode/apps/admin/__init__.py
@@ -60,6 +60,19 @@ def admin_routes(config):
         pattern='/settings/system/updates')
 
     config.add_route(
+        name='admin_settings_exception_tracker',
+        pattern='/settings/exceptions')
+    config.add_route(
+        name='admin_settings_exception_tracker_delete_all',
+        pattern='/settings/exceptions/delete')
+    config.add_route(
+        name='admin_settings_exception_tracker_show',
+        pattern='/settings/exceptions/{exception_id}')
+    config.add_route(
+        name='admin_settings_exception_tracker_delete',
+        pattern='/settings/exceptions/{exception_id}/delete')
+
+    config.add_route(
         name='admin_settings_sessions',
         pattern='/settings/sessions')
     config.add_route(
@@ -197,6 +210,11 @@ def admin_routes(config):
         name='admin_permissions_object_update',
         pattern='/permissions/object/update')
 
+    # Branch perms EE feature
+    config.add_route(
+        name='admin_permissions_branch',
+        pattern='/permissions/branch')
+
     config.add_route(
         name='admin_permissions_ips',
         pattern='/permissions/ips')
@@ -356,6 +374,16 @@ def admin_routes(config):
         name='edit_user_audit_logs',
         pattern='/users/{user_id:\d+}/edit/audit', user_route=True)
 
+    # user caches
+    config.add_route(
+        name='edit_user_caches',
+        pattern='/users/{user_id:\d+}/edit/caches',
+        user_route=True)
+    config.add_route(
+        name='edit_user_caches_update',
+        pattern='/users/{user_id:\d+}/edit/caches/update',
+        user_route=True)
+
     # user-groups admin
     config.add_route(
         name='user_groups',
@@ -410,5 +438,7 @@ def includeme(config):
     config.add_route(name='admin_home', pattern=ADMIN_PREFIX)
     config.include(admin_routes, route_prefix=ADMIN_PREFIX)
 
+    config.include('.subscribers')
+
     # Scan module for configuration decorators.
     config.scan('.views', ignore='.tests')
diff --git a/rhodecode/apps/admin/navigation.py b/rhodecode/apps/admin/navigation.py
--- a/rhodecode/apps/admin/navigation.py
+++ b/rhodecode/apps/admin/navigation.py
@@ -89,6 +89,9 @@ class NavigationRegistry(object):
                  'global_integrations_home'),
         NavEntry('system', _('System Info'),
                  'admin_settings_system'),
+        NavEntry('exceptions', _('Exceptions Tracker'),
+                 'admin_settings_exception_tracker',
+                 active_list=['exceptions', 'exceptions_browse']),
         NavEntry('process_management', _('Processes'),
                  'admin_settings_process_management'),
         NavEntry('sessions', _('User Sessions'),
diff --git a/rhodecode/apps/admin/subscribers.py b/rhodecode/apps/admin/subscribers.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/apps/admin/subscribers.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+
+from rhodecode import events
+from rhodecode.lib import rc_cache
+
+log = logging.getLogger(__name__)
+
+
+def trigger_user_permission_flush(event):
+    """
+    Subscriber to the `UserPermissionsChange`. This triggers the
+    automatic flush of permission caches, so the users affected receive new permissions
+    Right Away
+    """
+
+    affected_user_ids = set(event.user_ids)
+    for user_id in affected_user_ids:
+        cache_namespace_uid = 'cache_user_auth.{}'.format(user_id)
+        del_keys = rc_cache.clear_cache_namespace('cache_perms', cache_namespace_uid)
+        log.debug('Deleted %s cache keys for user_id: %s', del_keys, user_id)
+
+
+def includeme(config):
+    config.add_subscriber(trigger_user_permission_flush, events.UserPermissionsChange)
diff --git a/rhodecode/apps/admin/tests/test_admin_main_views.py b/rhodecode/apps/admin/tests/test_admin_main_views.py
--- a/rhodecode/apps/admin/tests/test_admin_main_views.py
+++ b/rhodecode/apps/admin/tests/test_admin_main_views.py
@@ -67,6 +67,7 @@ class TestAdminMainView(TestController):
         self.log_user()
         pull_request = pr_util.create_pull_request()
         pull_request_id = pull_request.pull_request_id
+        repo_name = pull_request.target_repo.repo_name
 
         response = self.app.get(
             route_path(view, pull_request_id=pull_request_id),
@@ -74,9 +75,8 @@ class TestAdminMainView(TestController):
         assert response.location.endswith(
             'pull-request/{}'.format(pull_request_id))
 
-        repo_name = pull_request.target_repo.repo_name
         redirect_url = route_path(
             'pullrequest_show', repo_name=repo_name,
-            pull_request_id=pull_request.pull_request_id)
+            pull_request_id=pull_request_id)
 
         assert redirect_url in response.location
diff --git a/rhodecode/apps/admin/tests/test_admin_permissions.py b/rhodecode/apps/admin/tests/test_admin_permissions.py
--- a/rhodecode/apps/admin/tests/test_admin_permissions.py
+++ b/rhodecode/apps/admin/tests/test_admin_permissions.py
@@ -25,7 +25,7 @@ from rhodecode.model.meta import Session
 from rhodecode.model.permission import PermissionModel
 from rhodecode.model.ssh_key import SshKeyModel
 from rhodecode.tests import (
-    TestController, clear_all_caches, assert_session_flash)
+    TestController, clear_cache_regions, assert_session_flash)
 
 
 def route_path(name, params=None, **kwargs):
@@ -221,22 +221,21 @@ class TestAdminPermissionsController(Tes
     def test_index_ips(self):
         self.log_user()
         response = self.app.get(route_path('admin_permissions_ips'))
-        # TODO: Test response...
         response.mustcontain('All IP addresses are allowed')
 
     def test_add_delete_ips(self):
+        clear_cache_regions(['sql_cache_short'])
         self.log_user()
-        clear_all_caches()
 
         # ADD
         default_user_id = User.get_default_user().user_id
         self.app.post(
             route_path('edit_user_ips_add', user_id=default_user_id),
-            params={'new_ip': '127.0.0.0/24', 'csrf_token': self.csrf_token})
+            params={'new_ip': '0.0.0.0/24', 'csrf_token': self.csrf_token})
 
         response = self.app.get(route_path('admin_permissions_ips'))
-        response.mustcontain('127.0.0.0/24')
-        response.mustcontain('127.0.0.0 - 127.0.0.255')
+        response.mustcontain('0.0.0.0/24')
+        response.mustcontain('0.0.0.0 - 0.0.0.255')
 
         # DELETE
         default_user_id = User.get_default_user().user_id
@@ -249,11 +248,11 @@ class TestAdminPermissionsController(Tes
 
         assert_session_flash(response, 'Removed ip address from user whitelist')
 
-        clear_all_caches()
+        clear_cache_regions(['sql_cache_short'])
         response = self.app.get(route_path('admin_permissions_ips'))
         response.mustcontain('All IP addresses are allowed')
-        response.mustcontain(no=['127.0.0.0/24'])
-        response.mustcontain(no=['127.0.0.0 - 127.0.0.255'])
+        response.mustcontain(no=['0.0.0.0/24'])
+        response.mustcontain(no=['0.0.0.0 - 0.0.0.255'])
 
     def test_index_overview(self):
         self.log_user()
diff --git a/rhodecode/apps/admin/tests/test_admin_repos.py b/rhodecode/apps/admin/tests/test_admin_repos.py
--- a/rhodecode/apps/admin/tests/test_admin_repos.py
+++ b/rhodecode/apps/admin/tests/test_admin_repos.py
@@ -72,10 +72,11 @@ class TestAdminRepos(object):
 
     def test_repo_list(self, autologin_user, user_util):
         repo = user_util.create_repo()
+        repo_name = repo.repo_name
         response = self.app.get(
             route_path('repos'), status=200)
 
-        response.mustcontain(repo.repo_name)
+        response.mustcontain(repo_name)
 
     def test_create_page_restricted_to_single_backend(self, autologin_user, backend):
         with mock.patch('rhodecode.BACKENDS', {'git': 'git'}):
@@ -226,12 +227,14 @@ class TestAdminRepos(object):
                                      group_description='test',
                                      owner=TEST_USER_ADMIN_LOGIN)
         Session().commit()
+        repo_group_id = gr.group_id
 
         group_name_allowed = 'reg_sometest_allowed_%s' % backend.alias
         gr_allowed = RepoGroupModel().create(
             group_name=group_name_allowed,
             group_description='test',
             owner=TEST_USER_REGULAR_LOGIN)
+        allowed_repo_group_id = gr_allowed.group_id
         Session().commit()
 
         repo_name = 'ingroup'
@@ -243,7 +246,7 @@ class TestAdminRepos(object):
                 repo_name=repo_name,
                 repo_type=backend.alias,
                 repo_description=description,
-                repo_group=gr.group_id,
+                repo_group=repo_group_id,
                 csrf_token=csrf_token))
 
         response.mustcontain('Invalid value')
@@ -260,7 +263,7 @@ class TestAdminRepos(object):
                 repo_name=repo_name,
                 repo_type=backend.alias,
                 repo_description=description,
-                repo_group=gr_allowed.group_id,
+                repo_group=allowed_repo_group_id,
                 csrf_token=csrf_token))
 
         # TODO: johbo: Cleanup in pytest fixture
@@ -293,7 +296,7 @@ class TestAdminRepos(object):
 
         # add repo permissions
         Session().commit()
-
+        repo_group_id = gr.group_id
         repo_name = 'ingroup_inherited_%s' % backend.alias
         repo_name_full = RepoGroup.url_sep().join([group_name, repo_name])
         description = 'description for newly created repo'
@@ -304,7 +307,7 @@ class TestAdminRepos(object):
                 repo_name=repo_name,
                 repo_type=backend.alias,
                 repo_description=description,
-                repo_group=gr.group_id,
+                repo_group=repo_group_id,
                 repo_copy_permissions=True,
                 csrf_token=csrf_token))
 
diff --git a/rhodecode/apps/admin/tests/test_admin_user_groups.py b/rhodecode/apps/admin/tests/test_admin_user_groups.py
--- a/rhodecode/apps/admin/tests/test_admin_user_groups.py
+++ b/rhodecode/apps/admin/tests/test_admin_user_groups.py
@@ -167,4 +167,4 @@ class TestAdminUserGroupsView(TestContro
             'csrf_token': self.csrf_token}, status=200)
 
         response.mustcontain(
-            'User group `{}` already exists'.format(user_group.users_group_name))
+            'User group `{}` already exists'.format(duplicate_name))
diff --git a/rhodecode/apps/admin/tests/test_admin_users.py b/rhodecode/apps/admin/tests/test_admin_users.py
--- a/rhodecode/apps/admin/tests/test_admin_users.py
+++ b/rhodecode/apps/admin/tests/test_admin_users.py
@@ -137,9 +137,11 @@ class TestAdminUsersView(TestController)
         self.log_user()
 
         user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
+        user_id = user.user_id
+        auth_tokens = user.auth_tokens
         response = self.app.get(
-            route_path('edit_user_auth_tokens', user_id=user.user_id))
-        for token in user.auth_tokens:
+            route_path('edit_user_auth_tokens', user_id=user_id))
+        for token in auth_tokens:
             response.mustcontain(token)
             response.mustcontain('never')
 
diff --git a/rhodecode/apps/admin/views/exception_tracker.py b/rhodecode/apps/admin/views/exception_tracker.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/apps/admin/views/exception_tracker.py
@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2018-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+import os
+import logging
+
+from pyramid.httpexceptions import HTTPFound
+from pyramid.view import view_config
+
+from rhodecode.apps._base import BaseAppView
+from rhodecode.apps.admin.navigation import navigation_list
+from rhodecode.lib import helpers as h
+from rhodecode.lib.auth import (
+    LoginRequired, HasPermissionAllDecorator, CSRFRequired)
+from rhodecode.lib.utils2 import time_to_utcdatetime, safe_int
+from rhodecode.lib import exc_tracking
+
+log = logging.getLogger(__name__)
+
+
+class ExceptionsTrackerView(BaseAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        c.navlist = navigation_list(self.request)
+        return c
+
+    def count_all_exceptions(self):
+        exc_store_path = exc_tracking.get_exc_store()
+        count = 0
+        for fname in os.listdir(exc_store_path):
+            parts = fname.split('_', 2)
+            if not len(parts) == 3:
+                continue
+            count +=1
+        return count
+
+    def get_all_exceptions(self, read_metadata=False, limit=None):
+        exc_store_path = exc_tracking.get_exc_store()
+        exception_list = []
+
+        def key_sorter(val):
+            try:
+                return val.split('_')[-1]
+            except Exception:
+                return 0
+        count = 0
+        for fname in reversed(sorted(os.listdir(exc_store_path), key=key_sorter)):
+
+            parts = fname.split('_', 2)
+            if not len(parts) == 3:
+                continue
+
+            exc_id, app_type, exc_timestamp = parts
+
+            exc = {'exc_id': exc_id, 'app_type': app_type, 'exc_type': 'unknown',
+                   'exc_utc_date': '', 'exc_timestamp': exc_timestamp}
+
+            if read_metadata:
+                full_path = os.path.join(exc_store_path, fname)
+                # we can read our metadata
+                with open(full_path, 'rb') as f:
+                    exc_metadata = exc_tracking.exc_unserialize(f.read())
+                    exc.update(exc_metadata)
+
+            # convert our timestamp to a date obj, for nicer representation
+            exc['exc_utc_date'] = time_to_utcdatetime(exc['exc_timestamp'])
+            exception_list.append(exc)
+
+            count += 1
+            if limit and count >= limit:
+                break
+        return exception_list
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings_exception_tracker', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def browse_exceptions(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'exceptions_browse'
+        c.limit = safe_int(self.request.GET.get('limit')) or 50
+        c.next_limit = c.limit + 50
+        c.exception_list = self.get_all_exceptions(read_metadata=True, limit=c.limit)
+        c.exception_list_count = self.count_all_exceptions()
+        c.exception_store_dir = exc_tracking.get_exc_store()
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings_exception_tracker_show', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def exception_show(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        c.active = 'exceptions'
+        c.exception_id = self.request.matchdict['exception_id']
+        c.traceback = exc_tracking.read_exception(c.exception_id, prefix=None)
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_exception_tracker_delete_all', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def exception_delete_all(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        c.active = 'exceptions'
+        all_exc = self.get_all_exceptions()
+        exc_count = len(all_exc)
+        for exc in all_exc:
+            exc_tracking.delete_exception(exc['exc_id'], prefix=None)
+
+        h.flash(_('Removed {} Exceptions').format(exc_count), category='success')
+        raise HTTPFound(h.route_path('admin_settings_exception_tracker'))
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='admin_settings_exception_tracker_delete', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+    def exception_delete(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        c.active = 'exceptions'
+        c.exception_id = self.request.matchdict['exception_id']
+        exc_tracking.delete_exception(c.exception_id, prefix=None)
+
+        h.flash(_('Removed Exception {}').format(c.exception_id), category='success')
+        raise HTTPFound(h.route_path('admin_settings_exception_tracker'))
diff --git a/rhodecode/apps/admin/views/permissions.py b/rhodecode/apps/admin/views/permissions.py
--- a/rhodecode/apps/admin/views/permissions.py
+++ b/rhodecode/apps/admin/views/permissions.py
@@ -182,7 +182,8 @@ class AdminPermissionsView(BaseAppView, 
             self.request.translate,
             [x[0] for x in c.repo_perms_choices],
             [x[0] for x in c.group_perms_choices],
-            [x[0] for x in c.user_group_perms_choices])()
+            [x[0] for x in c.user_group_perms_choices],
+        )()
 
         try:
             form_result = _form.to_python(dict(self.request.POST))
@@ -218,6 +219,30 @@ class AdminPermissionsView(BaseAppView, 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @view_config(
+        route_name='admin_permissions_branch', request_method='GET',
+        renderer='rhodecode:templates/admin/permissions/permissions.mako')
+    def permissions_branch(self):
+        c = self.load_default_context()
+        c.active = 'branch'
+
+        c.user = User.get_default_user(refresh=True)
+        defaults = {}
+        defaults.update(c.user.get_default_perms())
+
+        data = render(
+            'rhodecode:templates/admin/permissions/permissions.mako',
+            self._get_template_context(c), self.request)
+        html = formencode.htmlfill.render(
+            data,
+            defaults=defaults,
+            encoding="UTF-8",
+            force_defaults=False
+        )
+        return Response(html)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
         route_name='admin_permissions_global', request_method='GET',
         renderer='rhodecode:templates/admin/permissions/permissions.mako')
     def permissions_global(self):
diff --git a/rhodecode/apps/admin/views/repo_groups.py b/rhodecode/apps/admin/views/repo_groups.py
--- a/rhodecode/apps/admin/views/repo_groups.py
+++ b/rhodecode/apps/admin/views/repo_groups.py
@@ -27,6 +27,7 @@ from pyramid.view import view_config
 from pyramid.renderers import render
 from pyramid.response import Response
 
+from rhodecode import events
 from rhodecode.apps._base import BaseAppView, DataGridAppView
 
 from rhodecode.lib.ext_json import json
@@ -200,6 +201,7 @@ class AdminRepoGroupsView(BaseAppView, D
                     % repo_group_name, category='error')
             raise HTTPFound(h.route_path('home'))
 
+        events.trigger(events.UserPermissionsChange([self._rhodecode_user.user_id]))
         raise HTTPFound(
             h.route_path('repo_group_home',
                          repo_group_name=form_result['group_name_full']))
diff --git a/rhodecode/apps/admin/views/repositories.py b/rhodecode/apps/admin/views/repositories.py
--- a/rhodecode/apps/admin/views/repositories.py
+++ b/rhodecode/apps/admin/views/repositories.py
@@ -27,6 +27,7 @@ from pyramid.view import view_config
 from pyramid.renderers import render
 from pyramid.response import Response
 
+from rhodecode import events
 from rhodecode.apps._base import BaseAppView, DataGridAppView
 from rhodecode.lib.celerylib.utils import get_task_id
 
@@ -175,6 +176,8 @@ class AdminReposView(BaseAppView, DataGr
             h.flash(msg, category='error')
             raise HTTPFound(h.route_path('home'))
 
+        events.trigger(events.UserPermissionsChange([self._rhodecode_user.user_id]))
+
         raise HTTPFound(
             h.route_path('repo_creating',
                          repo_name=form_result['repo_name_full'],
diff --git a/rhodecode/apps/admin/views/system_info.py b/rhodecode/apps/admin/views/system_info.py
--- a/rhodecode/apps/admin/views/system_info.py
+++ b/rhodecode/apps/admin/views/system_info.py
@@ -112,6 +112,7 @@ class AdminSystemInfoSettingsView(BaseAp
             # Platform/Python
             (_('Platform'), val('platform')['name'], state('platform')),
             (_('Platform UUID'), val('platform')['uuid'], state('platform')),
+            (_('Lang'), val('locale'), state('locale')),
             (_('Python version'), val('python')['version'], state('python')),
             (_('Python path'), val('python')['executable'], state('python')),
             ('', '', ''),  # spacer
diff --git a/rhodecode/apps/admin/views/user_groups.py b/rhodecode/apps/admin/views/user_groups.py
--- a/rhodecode/apps/admin/views/user_groups.py
+++ b/rhodecode/apps/admin/views/user_groups.py
@@ -28,6 +28,7 @@ from pyramid.view import view_config
 from pyramid.response import Response
 from pyramid.renderers import render
 
+from rhodecode import events
 from rhodecode.apps._base import BaseAppView, DataGridAppView
 from rhodecode.lib.auth import (
     LoginRequired, NotAnonymous, CSRFRequired, HasPermissionAnyDecorator)
@@ -41,6 +42,7 @@ from rhodecode.model.db import (
     or_, count, User, UserGroup, UserGroupMember)
 from rhodecode.model.meta import Session
 from rhodecode.model.user_group import UserGroupModel
+from rhodecode.model.db import true
 
 log = logging.getLogger(__name__)
 
@@ -108,6 +110,10 @@ class AdminUserGroupsView(BaseAppView, D
             .filter(UserGroup.users_group_id.in_(allowed_ids))\
             .count()
 
+        user_groups_data_total_inactive_count = UserGroup.query()\
+            .filter(UserGroup.users_group_id.in_(allowed_ids))\
+            .filter(UserGroup.users_group_active != true()).count()
+
         member_count = count(UserGroupMember.user_id)
         base_q = Session.query(
             UserGroup.users_group_name,
@@ -123,13 +129,17 @@ class AdminUserGroupsView(BaseAppView, D
         .join(User, User.user_id == UserGroup.user_id) \
         .group_by(UserGroup, User)
 
+        base_q_inactive = base_q.filter(UserGroup.users_group_active != true())
+
         if search_q:
             like_expression = u'%{}%'.format(safe_unicode(search_q))
             base_q = base_q.filter(or_(
                 UserGroup.users_group_name.ilike(like_expression),
             ))
+            base_q_inactive = base_q.filter(UserGroup.users_group_active != true())
 
         user_groups_data_total_filtered_count = base_q.count()
+        user_groups_data_total_filtered_inactive_count = base_q_inactive.count()
 
         if order_by == 'members_total':
             sort_col = member_count
@@ -171,7 +181,9 @@ class AdminUserGroupsView(BaseAppView, D
             'draw': draw,
             'data': user_groups_data,
             'recordsTotal': user_groups_data_total_count,
+            'recordsTotalInactive': user_groups_data_total_inactive_count,
             'recordsFiltered': user_groups_data_total_filtered_count,
+            'recordsFilteredInactive': user_groups_data_total_filtered_inactive_count,
         })
 
         return data
@@ -242,5 +254,6 @@ class AdminUserGroupsView(BaseAppView, D
                     % user_group_name, category='error')
             raise HTTPFound(h.route_path('user_groups_new'))
 
+        events.trigger(events.UserPermissionsChange([self._rhodecode_user.user_id]))
         raise HTTPFound(
             h.route_path('edit_user_group', user_group_id=user_group_id))
diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -32,8 +32,9 @@ from rhodecode.apps._base import BaseApp
 from rhodecode.apps.ssh_support import SshKeyFileChangeEvent
 from rhodecode.authentication.plugins import auth_rhodecode
 from rhodecode.events import trigger
+from rhodecode.model.db import true
 
-from rhodecode.lib import audit_logger
+from rhodecode.lib import audit_logger, rc_cache
 from rhodecode.lib.exceptions import (
     UserCreationError, UserOwnsReposException, UserOwnsRepoGroupsException,
     UserOwnsUserGroupsException, DefaultUserException)
@@ -89,7 +90,6 @@ class AdminUsersView(BaseAppView, DataGr
         draw, start, limit = self._extract_chunk(self.request)
         search_q, order_by, order_dir = self._extract_ordering(
             self.request, column_map=column_map)
-
         _render = self.request.get_partial_renderer(
             'rhodecode:templates/data_table/_dt_elements.mako')
 
@@ -100,8 +100,14 @@ class AdminUsersView(BaseAppView, DataGr
             .filter(User.username != User.DEFAULT_USER) \
             .count()
 
+        users_data_total_inactive_count = User.query()\
+            .filter(User.username != User.DEFAULT_USER) \
+            .filter(User.active != true())\
+            .count()
+
         # json generate
         base_q = User.query().filter(User.username != User.DEFAULT_USER)
+        base_inactive_q = base_q.filter(User.active != true())
 
         if search_q:
             like_expression = u'%{}%'.format(safe_unicode(search_q))
@@ -111,8 +117,10 @@ class AdminUsersView(BaseAppView, DataGr
                 User.name.ilike(like_expression),
                 User.lastname.ilike(like_expression),
             ))
+            base_inactive_q = base_q.filter(User.active != true())
 
         users_data_total_filtered_count = base_q.count()
+        users_data_total_filtered_inactive_count = base_inactive_q.count()
 
         sort_col = getattr(User, order_by, None)
         if sort_col:
@@ -148,12 +156,13 @@ class AdminUsersView(BaseAppView, DataGr
                 "extern_name": user.extern_name,
                 "action": user_actions(user.user_id, user.username),
             })
-
         data = ({
             'draw': draw,
             'data': users_data,
             'recordsTotal': users_data_total_count,
             'recordsFiltered': users_data_total_filtered_count,
+            'recordsTotalInactive': users_data_total_inactive_count,
+            'recordsFilteredInactive': users_data_total_filtered_inactive_count
         })
 
         return data
@@ -725,11 +734,12 @@ class UsersView(UserAppView):
         description = self.request.POST.get('description')
         role = self.request.POST.get('role')
 
-        token = AuthTokenModel().create(
-            c.user.user_id, description, lifetime, role)
+        token = UserModel().add_auth_token(
+            user=c.user.user_id,
+            lifetime_minutes=lifetime, role=role, description=description,
+            scope_callback=self.maybe_attach_token_scope)
         token_data = token.get_api_data()
 
-        self.maybe_attach_token_scope(token)
         audit_logger.store_web(
             'user.edit.token.add', action_data={
                 'data': {'token': token_data, 'user': user_data}},
@@ -1189,3 +1199,44 @@ class UsersView(UserAppView):
         perm_user = self.db_user.AuthUser(ip_addr=self.request.remote_addr)
 
         return perm_user.permissions
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='edit_user_caches', request_method='GET',
+        renderer='rhodecode:templates/admin/users/user_edit.mako')
+    def user_caches(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.user = self.db_user
+
+        c.active = 'caches'
+        c.perm_user = c.user.AuthUser(ip_addr=self.request.remote_addr)
+
+        cache_namespace_uid = 'cache_user_auth.{}'.format(self.db_user.user_id)
+        c.region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
+        c.backend = c.region.backend
+        c.user_keys = sorted(c.region.backend.list_keys(prefix=cache_namespace_uid))
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='edit_user_caches_update', request_method='POST')
+    def user_caches_update(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.user = self.db_user
+
+        c.active = 'caches'
+        c.perm_user = c.user.AuthUser(ip_addr=self.request.remote_addr)
+
+        cache_namespace_uid = 'cache_user_auth.{}'.format(self.db_user.user_id)
+        del_keys = rc_cache.clear_cache_namespace('cache_perms', cache_namespace_uid)
+
+        h.flash(_("Deleted {} cache keys").format(del_keys), category='success')
+
+        return HTTPFound(h.route_path(
+            'edit_user_caches', user_id=c.user.user_id))
diff --git a/rhodecode/apps/home/__init__.py b/rhodecode/apps/home/__init__.py
--- a/rhodecode/apps/home/__init__.py
+++ b/rhodecode/apps/home/__init__.py
@@ -42,6 +42,10 @@ def includeme(config):
         name='goto_switcher_data',
         pattern='/_goto_data')
 
+    config.add_route(
+        name='markup_preview',
+        pattern='/_markup_preview')
+
     # register our static links via redirection mechanism
     routing_links.connect_redirection_links(config)
 
diff --git a/rhodecode/apps/home/tests/__init__.py b/rhodecode/apps/home/tests/__init__.py
--- a/rhodecode/apps/home/tests/__init__.py
+++ b/rhodecode/apps/home/tests/__init__.py
@@ -19,22 +19,44 @@
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
-def assert_and_get_content(result):
+def assert_and_get_main_filter_content(result):
     repos = []
     groups = []
     commits = []
+    users = []
+    for data_item in result:
+        assert data_item['id']
+        assert data_item['value']
+        assert data_item['value_display']
+        assert data_item['url']
+
+        if data_item['type'] == 'search':
+            assert data_item['value_display'].startswith('Full text search for:')
+        elif data_item['type'] == 'repo':
+            repos.append(data_item)
+        elif data_item['type'] == 'repo_group':
+            groups.append(data_item)
+        elif data_item['type'] == 'user':
+            users.append(data_item)
+        elif data_item['type'] == 'commit':
+            commits.append(data_item)
+        else:
+            raise Exception('invalid type `%s`' % data_item['type'])
+
+    return repos, groups, users, commits
+
+
+def assert_and_get_repo_list_content(result):
+    repos = []
     for data in result:
         for data_item in data['children']:
             assert data_item['id']
             assert data_item['text']
             assert data_item['url']
+
             if data_item['type'] == 'repo':
                 repos.append(data_item)
-            elif data_item['type'] == 'group':
-                groups.append(data_item)
-            elif data_item['type'] == 'commit':
-                commits.append(data_item)
             else:
                 raise Exception('invalid type %s' % data_item['type'])
 
-    return repos, groups, commits
\ No newline at end of file
+    return repos
diff --git a/rhodecode/apps/home/tests/test_get_goto_switched_data.py b/rhodecode/apps/home/tests/test_get_goto_switched_data.py
--- a/rhodecode/apps/home/tests/test_get_goto_switched_data.py
+++ b/rhodecode/apps/home/tests/test_get_goto_switched_data.py
@@ -22,7 +22,7 @@ import json
 
 import pytest
 
-from . import assert_and_get_content
+from . import assert_and_get_main_filter_content
 from rhodecode.tests import TestController, TEST_USER_ADMIN_LOGIN
 from rhodecode.tests.fixture import Fixture
 
@@ -103,19 +103,15 @@ class TestGotoSwitcherData(TestControlle
                     RepoGroupModel().delete(el, force_delete=True)
                     Session().commit()
 
-    def test_returns_list_of_repos_and_groups(self, xhr_header):
+    def test_empty_query(self, xhr_header):
         self.log_user()
 
         response = self.app.get(
             route_path('goto_switcher_data'),
             extra_environ=xhr_header, status=200)
-        result = json.loads(response.body)['results']
-
-        repos, groups, commits = assert_and_get_content(result)
+        result = json.loads(response.body)['suggestions']
 
-        assert len(repos) == len(Repository.get_all())
-        assert len(groups) == len(RepoGroup.get_all())
-        assert len(commits) == 0
+        assert result == []
 
     def test_returns_list_of_repos_and_groups_filtered(self, xhr_header):
         self.log_user()
@@ -124,14 +120,47 @@ class TestGotoSwitcherData(TestControlle
             route_path('goto_switcher_data'),
             params={'query': 'abc'},
             extra_environ=xhr_header, status=200)
-        result = json.loads(response.body)['results']
+        result = json.loads(response.body)['suggestions']
 
-        repos, groups, commits = assert_and_get_content(result)
+        repos, groups, users, commits = assert_and_get_main_filter_content(result)
 
         assert len(repos) == 13
         assert len(groups) == 5
+        assert len(users) == 0
         assert len(commits) == 0
 
+    def test_returns_list_of_users_filtered(self, xhr_header):
+        self.log_user()
+
+        response = self.app.get(
+            route_path('goto_switcher_data'),
+            params={'query': 'user:admin'},
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)['suggestions']
+
+        repos, groups, users, commits = assert_and_get_main_filter_content(result)
+
+        assert len(repos) == 0
+        assert len(groups) == 0
+        assert len(users) == 1
+        assert len(commits) == 0
+
+    def test_returns_list_of_commits_filtered(self, xhr_header):
+        self.log_user()
+
+        response = self.app.get(
+            route_path('goto_switcher_data'),
+            params={'query': 'commit:e8'},
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)['suggestions']
+
+        repos, groups, users, commits = assert_and_get_main_filter_content(result)
+
+        assert len(repos) == 0
+        assert len(groups) == 0
+        assert len(users) == 0
+        assert len(commits) == 5
+
     def test_returns_list_of_properly_sorted_and_filtered(self, xhr_header):
         self.log_user()
 
@@ -139,13 +168,13 @@ class TestGotoSwitcherData(TestControlle
             route_path('goto_switcher_data'),
             params={'query': 'abc'},
             extra_environ=xhr_header, status=200)
-        result = json.loads(response.body)['results']
+        result = json.loads(response.body)['suggestions']
 
-        repos, groups, commits = assert_and_get_content(result)
+        repos, groups, users, commits = assert_and_get_main_filter_content(result)
 
-        test_repos = [x['text'] for x in repos[:4]]
+        test_repos = [x['value_display'] for x in repos[:4]]
         assert ['abc', 'abcd', 'a/abc', 'abcde'] == test_repos
 
-        test_groups = [x['text'] for x in groups[:4]]
+        test_groups = [x['value_display'] for x in groups[:4]]
         assert ['abc_repos', 'repos_abc',
                 'forked-abc', 'forked-abc/a'] == test_groups
diff --git a/rhodecode/apps/home/tests/test_get_repo_list_data.py b/rhodecode/apps/home/tests/test_get_repo_list_data.py
--- a/rhodecode/apps/home/tests/test_get_repo_list_data.py
+++ b/rhodecode/apps/home/tests/test_get_repo_list_data.py
@@ -20,7 +20,7 @@
 
 import json
 
-from . import assert_and_get_content
+from . import assert_and_get_repo_list_content
 from rhodecode.tests import TestController
 from rhodecode.tests.fixture import Fixture
 from rhodecode.model.db import Repository
@@ -50,11 +50,9 @@ class TestRepoListData(TestController):
             extra_environ=xhr_header, status=200)
         result = json.loads(response.body)['results']
 
-        repos, groups, commits = assert_and_get_content(result)
+        repos = assert_and_get_repo_list_content(result)
 
         assert len(repos) == len(Repository.get_all())
-        assert len(groups) == 0
-        assert len(commits) == 0
 
     def test_returns_list_of_repos_and_groups_filtered(self, xhr_header):
         self.log_user()
@@ -65,12 +63,10 @@ class TestRepoListData(TestController):
             extra_environ=xhr_header, status=200)
         result = json.loads(response.body)['results']
 
-        repos, groups, commits = assert_and_get_content(result)
+        repos = assert_and_get_repo_list_content(result)
 
         assert len(repos) == len(Repository.query().filter(
             Repository.repo_name.ilike('%vcs_test_git%')).all())
-        assert len(groups) == 0
-        assert len(commits) == 0
 
     def test_returns_list_of_repos_and_groups_filtered_with_type(self, xhr_header):
         self.log_user()
@@ -81,12 +77,10 @@ class TestRepoListData(TestController):
             extra_environ=xhr_header, status=200)
         result = json.loads(response.body)['results']
 
-        repos, groups, commits = assert_and_get_content(result)
+        repos = assert_and_get_repo_list_content(result)
 
         assert len(repos) == len(Repository.query().filter(
             Repository.repo_name.ilike('%vcs_test_git%')).all())
-        assert len(groups) == 0
-        assert len(commits) == 0
 
     def test_returns_list_of_repos_non_ascii_query(self, xhr_header):
         self.log_user()
@@ -96,8 +90,6 @@ class TestRepoListData(TestController):
             extra_environ=xhr_header, status=200)
         result = json.loads(response.body)['results']
 
-        repos, groups, commits = assert_and_get_content(result)
+        repos = assert_and_get_repo_list_content(result)
 
         assert len(repos) == 0
-        assert len(groups) == 0
-        assert len(commits) == 0
diff --git a/rhodecode/apps/home/views.py b/rhodecode/apps/home/views.py
--- a/rhodecode/apps/home/views.py
+++ b/rhodecode/apps/home/views.py
@@ -20,18 +20,20 @@
 
 import re
 import logging
+import collections
 
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import (
-    LoginRequired, NotAnonymous, HasRepoGroupPermissionAnyDecorator)
+    LoginRequired, NotAnonymous, HasRepoGroupPermissionAnyDecorator,
+    CSRFRequired)
 from rhodecode.lib.index import searcher_from_config
-from rhodecode.lib.utils2 import safe_unicode, str2bool
+from rhodecode.lib.utils2 import safe_unicode, str2bool, safe_int
 from rhodecode.lib.ext_json import json
 from rhodecode.model.db import (
-    func, or_, in_filter_generator, Repository, RepoGroup)
+    func, or_, in_filter_generator, Repository, RepoGroup, User, UserGroup)
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.scm import RepoGroupList, RepoList
@@ -104,6 +106,7 @@ class HomeView(BaseAppView):
         return {'suggestions': _user_groups}
 
     def _get_repo_list(self, name_contains=None, repo_type=None, limit=20):
+        org_query = name_contains
         allowed_ids = self._rhodecode_user.repo_acl_ids(
             ['repository.read', 'repository.write', 'repository.admin'],
             cache=False, name_filter=name_contains) or [-1]
@@ -125,20 +128,24 @@ class HomeView(BaseAppView):
                 Repository.repo_name.ilike(ilike_expression))
             query = query.limit(limit)
 
-        acl_repo_iter = query
+        acl_iter = query
 
         return [
             {
                 'id': obj.repo_name,
+                'value': org_query,
+                'value_display': obj.repo_name,
                 'text': obj.repo_name,
                 'type': 'repo',
-                'obj': {'repo_type': obj.repo_type, 'private': obj.private,
-                        'repo_id': obj.repo_id},
+                'repo_id': obj.repo_id,
+                'repo_type': obj.repo_type,
+                'private': obj.private,
                 'url': h.route_path('repo_summary', repo_name=obj.repo_name)
             }
-            for obj in acl_repo_iter]
+            for obj in acl_iter]
 
     def _get_repo_group_list(self, name_contains=None, limit=20):
+        org_query = name_contains
         allowed_ids = self._rhodecode_user.repo_group_acl_ids(
             ['group.read', 'group.write', 'group.admin'],
             cache=False, name_filter=name_contains) or [-1]
@@ -157,20 +164,89 @@ class HomeView(BaseAppView):
                 RepoGroup.group_name.ilike(ilike_expression))
             query = query.limit(limit)
 
-        acl_repo_iter = query
+        acl_iter = query
 
         return [
             {
                 'id': obj.group_name,
-                'text': obj.group_name,
-                'type': 'group',
-                'obj': {},
+                'value': org_query,
+                'value_display': obj.group_name,
+                'type': 'repo_group',
                 'url': h.route_path(
                     'repo_group_home', repo_group_name=obj.group_name)
             }
-            for obj in acl_repo_iter]
+            for obj in acl_iter]
+
+    def _get_user_list(self, name_contains=None, limit=20):
+        org_query = name_contains
+        if not name_contains:
+            return []
+
+        name_contains = re.compile('(?:user:)(.+)').findall(name_contains)
+        if len(name_contains) != 1:
+            return []
+        name_contains = name_contains[0]
+
+        query = User.query()\
+            .order_by(func.length(User.username))\
+            .order_by(User.username) \
+            .filter(User.username != User.DEFAULT_USER)
+
+        if name_contains:
+            ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
+            query = query.filter(
+                User.username.ilike(ilike_expression))
+            query = query.limit(limit)
+
+        acl_iter = query
 
-    def _get_hash_commit_list(self, auth_user, query=None):
+        return [
+            {
+                'id': obj.user_id,
+                'value': org_query,
+                'value_display': obj.username,
+                'type': 'user',
+                'icon_link': h.gravatar_url(obj.email, 30),
+                'url': h.route_path(
+                    'user_profile', username=obj.username)
+            }
+            for obj in acl_iter]
+
+    def _get_user_groups_list(self, name_contains=None, limit=20):
+        org_query = name_contains
+        if not name_contains:
+            return []
+
+        name_contains = re.compile('(?:user_group:)(.+)').findall(name_contains)
+        if len(name_contains) != 1:
+            return []
+        name_contains = name_contains[0]
+
+        query = UserGroup.query()\
+            .order_by(func.length(UserGroup.users_group_name))\
+            .order_by(UserGroup.users_group_name)
+
+        if name_contains:
+            ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
+            query = query.filter(
+                UserGroup.users_group_name.ilike(ilike_expression))
+            query = query.limit(limit)
+
+        acl_iter = query
+
+        return [
+            {
+                'id': obj.users_group_id,
+                'value': org_query,
+                'value_display': obj.users_group_name,
+                'type': 'user_group',
+                'url': h.route_path(
+                    'user_group_profile', user_group_name=obj.users_group_name)
+            }
+            for obj in acl_iter]
+
+    def _get_hash_commit_list(self, auth_user, query):
+        org_query = query
         if not query or len(query) < 3:
             return []
 
@@ -178,20 +254,21 @@ class HomeView(BaseAppView):
 
         if len(commit_hashes) != 1:
             return []
-
-        commit_hash_prefix = commit_hashes[0]
+        commit_hash = commit_hashes[0]
 
         searcher = searcher_from_config(self.request.registry.settings)
         result = searcher.search(
-            'commit_id:%s*' % commit_hash_prefix, 'commit', auth_user,
+            'commit_id:%s*' % commit_hash, 'commit', auth_user,
             raise_on_exc=False)
 
         return [
             {
                 'id': entry['commit_id'],
-                'text': entry['commit_id'],
+                'value': org_query,
+                'value_display': 'repo `{}` commit: {}'.format(
+                    entry['repository'], entry['commit_id']),
                 'type': 'commit',
-                'obj': {'repo': entry['repository']},
+                'repo': entry['repository'],
                 'url': h.route_path(
                     'repo_commit',
                     repo_name=entry['repository'], commit_id=entry['commit_id'])
@@ -235,41 +312,67 @@ class HomeView(BaseAppView):
         _ = self.request.translate
 
         query = self.request.GET.get('query')
-        log.debug('generating goto switcher list, query %s', query)
+        log.debug('generating main filter data, query %s', query)
+
+        default_search_val = u'Full text search for: `{}`'.format(query)
+        res = []
+        if not query:
+            return {'suggestions': res}
 
-        res = []
+        res.append({
+            'id': -1,
+            'value': query,
+            'value_display': default_search_val,
+            'type': 'search',
+            'url': h.route_path(
+                'search', _query={'q': query})
+        })
+        repo_group_id = safe_int(self.request.GET.get('repo_group_id'))
+        if repo_group_id:
+            repo_group = RepoGroup.get(repo_group_id)
+            composed_hint = '{}/{}'.format(repo_group.group_name, query)
+            show_hint = not query.startswith(repo_group.group_name)
+            if repo_group and show_hint:
+                hint = u'Group search: `{}`'.format(composed_hint)
+                res.append({
+                    'id': -1,
+                    'value': composed_hint,
+                    'value_display': hint,
+                    'type': 'hint',
+                    'url': ""
+                })
+
         repo_groups = self._get_repo_group_list(query)
-        if repo_groups:
-            res.append({
-                'text': _('Groups'),
-                'children': repo_groups
-            })
+        for serialized_repo_group in repo_groups:
+            res.append(serialized_repo_group)
 
         repos = self._get_repo_list(query)
-        if repos:
-            res.append({
-                'text': _('Repositories'),
-                'children': repos
-            })
+        for serialized_repo in repos:
+            res.append(serialized_repo)
+
+        # TODO(marcink): permissions for that ?
+        allowed_user_search = self._rhodecode_user.username != User.DEFAULT_USER
+        if allowed_user_search:
+            users = self._get_user_list(query)
+            for serialized_user in users:
+                res.append(serialized_user)
+
+            user_groups = self._get_user_groups_list(query)
+            for serialized_user_group in user_groups:
+                res.append(serialized_user_group)
 
         commits = self._get_hash_commit_list(c.auth_user, query)
         if commits:
-            unique_repos = {}
+            unique_repos = collections.OrderedDict()
             for commit in commits:
-                unique_repos.setdefault(commit['obj']['repo'], []
-                    ).append(commit)
+                repo_name = commit['repo']
+                unique_repos.setdefault(repo_name, []).append(commit)
 
-            for repo in unique_repos:
-                res.append({
-                    'text': _('Commits in %(repo)s') % {'repo': repo},
-                    'children': unique_repos[repo]
-                })
+            for repo, commits in unique_repos.items():
+                for commit in commits:
+                    res.append(commit)
 
-        data = {
-            'more': False,
-            'results': res
-        }
-        return data
+        return {'suggestions': res}
 
     def _get_groups_and_repos(self, repo_group_id=None):
         # repo groups groups
@@ -323,3 +426,21 @@ class HomeView(BaseAppView):
         c.repo_groups_data = json.dumps(repo_group_data)
 
         return self._get_template_context(c)
+
+    @LoginRequired()
+    @CSRFRequired()
+    @view_config(
+        route_name='markup_preview', request_method='POST',
+        renderer='string', xhr=True)
+    def markup_preview(self):
+        # Technically a CSRF token is not needed as no state changes with this
+        # call. However, as this is a POST is better to have it, so automated
+        # tools don't flag it as potential CSRF.
+        # Post is required because the payload could be bigger than the maximum
+        # allowed by GET.
+
+        text = self.request.POST.get('text')
+        renderer = self.request.POST.get('renderer') or 'rst'
+        if text:
+            return h.render(text, renderer=renderer, mentions=True)
+        return ''
diff --git a/rhodecode/apps/login/tests/test_password_reset.py b/rhodecode/apps/login/tests/test_password_reset.py
--- a/rhodecode/apps/login/tests/test_password_reset.py
+++ b/rhodecode/apps/login/tests/test_password_reset.py
@@ -22,7 +22,7 @@ import pytest
 
 from rhodecode.lib import helpers as h
 from rhodecode.tests import (
-    TestController, clear_all_caches,
+    TestController, clear_cache_regions,
     TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS)
 from rhodecode.tests.fixture import Fixture
 from rhodecode.tests.utils import AssertResponse
@@ -64,7 +64,7 @@ class TestPasswordReset(TestController):
         ])
     def test_password_reset_settings(
             self, pwd_reset_setting, show_link, show_reset):
-        clear_all_caches()
+        clear_cache_regions()
         self.log_user(TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS)
         params = {
             'csrf_token': self.csrf_token,
diff --git a/rhodecode/apps/login/views.py b/rhodecode/apps/login/views.py
--- a/rhodecode/apps/login/views.py
+++ b/rhodecode/apps/login/views.py
@@ -133,7 +133,7 @@ class LoginView(BaseAppView):
             'response': captcha_rs,
             'remoteip': get_ip_addr(self.request.environ)
         }
-        verify_rs = requests.get(url, params=params, verify=True)
+        verify_rs = requests.get(url, params=params, verify=True, timeout=60)
         verify_rs = verify_rs.json()
         captcha_status = verify_rs.get('success', False)
         captcha_errors = verify_rs.get('error-codes', [])
@@ -299,9 +299,15 @@ class LoginView(BaseAppView):
 
             action_data = {'data': new_user.get_api_data(),
                            'user_agent': self.request.user_agent}
+
+            audit_user = audit_logger.UserWrap(
+                username=new_user.username,
+                user_id=new_user.user_id,
+                ip_addr=self.request.remote_addr)
+
             audit_logger.store_web(
                 'user.register', action_data=action_data,
-                user=new_user)
+                user=audit_user)
 
             event = UserRegistered(user=new_user, session=self.session)
             trigger(event)
@@ -373,13 +379,14 @@ class LoginView(BaseAppView):
                 # Generate reset URL and send mail.
                 user = User.get_by_email(user_email)
 
-                # generate password reset token that expires in 10minutes
-                desc = 'Generated token for password reset from {}'.format(
+                # generate password reset token that expires in 10 minutes
+                description = u'Generated token for password reset from {}'.format(
                     datetime.datetime.now().isoformat())
-                reset_token = AuthTokenModel().create(
-                    user, lifetime=10,
-                    description=desc,
-                    role=UserApiKeys.ROLE_PASSWORD_RESET)
+
+                reset_token = UserModel().add_auth_token(
+                    user=user, lifetime_minutes=10,
+                    role=UserModel.auth_token_role.ROLE_PASSWORD_RESET,
+                    description=description)
                 Session().commit()
 
                 log.debug('Successfully created password recovery token')
diff --git a/rhodecode/apps/my_account/tests/test_my_account_notifications.py b/rhodecode/apps/my_account/tests/test_my_account_notifications.py
--- a/rhodecode/apps/my_account/tests/test_my_account_notifications.py
+++ b/rhodecode/apps/my_account/tests/test_my_account_notifications.py
@@ -155,6 +155,7 @@ class TestNotificationsController(TestCo
         notification = NotificationModel().create(
             created_by=cur_user, notification_subject=subject,
             notification_body=notif_body, recipients=[cur_user, u1, u2])
+        Session().commit()
 
         response = self.app.get(
             route_path('notifications_show',
diff --git a/rhodecode/apps/my_account/views/my_account.py b/rhodecode/apps/my_account/views/my_account.py
--- a/rhodecode/apps/my_account/views/my_account.py
+++ b/rhodecode/apps/my_account/views/my_account.py
@@ -180,11 +180,12 @@ class MyAccountView(BaseAppView, DataGri
         description = self.request.POST.get('description')
         role = self.request.POST.get('role')
 
-        token = AuthTokenModel().create(
-            c.user.user_id, description, lifetime, role)
+        token = UserModel().add_auth_token(
+            user=c.user.user_id,
+            lifetime_minutes=lifetime, role=role, description=description,
+            scope_callback=self.maybe_attach_token_scope)
         token_data = token.get_api_data()
 
-        self.maybe_attach_token_scope(token)
         audit_logger.store_web(
             'user.edit.token.add', action_data={
                 'data': {'token': token_data, 'user': 'self'}},
diff --git a/rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py b/rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py
--- a/rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py
+++ b/rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py
@@ -20,6 +20,8 @@
 
 import pytest
 
+from rhodecode.tests.utils import permission_update_data_generator
+
 
 def route_path(name, params=None, **kwargs):
     import urllib
@@ -37,13 +39,48 @@ def route_path(name, params=None, **kwar
 
 
 @pytest.mark.usefixtures("app")
-class TestRepoGroupsPermissionsView(object):
+class TestRepoGroupPermissionsView(object):
 
-    def test_edit_repo_group_perms(self, user_util, autologin_user):
+    def test_edit_perms_view(self, user_util, autologin_user):
         repo_group = user_util.create_repo_group()
+
         self.app.get(
             route_path('edit_repo_group_perms',
                        repo_group_name=repo_group.group_name), status=200)
 
-    def test_update_permissions(self):
-        pass
+    def test_update_permissions(self, csrf_token, user_util):
+        repo_group = user_util.create_repo_group()
+        repo_group_name = repo_group.group_name
+        user = user_util.create_user()
+        user_id = user.user_id
+        username = user.username
+
+        # grant new
+        form_data = permission_update_data_generator(
+            csrf_token,
+            default='group.write',
+            grant=[(user_id, 'group.write', username, 'user')])
+
+        # recursive flag required for repo groups
+        form_data.extend([('recursive', u'none')])
+
+        response = self.app.post(
+            route_path('edit_repo_group_perms_update',
+                       repo_group_name=repo_group_name), form_data).follow()
+
+        assert 'Repository Group permissions updated' in response
+
+        # revoke given
+        form_data = permission_update_data_generator(
+            csrf_token,
+            default='group.read',
+            revoke=[(user_id, 'user')])
+
+        # recursive flag required for repo groups
+        form_data.extend([('recursive', u'none')])
+
+        response = self.app.post(
+            route_path('edit_repo_group_perms_update',
+                       repo_group_name=repo_group_name), form_data).follow()
+
+        assert 'Repository Group permissions updated' in response
diff --git a/rhodecode/apps/repo_group/views/repo_group_permissions.py b/rhodecode/apps/repo_group/views/repo_group_permissions.py
--- a/rhodecode/apps/repo_group/views/repo_group_permissions.py
+++ b/rhodecode/apps/repo_group/views/repo_group_permissions.py
@@ -23,6 +23,7 @@ import logging
 from pyramid.view import view_config
 from pyramid.httpexceptions import HTTPFound
 
+from rhodecode import events
 from rhodecode.apps._base import RepoGroupAppView
 from rhodecode.lib import helpers as h
 from rhodecode.lib import audit_logger
@@ -95,6 +96,14 @@ class RepoGroupPermissionsView(RepoGroup
 
         Session().commit()
         h.flash(_('Repository Group permissions updated'), category='success')
+
+        affected_user_ids = []
+        for change in changes['added'] + changes['updated'] + changes['deleted']:
+            if change['type'] == 'user':
+                affected_user_ids.append(change['id'])
+
+        events.trigger(events.UserPermissionsChange(affected_user_ids))
+
         raise HTTPFound(
             h.route_path('edit_repo_group_perms',
                          repo_group_name=self.db_repo_group_name))
diff --git a/rhodecode/apps/repo_group/views/repo_group_settings.py b/rhodecode/apps/repo_group/views/repo_group_settings.py
--- a/rhodecode/apps/repo_group/views/repo_group_settings.py
+++ b/rhodecode/apps/repo_group/views/repo_group_settings.py
@@ -24,6 +24,7 @@ import deform
 from pyramid.view import view_config
 from pyramid.httpexceptions import HTTPFound
 
+from rhodecode import events
 from rhodecode.apps._base import RepoGroupAppView
 from rhodecode.forms import RcForm
 from rhodecode.lib import helpers as h
@@ -31,7 +32,7 @@ from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAll,
     HasRepoGroupPermissionAny, HasRepoGroupPermissionAnyDecorator, CSRFRequired)
-from rhodecode.model.db import Session, RepoGroup
+from rhodecode.model.db import Session, RepoGroup, User
 from rhodecode.model.scm import RepoGroupList
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.validation_schema.schemas import repo_group_schema
@@ -72,8 +73,6 @@ class RepoGroupSettingsView(RepoGroupApp
         if add_parent_group:
             c.repo_groups_choices.append(parent_group.group_id)
             c.repo_groups.append(RepoGroup._generate_choice(parent_group))
-
-
         return c
 
     def _can_create_repo_group(self, parent_group_id=None):
@@ -179,5 +178,12 @@ class RepoGroupSettingsView(RepoGroupApp
             h.flash(_('Error occurred during update of repository group %s')
                     % old_repo_group_name, category='error')
 
+        name_changed = old_repo_group_name != new_repo_group_name
+        if name_changed:
+            owner = User.get_by_username(schema_data['repo_group_owner'])
+            owner_id = owner.user_id if owner else self._rhodecode_user.user_id
+            events.trigger(events.UserPermissionsChange([
+                self._rhodecode_user.user_id, owner_id]))
+
         raise HTTPFound(
             h.route_path('edit_repo_group', repo_group_name=new_repo_group_name))
diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -345,6 +345,15 @@ def includeme(config):
         name='edit_repo_perms',
         pattern='/{repo_name:.*?[^/]}/settings/permissions', repo_route=True)
 
+    # Permissions Branch (EE feature)
+    config.add_route(
+        name='edit_repo_perms_branch',
+        pattern='/{repo_name:.*?[^/]}/settings/branch_permissions', repo_route=True)
+    config.add_route(
+        name='edit_repo_perms_branch_delete',
+        pattern='/{repo_name:.*?[^/]}/settings/branch_permissions/{rule_id}/delete',
+        repo_route=True)
+
     # Maintenance
     config.add_route(
         name='edit_repo_maintenance',
diff --git a/rhodecode/apps/repository/tests/test_repo_files.py b/rhodecode/apps/repository/tests/test_repo_files.py
--- a/rhodecode/apps/repository/tests/test_repo_files.py
+++ b/rhodecode/apps/repository/tests/test_repo_files.py
@@ -32,6 +32,7 @@ from rhodecode.lib.vcs import nodes
 from rhodecode.lib.vcs.conf import settings
 from rhodecode.tests import assert_session_flash
 from rhodecode.tests.fixture import Fixture
+from rhodecode.model.db import Session
 
 fixture = Fixture()
 
@@ -166,8 +167,8 @@ class TestFilesViews(object):
             {'message': 'b', 'branch': new_branch}
         ]
         backend.create_repo(commits)
-
         backend.repo.landing_rev = "branch:%s" % new_branch
+        Session().commit()
 
         # get response based on tip and not new commit
         response = self.app.get(
diff --git a/rhodecode/apps/repository/tests/test_repo_permissions.py b/rhodecode/apps/repository/tests/test_repo_permissions.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/apps/repository/tests/test_repo_permissions.py
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import pytest
+
+from rhodecode.tests.utils import permission_update_data_generator
+
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'edit_repo_perms': '/{repo_name}/settings/permissions'
+        # update is the same url
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+@pytest.mark.usefixtures("app")
+class TestRepoPermissionsView(object):
+
+    def test_edit_perms_view(self, user_util, autologin_user):
+        repo = user_util.create_repo()
+        self.app.get(
+            route_path('edit_repo_perms',
+                       repo_name=repo.repo_name), status=200)
+
+    def test_update_permissions(self, csrf_token, user_util):
+        repo = user_util.create_repo()
+        repo_name = repo.repo_name
+        user = user_util.create_user()
+        user_id = user.user_id
+        username = user.username
+
+        # grant new
+        form_data = permission_update_data_generator(
+            csrf_token,
+            default='repository.write',
+            grant=[(user_id, 'repository.write', username, 'user')])
+
+        response = self.app.post(
+            route_path('edit_repo_perms',
+                       repo_name=repo_name), form_data).follow()
+
+        assert 'Repository permissions updated' in response
+
+        # revoke given
+        form_data = permission_update_data_generator(
+            csrf_token,
+            default='repository.read',
+            revoke=[(user_id, 'user')])
+
+        response = self.app.post(
+            route_path('edit_repo_perms',
+                       repo_name=repo_name), form_data).follow()
+
+        assert 'Repository permissions updated' in response
diff --git a/rhodecode/apps/repository/tests/test_repo_pullrequests.py b/rhodecode/apps/repository/tests/test_repo_pullrequests.py
--- a/rhodecode/apps/repository/tests/test_repo_pullrequests.py
+++ b/rhodecode/apps/repository/tests/test_repo_pullrequests.py
@@ -368,8 +368,9 @@ class TestPullrequestsView(object):
                 ('target_repo', target.repo_name),
                 ('target_ref',  'branch:default:' + commit_ids['ancestor']),
                 ('common_ancestor', commit_ids['ancestor']),
+                ('pullrequest_title', 'Title'),
                 ('pullrequest_desc', 'Description'),
-                ('pullrequest_title', 'Title'),
+                ('description_renderer', 'markdown'),
                 ('__start__', 'review_members:sequence'),
                     ('__start__', 'reviewer:mapping'),
                         ('user_id', '1'),
@@ -427,8 +428,9 @@ class TestPullrequestsView(object):
                 ('target_repo', target.repo_name),
                 ('target_ref',  'branch:default:' + commit_ids['ancestor-child']),
                 ('common_ancestor', commit_ids['ancestor']),
+                ('pullrequest_title', 'Title'),
                 ('pullrequest_desc', 'Description'),
-                ('pullrequest_title', 'Title'),
+                ('description_renderer', 'markdown'),
                 ('__start__', 'review_members:sequence'),
                     ('__start__', 'reviewer:mapping'),
                         ('user_id', '2'),
@@ -493,8 +495,9 @@ class TestPullrequestsView(object):
                 ('target_repo', target.repo_name),
                 ('target_ref',  'branch:default:' + commit_ids['ancestor-child']),
                 ('common_ancestor', commit_ids['ancestor']),
+                ('pullrequest_title', 'Title'),
                 ('pullrequest_desc', 'Description'),
-                ('pullrequest_title', 'Title'),
+                ('description_renderer', 'markdown'),
                 ('__start__', 'review_members:sequence'),
                     ('__start__', 'reviewer:mapping'),
                         ('user_id', '1'),
@@ -618,7 +621,7 @@ class TestPullrequestsView(object):
 
         model_patcher = mock.patch.multiple(
             PullRequestModel,
-            merge=mock.Mock(return_value=MergeResponse(
+            merge_repo=mock.Mock(return_value=MergeResponse(
                 True, False, 'STUB_COMMIT_ID', MergeFailureReason.PUSH_FAILED)),
             merge_status=mock.Mock(return_value=(True, 'WRONG_MESSAGE')))
 
@@ -747,6 +750,69 @@ class TestPullrequestsView(object):
         assert 'Pull request updated to' in response.body
         assert 'with 1 added, 1 removed commits.' in response.body
 
+    def test_update_target_revision_with_removal_of_1_commit_git(self, backend_git, csrf_token):
+        backend = backend_git
+        commits = [
+            {'message': 'master-commit-1'},
+            {'message': 'master-commit-2-change-1'},
+            {'message': 'master-commit-3-change-2'},
+
+            {'message': 'feat-commit-1', 'parents': ['master-commit-1']},
+            {'message': 'feat-commit-2'},
+        ]
+        commit_ids = backend.create_master_repo(commits)
+        target = backend.create_repo(heads=['master-commit-3-change-2'])
+        source = backend.create_repo(heads=['feat-commit-2'])
+
+        # create pr from a in source to A in target
+        pull_request = PullRequest()
+        pull_request.source_repo = source
+        # TODO: johbo: Make sure that we write the source ref this way!
+        pull_request.source_ref = 'branch:{branch}:{commit_id}'.format(
+            branch=backend.default_branch_name,
+            commit_id=commit_ids['master-commit-3-change-2'])
+
+        pull_request.target_repo = target
+        # TODO: johbo: Target ref should be branch based, since tip can jump
+        # from branch to branch
+        pull_request.target_ref = 'branch:{branch}:{commit_id}'.format(
+            branch=backend.default_branch_name,
+            commit_id=commit_ids['feat-commit-2'])
+
+        pull_request.revisions = [
+            commit_ids['feat-commit-1'],
+            commit_ids['feat-commit-2']
+        ]
+        pull_request.title = u"Test"
+        pull_request.description = u"Description"
+        pull_request.author = UserModel().get_by_username(
+            TEST_USER_ADMIN_LOGIN)
+        Session().add(pull_request)
+        Session().commit()
+        pull_request_id = pull_request.pull_request_id
+
+        # PR is created, now we simulate a force-push into target,
+        # that drops a 2 last commits
+        vcsrepo = target.scm_instance()
+        vcsrepo.config.clear_section('hooks')
+        vcsrepo.run_git_command(['reset', '--soft', 'HEAD~2'])
+
+        # update PR
+        self.app.post(
+            route_path('pullrequest_update',
+                repo_name=target.repo_name,
+                pull_request_id=pull_request_id),
+            params={'update_commits': 'true',
+                    'csrf_token': csrf_token},
+            status=200)
+
+        response = self.app.get(route_path(
+            'pullrequest_new',
+            repo_name=target.repo_name))
+        assert response.status_int == 200
+        response.mustcontain('Pull request updated to')
+        response.mustcontain('with 0 added, 0 removed commits.')
+
     def test_update_of_ancestor_reference(self, backend, csrf_token):
         commits = [
             {'message': 'ancestor'},
diff --git a/rhodecode/apps/repository/views/repo_branch_permissions.py b/rhodecode/apps/repository/views/repo_branch_permissions.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/apps/repository/views/repo_branch_permissions.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+
+from pyramid.view import view_config
+
+from rhodecode.apps._base import RepoAppView
+from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
+
+log = logging.getLogger(__name__)
+
+
+class RepoSettingsBranchPermissionsView(RepoAppView):
+
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        return c
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @view_config(
+        route_name='edit_repo_perms_branch', request_method='GET',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+    def branch_permissions(self):
+        c = self.load_default_context()
+        c.active = 'permissions_branch'
+        return self._get_template_context(c)
diff --git a/rhodecode/apps/repository/views/repo_caches.py b/rhodecode/apps/repository/views/repo_caches.py
--- a/rhodecode/apps/repository/views/repo_caches.py
+++ b/rhodecode/apps/repository/views/repo_caches.py
@@ -27,7 +27,7 @@ from pyramid.view import view_config
 from rhodecode.apps._base import RepoAppView
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
-from rhodecode.lib import helpers as h
+from rhodecode.lib import helpers as h, rc_cache
 from rhodecode.lib import system_info
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import ScmModel
@@ -53,6 +53,12 @@ class RepoCachesView(RepoAppView):
         c.cached_diff_size = 0
         if os.path.isdir(cached_diffs_dir):
             c.cached_diff_size = system_info.get_storage_size(cached_diffs_dir)
+        c.shadow_repos = c.rhodecode_db_repo.shadow_repos()
+
+        cache_namespace_uid = 'cache_repo.{}'.format(self.db_repo.repo_id)
+        c.region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
+        c.backend = c.region.backend
+        c.repo_keys = sorted(c.region.backend.list_keys(prefix=cache_namespace_uid))
 
         return self._get_template_context(c)
 
@@ -68,7 +74,9 @@ class RepoCachesView(RepoAppView):
 
         try:
             ScmModel().mark_for_invalidation(self.db_repo_name, delete=True)
+
             Session().commit()
+
             h.flash(_('Cache invalidation successful'),
                     category='success')
         except Exception:
diff --git a/rhodecode/apps/repository/views/repo_changelog.py b/rhodecode/apps/repository/views/repo_changelog.py
--- a/rhodecode/apps/repository/views/repo_changelog.py
+++ b/rhodecode/apps/repository/views/repo_changelog.py
@@ -89,7 +89,7 @@ class RepoChangelogView(RepoAppView):
             data = dict(
                 raw_id=commit.raw_id,
                 idx=commit.idx,
-                branch=commit.branch,
+                branch=h.escape(commit.branch),
             )
             if parents:
                 data['parents'] = [
diff --git a/rhodecode/apps/repository/views/repo_commits.py b/rhodecode/apps/repository/views/repo_commits.py
--- a/rhodecode/apps/repository/views/repo_commits.py
+++ b/rhodecode/apps/repository/views/repo_commits.py
@@ -437,7 +437,8 @@ class RepoCommitsView(RepoAppView):
                                if status else None),
                 status_change_type=status,
                 comment_type=comment_type,
-                resolves_comment_id=resolves_comment_id
+                resolves_comment_id=resolves_comment_id,
+                auth_user=self._rhodecode_user
             )
 
             # get status if set !
@@ -528,7 +529,7 @@ class RepoCommitsView(RepoAppView):
         comment_repo_admin = is_repo_admin and is_repo_comment
 
         if super_admin or comment_owner or comment_repo_admin:
-            CommentsModel().delete(comment=comment, user=self._rhodecode_db_user)
+            CommentsModel().delete(comment=comment, auth_user=self._rhodecode_user)
             Session().commit()
             return True
         else:
diff --git a/rhodecode/apps/repository/views/repo_feed.py b/rhodecode/apps/repository/views/repo_feed.py
--- a/rhodecode/apps/repository/views/repo_feed.py
+++ b/rhodecode/apps/repository/views/repo_feed.py
@@ -17,17 +17,16 @@
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
-
 import pytz
 import logging
 
-from beaker.cache import cache_region
 from pyramid.view import view_config
 from pyramid.response import Response
 from webhelpers.feedgenerator import Rss201rev2Feed, Atom1Feed
 
 from rhodecode.apps._base import RepoAppView
 from rhodecode.lib import audit_logger
+from rhodecode.lib import rc_cache
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator)
@@ -124,11 +123,23 @@ class RepoFeedView(RepoAppView):
         """
         self.load_default_context()
 
-        def _generate_feed():
+        cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
+            self.db_repo.repo_id, CacheKey.CACHE_TYPE_FEED)
+        invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+            repo_id=self.db_repo.repo_id)
+
+        region = rc_cache.get_or_create_region('cache_repo_longterm',
+                                               cache_namespace_uid)
+
+        condition = not self.path_filter.is_enabled
+
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                               condition=condition)
+        def generate_atom_feed(repo_id, _repo_name, _feed_type):
             feed = Atom1Feed(
-                title=self.title % self.db_repo_name,
-                link=h.route_url('repo_summary', repo_name=self.db_repo_name),
-                description=self.description % self.db_repo_name,
+                title=self.title % _repo_name,
+                link=h.route_url('repo_summary', repo_name=_repo_name),
+                description=self.description % _repo_name,
                 language=self.language,
                 ttl=self.ttl
             )
@@ -136,30 +147,29 @@ class RepoFeedView(RepoAppView):
             for commit in reversed(self._get_commits()):
                 date = self._set_timezone(commit.date)
                 feed.add_item(
-                    unique_id=self.uid(self.db_repo.repo_id, commit.raw_id),
+                    unique_id=self.uid(repo_id, commit.raw_id),
                     title=self._get_title(commit),
                     author_name=commit.author,
                     description=self._get_description(commit),
                     link=h.route_url(
-                        'repo_commit', repo_name=self.db_repo_name,
+                        'repo_commit', repo_name=_repo_name,
                         commit_id=commit.raw_id),
                     pubdate=date,)
 
             return feed.mime_type, feed.writeString('utf-8')
 
-        @cache_region('long_term')
-        def _generate_feed_and_cache(cache_key):
-            return _generate_feed()
+        inv_context_manager = rc_cache.InvalidationContext(
+            uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
+        with inv_context_manager as invalidation_context:
+            args = (self.db_repo.repo_id, self.db_repo.repo_name, 'atom',)
+            # re-compute and store cache if we get invalidate signal
+            if invalidation_context.should_invalidate():
+                mime_type, feed = generate_atom_feed.refresh(*args)
+            else:
+                mime_type, feed = generate_atom_feed(*args)
 
-        if self.path_filter.is_enabled:
-            mime_type, feed = _generate_feed()
-        else:
-            invalidator_context = CacheKey.repo_context_cache(
-                _generate_feed_and_cache, self.db_repo_name,
-                CacheKey.CACHE_TYPE_ATOM)
-            with invalidator_context as context:
-                context.invalidate()
-                mime_type, feed = context.compute()
+            log.debug('Repo ATOM feed computed in %.3fs',
+                      inv_context_manager.compute_time)
 
         response = Response(feed)
         response.content_type = mime_type
@@ -177,11 +187,22 @@ class RepoFeedView(RepoAppView):
         """
         self.load_default_context()
 
-        def _generate_feed():
+        cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
+            self.db_repo.repo_id, CacheKey.CACHE_TYPE_FEED)
+        invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+            repo_id=self.db_repo.repo_id)
+        region = rc_cache.get_or_create_region('cache_repo_longterm',
+                                               cache_namespace_uid)
+
+        condition = not self.path_filter.is_enabled
+
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                               condition=condition)
+        def generate_rss_feed(repo_id, _repo_name, _feed_type):
             feed = Rss201rev2Feed(
-                title=self.title % self.db_repo_name,
-                link=h.route_url('repo_summary', repo_name=self.db_repo_name),
-                description=self.description % self.db_repo_name,
+                title=self.title % _repo_name,
+                link=h.route_url('repo_summary', repo_name=_repo_name),
+                description=self.description % _repo_name,
                 language=self.language,
                 ttl=self.ttl
             )
@@ -189,31 +210,28 @@ class RepoFeedView(RepoAppView):
             for commit in reversed(self._get_commits()):
                 date = self._set_timezone(commit.date)
                 feed.add_item(
-                    unique_id=self.uid(self.db_repo.repo_id, commit.raw_id),
+                    unique_id=self.uid(repo_id, commit.raw_id),
                     title=self._get_title(commit),
                     author_name=commit.author,
                     description=self._get_description(commit),
                     link=h.route_url(
-                        'repo_commit', repo_name=self.db_repo_name,
+                        'repo_commit', repo_name=_repo_name,
                         commit_id=commit.raw_id),
                     pubdate=date,)
 
             return feed.mime_type, feed.writeString('utf-8')
 
-        @cache_region('long_term')
-        def _generate_feed_and_cache(cache_key):
-            return _generate_feed()
-
-        if self.path_filter.is_enabled:
-            mime_type, feed = _generate_feed()
-        else:
-            invalidator_context = CacheKey.repo_context_cache(
-                _generate_feed_and_cache, self.db_repo_name,
-                CacheKey.CACHE_TYPE_RSS)
-
-            with invalidator_context as context:
-                context.invalidate()
-                mime_type, feed = context.compute()
+        inv_context_manager = rc_cache.InvalidationContext(
+            uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
+        with inv_context_manager as invalidation_context:
+            args = (self.db_repo.repo_id, self.db_repo.repo_name, 'rss',)
+            # re-compute and store cache if we get invalidate signal
+            if invalidation_context.should_invalidate():
+                mime_type, feed = generate_rss_feed.refresh(*args)
+            else:
+                mime_type, feed = generate_rss_feed(*args)
+            log.debug(
+                'Repo RSS feed computed in %.3fs', inv_context_manager.compute_time)
 
         response = Response(feed)
         response.content_type = mime_type
diff --git a/rhodecode/apps/repository/views/repo_files.py b/rhodecode/apps/repository/views/repo_files.py
--- a/rhodecode/apps/repository/views/repo_files.py
+++ b/rhodecode/apps/repository/views/repo_files.py
@@ -30,16 +30,17 @@ from pyramid.view import view_config
 from pyramid.renderers import render
 from pyramid.response import Response
 
+import rhodecode
 from rhodecode.apps._base import RepoAppView
 
 from rhodecode.controllers.utils import parse_path_ref
-from rhodecode.lib import diffs, helpers as h, caches
+from rhodecode.lib import diffs, helpers as h, rc_cache
 from rhodecode.lib import audit_logger
 from rhodecode.lib.exceptions import NonRelativePathError
 from rhodecode.lib.codeblocks import (
     filenode_as_lines_tokens, filenode_as_annotated_lines_tokens)
 from rhodecode.lib.utils2 import (
-    convert_line_endings, detect_mode, safe_str, str2bool)
+    convert_line_endings, detect_mode, safe_str, str2bool, safe_int)
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
 from rhodecode.lib.vcs import path as vcspath
@@ -80,10 +81,7 @@ class RepoFilesView(RepoAppView):
 
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
-
         c.rhodecode_repo = self.rhodecode_vcs_repo
-
-
         return c
 
     def _ensure_not_locked(self):
@@ -100,6 +98,20 @@ class RepoFilesView(RepoAppView):
                 repo_name=self.db_repo_name, commit_id='tip')
             raise HTTPFound(files_url)
 
+    def check_branch_permission(self, branch_name):
+        _ = self.request.translate
+
+        rule, branch_perm = self._rhodecode_user.get_rule_and_branch_permission(
+            self.db_repo_name, branch_name)
+        if branch_perm and branch_perm not in ['branch.push', 'branch.push_force']:
+            h.flash(
+                _('Branch `{}` changes forbidden by rule {}.').format(branch_name, rule),
+                'warning')
+            files_url = h.route_path(
+                'repo_files:default_path',
+                repo_name=self.db_repo_name, commit_id='tip')
+            raise HTTPFound(files_url)
+
     def _get_commit_and_path(self):
         default_commit_id = self.db_repo.landing_rev[1]
         default_f_path = '/'
@@ -178,44 +190,66 @@ class RepoFilesView(RepoAppView):
         return file_node
 
     def _is_valid_head(self, commit_id, repo):
-        # check if commit is a branch identifier- basically we cannot
-        # create multiple heads via file editing
-        valid_heads = repo.branches.keys() + repo.branches.values()
+        branch_name = sha_commit_id = ''
+        is_head = False
 
         if h.is_svn(repo) and not repo.is_empty():
-            # Note: Subversion only has one head, we add it here in case there
-            # is no branch matched.
-            valid_heads.append(repo.get_commit(commit_idx=-1).raw_id)
+            # Note: Subversion only has one head.
+            if commit_id == repo.get_commit(commit_idx=-1).raw_id:
+                is_head = True
+                return branch_name, sha_commit_id, is_head
 
-        # check if commit is a branch name or branch hash
-        return commit_id in valid_heads
+        for _branch_name, branch_commit_id in repo.branches.items():
+            # simple case we pass in branch name, it's a HEAD
+            if commit_id == _branch_name:
+                is_head = True
+                branch_name = _branch_name
+                sha_commit_id = branch_commit_id
+                break
+            # case when we pass in full sha commit_id, which is a head
+            elif commit_id == branch_commit_id:
+                is_head = True
+                branch_name = _branch_name
+                sha_commit_id = branch_commit_id
+                break
 
-    def _get_tree_cache_manager(self, namespace_type):
-        _namespace = caches.get_repo_namespace_key(
-            namespace_type, self.db_repo_name)
-        return caches.get_cache_manager('repo_cache_long', _namespace)
+        # checked branches, means we only need to try to get the branch/commit_sha
+        if not repo.is_empty:
+            commit = repo.get_commit(commit_id=commit_id)
+            if commit:
+                branch_name = commit.branch
+                sha_commit_id = commit.raw_id
+
+        return branch_name, sha_commit_id, is_head
 
     def _get_tree_at_commit(
-            self, c, commit_id, f_path, full_load=False, force=False):
-        def _cached_tree():
-            log.debug('Generating cached file tree for %s, %s, %s',
-                      self.db_repo_name, commit_id, f_path)
+            self, c, commit_id, f_path, full_load=False):
+
+        repo_id = self.db_repo.repo_id
+
+        cache_seconds = safe_int(
+            rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
+        cache_on = cache_seconds > 0
+        log.debug(
+            'Computing FILE TREE for repo_id %s commit_id `%s` and path `%s`'
+            'with caching: %s[TTL: %ss]' % (
+                repo_id, commit_id, f_path, cache_on, cache_seconds or 0))
+
+        cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
+        region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
+
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                               condition=cache_on)
+        def compute_file_tree(repo_id, commit_id, f_path, full_load):
+            log.debug('Generating cached file tree for repo_id: %s, %s, %s',
+                      repo_id, commit_id, f_path)
 
             c.full_load = full_load
             return render(
                 'rhodecode:templates/files/files_browser_tree.mako',
                 self._get_template_context(c), self.request)
 
-        cache_manager = self._get_tree_cache_manager(caches.FILE_TREE)
-
-        cache_key = caches.compute_key_from_params(
-            self.db_repo_name, commit_id, f_path)
-
-        if force:
-            # we want to force recompute of caches
-            cache_manager.remove_value(cache_key)
-
-        return cache_manager.get(cache_key, createfunc=_cached_tree)
+        return compute_file_tree(self.db_repo.repo_id, commit_id, f_path, full_load)
 
     def _get_archive_spec(self, fname):
         log.debug('Detecting archive spec for: `%s`', fname)
@@ -281,6 +315,7 @@ class RepoFilesView(RepoAppView):
         use_cached_archive = False
         archive_cache_enabled = CONFIG.get(
             'archive_cache_dir') and not self.request.GET.get('no_cache')
+        cached_archive_path = None
 
         if archive_cache_enabled:
             # check if we it's ok to write
@@ -322,16 +357,16 @@ class RepoFilesView(RepoAppView):
             commit=True
         )
 
-        def get_chunked_archive(archive):
-            with open(archive, 'rb') as stream:
+        def get_chunked_archive(archive_path):
+            with open(archive_path, 'rb') as stream:
                 while True:
                     data = stream.read(16 * 1024)
                     if not data:
                         if fd:  # fd means we used temporary file
                             os.close(fd)
                         if not archive_cache_enabled:
-                            log.debug('Destroying temp archive %s', archive)
-                            os.remove(archive)
+                            log.debug('Destroying temp archive %s', archive_path)
+                            os.remove(archive_path)
                         break
                     yield data
 
@@ -572,8 +607,9 @@ class RepoFilesView(RepoAppView):
                         if not c.renderer:
                             c.lines = filenode_as_lines_tokens(c.file)
 
-                c.on_branch_head = self._is_valid_head(
+                _branch_name, _sha_commit_id, is_head = self._is_valid_head(
                     commit_id, self.rhodecode_vcs_repo)
+                c.on_branch_head = is_head
 
                 branch = c.commit.branch if (
                     c.commit.branch and '/' not in c.commit.branch) else None
@@ -667,12 +703,8 @@ class RepoFilesView(RepoAppView):
         c.file = dir_node
         c.commit = commit
 
-        # using force=True here, make a little trick. We flush the cache and
-        # compute it using the same key as without previous full_load, so now
-        # the fully loaded tree is now returned instead of partial,
-        # and we store this in caches
         html = self._get_tree_at_commit(
-            c, commit.raw_id, dir_node.path, full_load=True, force=True)
+            c, commit.raw_id, dir_node.path, full_load=True)
 
         return Response(html)
 
@@ -787,10 +819,24 @@ class RepoFilesView(RepoAppView):
 
         return response
 
-    def _get_nodelist_at_commit(self, repo_name, commit_id, f_path):
-        def _cached_nodes():
-            log.debug('Generating cached nodelist for %s, %s, %s',
-                      repo_name, commit_id, f_path)
+    def _get_nodelist_at_commit(self, repo_name, repo_id, commit_id, f_path):
+
+        cache_seconds = safe_int(
+            rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
+        cache_on = cache_seconds > 0
+        log.debug(
+            'Computing FILE SEARCH for repo_id %s commit_id `%s` and path `%s`'
+            'with caching: %s[TTL: %ss]' % (
+                repo_id, commit_id, f_path, cache_on, cache_seconds or 0))
+
+        cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
+        region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
+
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                               condition=cache_on)
+        def compute_file_search(repo_id, commit_id, f_path):
+            log.debug('Generating cached nodelist for repo_id:%s, %s, %s',
+                      repo_id, commit_id, f_path)
             try:
                 _d, _f = ScmModel().get_nodes(
                     repo_name, commit_id, f_path, flat=False)
@@ -802,12 +848,7 @@ class RepoFilesView(RepoAppView):
                     commit_id='tip', f_path='/'))
             return _d + _f
 
-        cache_manager = self._get_tree_cache_manager(
-            caches.FILE_SEARCH_TREE_META)
-
-        cache_key = caches.compute_key_from_params(
-            repo_name, commit_id, f_path)
-        return cache_manager.get(cache_key, createfunc=_cached_nodes)
+        return compute_file_search(self.db_repo.repo_id, commit_id, f_path)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
@@ -822,7 +863,7 @@ class RepoFilesView(RepoAppView):
         commit = self._get_commit_or_redirect(commit_id)
 
         metadata = self._get_nodelist_at_commit(
-            self.db_repo_name, commit.raw_id, f_path)
+            self.db_repo_name, self.db_repo.repo_id, commit.raw_id, f_path)
         return {'nodes': metadata}
 
     def _create_references(
@@ -982,15 +1023,18 @@ class RepoFilesView(RepoAppView):
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
+        _branch_name, _sha_commit_id, is_head = \
+            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        if not self._is_valid_head(commit_id, self.rhodecode_vcs_repo):
+        if not is_head:
             h.flash(_('You can only delete files with commit '
-                      'being a valid branch '), category='warning')
+                      'being a valid branch head.'), category='warning')
             raise HTTPFound(
                 h.route_path('repo_files',
                              repo_name=self.db_repo_name, commit_id='tip',
                              f_path=f_path))
 
+        self.check_branch_permission(_branch_name)
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
@@ -1013,14 +1057,17 @@ class RepoFilesView(RepoAppView):
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
+        _branch_name, _sha_commit_id, is_head = \
+            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        if not self._is_valid_head(commit_id, self.rhodecode_vcs_repo):
+        if not is_head:
             h.flash(_('You can only delete files with commit '
-                      'being a valid branch '), category='warning')
+                      'being a valid branch head.'), category='warning')
             raise HTTPFound(
                 h.route_path('repo_files',
                              repo_name=self.db_repo_name, commit_id='tip',
                              f_path=f_path))
+        self.check_branch_permission(_branch_name)
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
@@ -1066,14 +1113,17 @@ class RepoFilesView(RepoAppView):
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
+        _branch_name, _sha_commit_id, is_head = \
+            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        if not self._is_valid_head(commit_id, self.rhodecode_vcs_repo):
+        if not is_head:
             h.flash(_('You can only edit files with commit '
-                      'being a valid branch '), category='warning')
+                      'being a valid branch head.'), category='warning')
             raise HTTPFound(
                 h.route_path('repo_files',
                              repo_name=self.db_repo_name, commit_id='tip',
                              f_path=f_path))
+        self.check_branch_permission(_branch_name)
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
@@ -1103,15 +1153,19 @@ class RepoFilesView(RepoAppView):
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
+        _branch_name, _sha_commit_id, is_head = \
+            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        if not self._is_valid_head(commit_id, self.rhodecode_vcs_repo):
+        if not is_head:
             h.flash(_('You can only edit files with commit '
-                      'being a valid branch '), category='warning')
+                      'being a valid branch head.'), category='warning')
             raise HTTPFound(
                 h.route_path('repo_files',
                              repo_name=self.db_repo_name, commit_id='tip',
                              f_path=f_path))
 
+        self.check_branch_permission(_branch_name)
+
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
@@ -1191,6 +1245,25 @@ class RepoFilesView(RepoAppView):
         c.default_message = (_('Added file via RhodeCode Enterprise'))
         c.f_path = f_path.lstrip('/')  # ensure not relative path
 
+        if self.rhodecode_vcs_repo.is_empty:
+            # for empty repository we cannot check for current branch, we rely on
+            # c.commit.branch instead
+            _branch_name = c.commit.branch
+            is_head = True
+        else:
+            _branch_name, _sha_commit_id, is_head = \
+                self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+
+        if not is_head:
+            h.flash(_('You can only add files with commit '
+                      'being a valid branch head.'), category='warning')
+            raise HTTPFound(
+                h.route_path('repo_files',
+                             repo_name=self.db_repo_name, commit_id='tip',
+                             f_path=f_path))
+
+        self.check_branch_permission(_branch_name)
+
         return self._get_template_context(c)
 
     @LoginRequired()
@@ -1212,6 +1285,26 @@ class RepoFilesView(RepoAppView):
             commit_id, redirect_after=False)
         if c.commit is None:
             c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
+
+        if self.rhodecode_vcs_repo.is_empty:
+            # for empty repository we cannot check for current branch, we rely on
+            # c.commit.branch instead
+            _branch_name = c.commit.branch
+            is_head = True
+        else:
+            _branch_name, _sha_commit_id, is_head = \
+                self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+
+        if not is_head:
+            h.flash(_('You can only add files with commit '
+                      'being a valid branch head.'), category='warning')
+            raise HTTPFound(
+                h.route_path('repo_files',
+                             repo_name=self.db_repo_name, commit_id='tip',
+                             f_path=f_path))
+
+        self.check_branch_permission(_branch_name)
+
         c.default_message = (_('Added file via RhodeCode Enterprise'))
         c.f_path = f_path
         unix_mode = 0
diff --git a/rhodecode/apps/repository/views/repo_forks.py b/rhodecode/apps/repository/views/repo_forks.py
--- a/rhodecode/apps/repository/views/repo_forks.py
+++ b/rhodecode/apps/repository/views/repo_forks.py
@@ -28,6 +28,7 @@ from pyramid.view import view_config
 from pyramid.renderers import render
 from pyramid.response import Response
 
+from rhodecode import events
 from rhodecode.apps._base import RepoAppView, DataGridAppView
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator, NotAnonymous,
@@ -154,7 +155,7 @@ class RepoForksView(RepoAppView, DataGri
             forks_data.append({
                 "username": h.gravatar_with_user(self.request, fork.user.username),
                 "fork_name": fork_name(fork),
-                "description": fork.description,
+                "description": fork.description_safe,
                 "fork_date": h.age_component(fork.created_on, time_is_local=True),
                 "last_activity": h.format_date(fork.updated_on),
                 "action": fork_actions(fork),
@@ -253,6 +254,9 @@ class RepoForksView(RepoAppView, DataGri
             h.flash(msg, category='error')
 
         repo_name = form_result.get('repo_name_full', self.db_repo_name)
+
+        events.trigger(events.UserPermissionsChange([self._rhodecode_user.user_id]))
+
         raise HTTPFound(
             h.route_path('repo_creating',
                          repo_name=repo_name,
diff --git a/rhodecode/apps/repository/views/repo_permissions.py b/rhodecode/apps/repository/views/repo_permissions.py
--- a/rhodecode/apps/repository/views/repo_permissions.py
+++ b/rhodecode/apps/repository/views/repo_permissions.py
@@ -23,6 +23,7 @@ import logging
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 
+from rhodecode import events
 from rhodecode.apps._base import RepoAppView
 from rhodecode.lib import helpers as h
 from rhodecode.lib import audit_logger
@@ -39,8 +40,6 @@ class RepoSettingsPermissionsView(RepoAp
 
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-
-
         return c
 
     @LoginRequired()
@@ -85,5 +84,12 @@ class RepoSettingsPermissionsView(RepoAp
         Session().commit()
         h.flash(_('Repository permissions updated'), category='success')
 
+        affected_user_ids = []
+        for change in changes['added'] + changes['updated'] + changes['deleted']:
+            if change['type'] == 'user':
+                affected_user_ids.append(change['id'])
+
+        events.trigger(events.UserPermissionsChange(affected_user_ids))
+
         raise HTTPFound(
             h.route_path('edit_repo_perms', repo_name=self.db_repo_name))
diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py
--- a/rhodecode/apps/repository/views/repo_pull_requests.py
+++ b/rhodecode/apps/repository/views/repo_pull_requests.py
@@ -61,7 +61,8 @@ class RepoPullRequestsView(RepoAppView, 
         c = self._get_local_tmpl_context(include_app_defaults=True)
         c.REVIEW_STATUS_APPROVED = ChangesetStatus.STATUS_APPROVED
         c.REVIEW_STATUS_REJECTED = ChangesetStatus.STATUS_REJECTED
-
+        # backward compat., we use for OLD PRs a plain renderer
+        c.renderer = 'plain'
         return c
 
     def _get_pull_requests_list(
@@ -248,6 +249,7 @@ class RepoPullRequestsView(RepoAppView, 
         from_version = self.request.GET.get('from_version') or version
         merge_checks = self.request.GET.get('merge_checks')
         c.fulldiff = str2bool(self.request.GET.get('fulldiff'))
+        force_refresh = str2bool(self.request.GET.get('force_refresh'))
 
         (pull_request_latest,
          pull_request_at_ver,
@@ -296,6 +298,7 @@ class RepoPullRequestsView(RepoAppView, 
             pull_request_at_ver)
 
         c.pull_request = pull_request_display_obj
+        c.renderer = pull_request_at_ver.description_renderer or c.renderer
         c.pull_request_latest = pull_request_latest
 
         if compare or (at_version and not at_version == 'latest'):
@@ -338,8 +341,9 @@ class RepoPullRequestsView(RepoAppView, 
 
         # check merge capabilities
         _merge_check = MergeCheck.validate(
-            pull_request_latest, user=self._rhodecode_user,
-            translator=self.request.translate)
+            pull_request_latest, auth_user=self._rhodecode_user,
+            translator=self.request.translate,
+            force_shadow_repo_refresh=force_refresh)
         c.pr_merge_errors = _merge_check.error_details
         c.pr_merge_possible = not _merge_check.failed
         c.pr_merge_message = _merge_check.merge_msg
@@ -432,12 +436,14 @@ class RepoPullRequestsView(RepoAppView, 
         source_scm = source_repo.scm_instance()
         target_scm = target_repo.scm_instance()
 
-        # try first shadow repo, fallback to regular repo
+        shadow_scm = None
         try:
-            commits_source_repo = pull_request_latest.get_shadow_repo()
+            shadow_scm = pull_request_latest.get_shadow_repo()
         except Exception:
             log.debug('Failed to get shadow repo', exc_info=True)
-            commits_source_repo = source_scm
+        # try first the existing source_repo, and then shadow
+        # repo if we can obtain one
+        commits_source_repo = source_scm or shadow_scm
 
         c.commits_source_repo = commits_source_repo
         c.ancestor = None  # set it to None, to hide it from PR view
@@ -766,7 +772,10 @@ class RepoPullRequestsView(RepoAppView, 
                 'id': obj['name'],
                 'text': obj['name'],
                 'type': 'repo',
-                'obj': obj['dbrepo']
+                'repo_id': obj['dbrepo']['repo_id'],
+                'repo_type': obj['dbrepo']['repo_type'],
+                'private': obj['dbrepo']['private'],
+
             })
 
         data = {
@@ -861,9 +870,22 @@ class RepoPullRequestsView(RepoAppView, 
         ancestor = source_scm.get_common_ancestor(
             source_commit.raw_id, target_commit.raw_id, target_scm)
 
+        # recalculate target ref based on ancestor
         target_ref_type, target_ref_name, __ = _form['target_ref'].split(':')
         target_ref = ':'.join((target_ref_type, target_ref_name, ancestor))
 
+        get_default_reviewers_data, validate_default_reviewers = \
+            PullRequestModel().get_reviewer_functions()
+
+        # recalculate reviewers logic, to make sure we can validate this
+        reviewer_rules = get_default_reviewers_data(
+            self._rhodecode_db_user, source_db_repo,
+            source_commit, target_db_repo, target_commit)
+
+        given_reviewers = _form['review_members']
+        reviewers = validate_default_reviewers(
+            given_reviewers, reviewer_rules)
+
         pullrequest_title = _form['pullrequest_title']
         title_source_ref = source_ref.split(':', 2)[1]
         if not pullrequest_title:
@@ -874,23 +896,22 @@ class RepoPullRequestsView(RepoAppView, 
             )
 
         description = _form['pullrequest_desc']
-
-        get_default_reviewers_data, validate_default_reviewers = \
-            PullRequestModel().get_reviewer_functions()
-
-        # recalculate reviewers logic, to make sure we can validate this
-        reviewer_rules = get_default_reviewers_data(
-            self._rhodecode_db_user, source_db_repo,
-            source_commit, target_db_repo, target_commit)
-
-        given_reviewers = _form['review_members']
-        reviewers = validate_default_reviewers(given_reviewers, reviewer_rules)
+        description_renderer = _form['description_renderer']
 
         try:
             pull_request = PullRequestModel().create(
-                self._rhodecode_user.user_id, source_repo, source_ref,
-                target_repo, target_ref, commit_ids, reviewers,
-                pullrequest_title, description, reviewer_rules
+                created_by=self._rhodecode_user.user_id,
+                source_repo=source_repo,
+                source_ref=source_ref,
+                target_repo=target_repo,
+                target_ref=target_ref,
+                revisions=commit_ids,
+                reviewers=reviewers,
+                title=pullrequest_title,
+                description=description,
+                description_renderer=description_renderer,
+                reviewer_data=reviewer_rules,
+                auth_user=self._rhodecode_user
             )
             Session().commit()
 
@@ -953,10 +974,14 @@ class RepoPullRequestsView(RepoAppView, 
 
     def _edit_pull_request(self, pull_request):
         _ = self.request.translate
+
         try:
             PullRequestModel().edit(
-                pull_request, self.request.POST.get('title'),
-                self.request.POST.get('description'), self._rhodecode_user)
+                pull_request,
+                self.request.POST.get('title'),
+                self.request.POST.get('description'),
+                self.request.POST.get('description_renderer'),
+                self._rhodecode_user)
         except ValueError:
             msg = _(u'Cannot update closed pull requests.')
             h.flash(msg, category='error')
@@ -1031,8 +1056,9 @@ class RepoPullRequestsView(RepoAppView, 
             self.request.matchdict['pull_request_id'])
 
         self.load_default_context()
-        check = MergeCheck.validate(pull_request, self._rhodecode_db_user,
-                                    translator=self.request.translate)
+        check = MergeCheck.validate(
+            pull_request, auth_user=self._rhodecode_user,
+            translator=self.request.translate)
         merge_possible = not check.failed
 
         for err_type, error_msg in check.errors:
@@ -1056,7 +1082,7 @@ class RepoPullRequestsView(RepoAppView, 
 
     def _merge_pull_request(self, pull_request, user, extras):
         _ = self.request.translate
-        merge_resp = PullRequestModel().merge(pull_request, user, extras=extras)
+        merge_resp = PullRequestModel().merge_repo(pull_request, user, extras=extras)
 
         if merge_resp.executed:
             log.debug("The merge was successful, closing the pull request.")
@@ -1199,7 +1225,8 @@ class RepoPullRequestsView(RepoAppView, 
                 status_change_type=(status
                                     if status and allowed_to_change_status else None),
                 comment_type=comment_type,
-                resolves_comment_id=resolves_comment_id
+                resolves_comment_id=resolves_comment_id,
+                auth_user=self._rhodecode_user
             )
 
             if allowed_to_change_status:
@@ -1285,7 +1312,7 @@ class RepoPullRequestsView(RepoAppView, 
 
         if super_admin or comment_owner or comment_repo_admin:
             old_calculated_status = comment.pull_request.calculated_review_status()
-            CommentsModel().delete(comment=comment, user=self._rhodecode_user)
+            CommentsModel().delete(comment=comment, auth_user=self._rhodecode_user)
             Session().commit()
             calculated_status = comment.pull_request.calculated_review_status()
             if old_calculated_status != calculated_status:
diff --git a/rhodecode/apps/repository/views/repo_settings.py b/rhodecode/apps/repository/views/repo_settings.py
--- a/rhodecode/apps/repository/views/repo_settings.py
+++ b/rhodecode/apps/repository/views/repo_settings.py
@@ -24,13 +24,14 @@ import deform
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 
+from rhodecode import events
 from rhodecode.apps._base import RepoAppView
 from rhodecode.forms import RcForm
 from rhodecode.lib import helpers as h
 from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
-from rhodecode.model.db import RepositoryField, RepoGroup, Repository
+from rhodecode.model.db import RepositoryField, RepoGroup, Repository, User
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import RepoGroupList, ScmModel
@@ -71,8 +72,6 @@ class RepoSettingsView(RepoAppView):
         c.personal_repo_group = c.auth_user.personal_repo_group
         c.repo_fields = RepositoryField.query()\
             .filter(RepositoryField.repository == self.db_repo).all()
-
-
         return c
 
     def _get_schema(self, c, old_values=None):
@@ -176,6 +175,13 @@ class RepoSettingsView(RepoAppView):
             h.flash(_('Error occurred during update of repository {}').format(
                 old_repo_name), category='error')
 
+        name_changed = old_repo_name != new_repo_name
+        if name_changed:
+            owner = User.get_by_username(schema_data['repo_owner'])
+            owner_id = owner.user_id if owner else self._rhodecode_user.user_id
+            events.trigger(events.UserPermissionsChange([
+                self._rhodecode_user.user_id, owner_id]))
+
         raise HTTPFound(
             h.route_path('edit_repo', repo_name=new_repo_name))
 
diff --git a/rhodecode/apps/repository/views/repo_settings_advanced.py b/rhodecode/apps/repository/views/repo_settings_advanced.py
--- a/rhodecode/apps/repository/views/repo_settings_advanced.py
+++ b/rhodecode/apps/repository/views/repo_settings_advanced.py
@@ -242,6 +242,7 @@ class RepoSettingsView(RepoAppView):
         _ = self.request.translate
         self.load_default_context()
         self.rhodecode_vcs_repo.install_hooks(force=True)
-        h.flash(_('installed hooks repository'), category='success')
+        h.flash(_('installed updated hooks into this repository'),
+                category='success')
         raise HTTPFound(
             h.route_path('edit_repo_advanced', repo_name=self.db_repo_name))
diff --git a/rhodecode/apps/repository/views/repo_summary.py b/rhodecode/apps/repository/views/repo_summary.py
--- a/rhodecode/apps/repository/views/repo_summary.py
+++ b/rhodecode/apps/repository/views/repo_summary.py
@@ -20,22 +20,21 @@
 
 import logging
 import string
+import rhodecode
 
 from pyramid.view import view_config
-from beaker.cache import cache_region
 
 from rhodecode.controllers import utils
 from rhodecode.apps._base import RepoAppView
 from rhodecode.config.conf import (LANGUAGES_EXTENSIONS_MAP)
-from rhodecode.lib import caches, helpers as h
-from rhodecode.lib.helpers import RepoPage
+from rhodecode.lib import helpers as h, rc_cache
 from rhodecode.lib.utils2 import safe_str, safe_int
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.markup_renderer import MarkupRenderer, relative_links
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.vcs.backends.base import EmptyCommit
-from rhodecode.lib.vcs.exceptions import CommitError, EmptyRepositoryError, \
-    CommitDoesNotExistError
+from rhodecode.lib.vcs.exceptions import (
+    CommitError, EmptyRepositoryError, CommitDoesNotExistError)
 from rhodecode.model.db import Statistics, CacheKey, User
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import ReadmeFinder
@@ -53,26 +52,32 @@ class RepoSummaryView(RepoAppView):
             c.rhodecode_repo = self.rhodecode_vcs_repo
         return c
 
-    def _get_readme_data(self, db_repo, default_renderer):
-        repo_name = db_repo.repo_name
+    def _get_readme_data(self, db_repo, renderer_type):
+
         log.debug('Looking for README file')
 
-        @cache_region('long_term')
-        def _generate_readme(cache_key):
+        cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
+            db_repo.repo_id, CacheKey.CACHE_TYPE_README)
+        invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+            repo_id=self.db_repo.repo_id)
+        region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
+
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
+        def generate_repo_readme(repo_id, _repo_name, _renderer_type):
             readme_data = None
             readme_node = None
             readme_filename = None
             commit = self._get_landing_commit_or_none(db_repo)
             if commit:
                 log.debug("Searching for a README file.")
-                readme_node = ReadmeFinder(default_renderer).search(commit)
+                readme_node = ReadmeFinder(_renderer_type).search(commit)
             if readme_node:
                 relative_urls = {
                     'raw': h.route_path(
-                        'repo_file_raw', repo_name=repo_name,
+                        'repo_file_raw', repo_name=_repo_name,
                         commit_id=commit.raw_id, f_path=readme_node.path),
                     'standard': h.route_path(
-                        'repo_files', repo_name=repo_name,
+                        'repo_files', repo_name=_repo_name,
                         commit_id=commit.raw_id, f_path=readme_node.path),
                 }
                 readme_data = self._render_readme_or_none(
@@ -80,14 +85,20 @@ class RepoSummaryView(RepoAppView):
                 readme_filename = readme_node.path
             return readme_data, readme_filename
 
-        invalidator_context = CacheKey.repo_context_cache(
-            _generate_readme, repo_name, CacheKey.CACHE_TYPE_README)
+        inv_context_manager = rc_cache.InvalidationContext(
+            uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
+        with inv_context_manager as invalidation_context:
+            args = (db_repo.repo_id, db_repo.repo_name, renderer_type,)
+            # re-compute and store cache if we get invalidate signal
+            if invalidation_context.should_invalidate():
+                instance = generate_repo_readme.refresh(*args)
+            else:
+                instance = generate_repo_readme(*args)
 
-        with invalidator_context as context:
-            context.invalidate()
-            computed = context.compute()
-
-        return computed
+            log.debug(
+                'Repo readme generated and computed in %.3fs',
+                inv_context_manager.compute_time)
+            return instance
 
     def _get_landing_commit_or_none(self, db_repo):
         log.debug("Getting the landing commit.")
@@ -134,7 +145,7 @@ class RepoSummaryView(RepoAppView):
         except EmptyRepositoryError:
             collection = self.rhodecode_vcs_repo
 
-        c.repo_commits = RepoPage(
+        c.repo_commits = h.RepoPage(
             collection, page=p, items_per_page=size, url=url_generator)
         page_ids = [x.raw_id for x in c.repo_commits]
         c.comments = self.db_repo.get_comments(page_ids)
@@ -247,16 +258,23 @@ class RepoSummaryView(RepoAppView):
         renderer='json_ext')
     def repo_stats(self):
         commit_id = self.get_request_commit_id()
+        show_stats = bool(self.db_repo.enable_statistics)
+        repo_id = self.db_repo.repo_id
 
-        _namespace = caches.get_repo_namespace_key(
-            caches.SUMMARY_STATS, self.db_repo_name)
-        show_stats = bool(self.db_repo.enable_statistics)
-        cache_manager = caches.get_cache_manager(
-            'repo_cache_long', _namespace)
-        _cache_key = caches.compute_key_from_params(
-            self.db_repo_name, commit_id, show_stats)
+        cache_seconds = safe_int(
+            rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
+        cache_on = cache_seconds > 0
+        log.debug(
+            'Computing REPO TREE for repo_id %s commit_id `%s` '
+            'with caching: %s[TTL: %ss]' % (
+                repo_id, commit_id, cache_on, cache_seconds or 0))
 
-        def compute_stats():
+        cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
+        region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
+
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                               condition=cache_on)
+        def compute_stats(repo_id, commit_id, show_stats):
             code_stats = {}
             size = 0
             try:
@@ -279,7 +297,7 @@ class RepoSummaryView(RepoAppView):
             return {'size': h.format_byte_size_binary(size),
                     'code_stats': code_stats}
 
-        stats = cache_manager.get(_cache_key, createfunc=compute_stats)
+        stats = compute_stats(self.db_repo.repo_id, commit_id, show_stats)
         return stats
 
     @LoginRequired()
diff --git a/rhodecode/apps/ssh_support/lib/backends/__init__.py b/rhodecode/apps/ssh_support/lib/backends/__init__.py
--- a/rhodecode/apps/ssh_support/lib/backends/__init__.py
+++ b/rhodecode/apps/ssh_support/lib/backends/__init__.py
@@ -62,7 +62,8 @@ class SshWrapper(object):
             key.accessed_on = datetime.datetime.utcnow()
             Session().add(key)
             Session().commit()
-            log.debug('Update key `%s` access time', key_id)
+            log.debug('Update key id:`%s` fingerprint:`%s` access time',
+                      key_id, key.ssh_key_fingerprint)
 
     def get_connection_info(self):
         """
@@ -119,11 +120,25 @@ class SshWrapper(object):
 
         return vcs_type, repo_name, mode
 
-    def serve(self, vcs, repo, mode, user, permissions):
+    def serve(self, vcs, repo, mode, user, permissions, branch_permissions):
         store = ScmModel().repos_path
 
+        check_branch_perms = False
+        detect_force_push = False
+
+        if branch_permissions:
+            check_branch_perms = True
+            detect_force_push = True
+
         log.debug(
-            'VCS detected:`%s` mode: `%s` repo_name: %s', vcs, mode, repo)
+            'VCS detected:`%s` mode: `%s` repo_name: %s, branch_permission_checks:%s',
+            vcs, mode, repo, check_branch_perms)
+
+        # detect if we have to check branch permissions
+        extras = {
+            'detect_force_push': detect_force_push,
+            'check_branch_perms': check_branch_perms,
+        }
 
         if vcs == 'hg':
             server = MercurialServer(
@@ -131,7 +146,7 @@ class SshWrapper(object):
                 repo_name=repo, user=user,
                 user_permissions=permissions, config=self.config, env=self.env)
             self.server_impl = server
-            return server.run()
+            return server.run(tunnel_extras=extras)
 
         elif vcs == 'git':
             server = GitServer(
@@ -139,7 +154,7 @@ class SshWrapper(object):
                 repo_name=repo, repo_mode=mode, user=user,
                 user_permissions=permissions, config=self.config, env=self.env)
             self.server_impl = server
-            return server.run()
+            return server.run(tunnel_extras=extras)
 
         elif vcs == 'svn':
             server = SubversionServer(
@@ -147,7 +162,7 @@ class SshWrapper(object):
                 repo_name=None, user=user,
                 user_permissions=permissions, config=self.config, env=self.env)
             self.server_impl = server
-            return server.run()
+            return server.run(tunnel_extras=extras)
 
         else:
             raise Exception('Unrecognised VCS: {}'.format(vcs))
@@ -187,10 +202,11 @@ class SshWrapper(object):
 
             auth_user = user.AuthUser()
             permissions = auth_user.permissions['repositories']
-
+            repo_branch_permissions = auth_user.get_branch_permissions(scm_repo)
             try:
                 exit_code, is_updated = self.serve(
-                    scm_detected, scm_repo, scm_mode, user, permissions)
+                    scm_detected, scm_repo, scm_mode, user, permissions,
+                    repo_branch_permissions)
             except Exception:
                 log.exception('Error occurred during execution of SshWrapper')
                 exit_code = -1
diff --git a/rhodecode/apps/ssh_support/lib/backends/base.py b/rhodecode/apps/ssh_support/lib/backends/base.py
--- a/rhodecode/apps/ssh_support/lib/backends/base.py
+++ b/rhodecode/apps/ssh_support/lib/backends/base.py
@@ -70,6 +70,11 @@ class VcsServer(object):
             'permission for %s on %s are: %s',
             self.user, self.repo_name, permission)
 
+        if not permission:
+            log.error('user `%s` permissions to repo:%s are empty. Forbidding access.',
+                      self.user, self.repo_name)
+            return -2
+
         if action == 'pull':
             if permission in self.read_perms:
                 log.info(
@@ -83,8 +88,8 @@ class VcsServer(object):
                     self.user, self.repo_name)
                 return 0
 
-        log.error('Cannot properly fetch or allow user %s permissions. '
-                  'Return value is: %s, req action: %s',
+        log.error('Cannot properly fetch or verify user `%s` permissions. '
+                  'Permissions: %s, vcs action: %s',
                   self.user, permission, action)
         return -2
 
@@ -101,11 +106,15 @@ class VcsServer(object):
             'make_lock': None,
             'locked_by': [None, None],
             'server_url': None,
-            'is_shadow_repo': False,
-            'hooks_module': 'rhodecode.lib.hooks_daemon',
+            'user_agent': 'ssh-user-agent',
             'hooks': ['push', 'pull'],
+            'hooks_module': 'rhodecode.lib.hooks_daemon',
+            'is_shadow_repo': False,
+            'detect_force_push': False,
+            'check_branch_perms': False,
+
             'SSH': True,
-            'SSH_PERMISSIONS': self.user_permissions.get(self.repo_name)
+            'SSH_PERMISSIONS': self.user_permissions.get(self.repo_name),
         }
         if extras:
             scm_data.update(extras)
@@ -134,11 +143,14 @@ class VcsServer(object):
 
         return exit_code, action == "push"
 
-    def run(self):
+    def run(self, tunnel_extras=None):
+        tunnel_extras = tunnel_extras or {}
         extras = {}
+        extras.update(tunnel_extras)
 
         callback_daemon, extras = prepare_callback_daemon(
             extras, protocol=vcs_settings.HOOKS_PROTOCOL,
+            host=vcs_settings.HOOKS_HOST,
             use_direct_calls=False)
 
         with callback_daemon:
diff --git a/rhodecode/apps/ssh_support/tests/test_server_git.py b/rhodecode/apps/ssh_support/tests/test_server_git.py
--- a/rhodecode/apps/ssh_support/tests/test_server_git.py
+++ b/rhodecode/apps/ssh_support/tests/test_server_git.py
@@ -139,6 +139,9 @@ class TestGitServer(object):
             'hooks': ['push', 'pull'],
             'is_shadow_repo': False,
             'hooks_module': 'rhodecode.lib.hooks_daemon',
+            'check_branch_perms': False,
+            'detect_force_push': False,
+            'user_agent': u'ssh-user-agent',
             'SSH': True,
             'SSH_PERMISSIONS': 'repository.admin',
         }
diff --git a/rhodecode/apps/ssh_support/tests/test_ssh_wrapper.py b/rhodecode/apps/ssh_support/tests/test_ssh_wrapper.py
--- a/rhodecode/apps/ssh_support/tests/test_ssh_wrapper.py
+++ b/rhodecode/apps/ssh_support/tests/test_ssh_wrapper.py
@@ -27,7 +27,7 @@ class TestSSHWrapper(object):
         with pytest.raises(Exception) as exc_info:
             ssh_wrapper.serve(
                 vcs='microsoft-tfs', repo='test-repo', mode=None, user='test',
-                permissions={})
+                permissions={}, branch_permissions={})
         assert exc_info.value.message == 'Unrecognised VCS: microsoft-tfs'
 
     def test_parse_config(self, ssh_wrapper):
diff --git a/rhodecode/apps/user_group/tests/test_user_groups_permissions.py b/rhodecode/apps/user_group/tests/test_user_groups_permissions.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/apps/user_group/tests/test_user_groups_permissions.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import pytest
+
+from rhodecode.tests.utils import permission_update_data_generator
+
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+    from rhodecode.apps._base import ADMIN_PREFIX
+
+    base_url = {
+        'edit_user_group_perms':
+            ADMIN_PREFIX + '/user_groups/{user_group_id}/edit/permissions',
+        'edit_user_group_perms_update':
+            ADMIN_PREFIX + '/user_groups/{user_group_id}/edit/permissions/update',
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+@pytest.mark.usefixtures("app")
+class TestUserGroupPermissionsView(object):
+
+    def test_edit_perms_view(self, user_util, autologin_user):
+        user_group = user_util.create_user_group()
+        self.app.get(
+            route_path('edit_user_group_perms',
+                       user_group_id=user_group.users_group_id), status=200)
+
+    def test_update_permissions(self, csrf_token, user_util):
+        user_group = user_util.create_user_group()
+        user_group_id = user_group.users_group_id
+        user = user_util.create_user()
+        user_id = user.user_id
+        username = user.username
+
+        # grant new
+        form_data = permission_update_data_generator(
+            csrf_token,
+            default='usergroup.write',
+            grant=[(user_id, 'usergroup.write', username, 'user')])
+
+        response = self.app.post(
+            route_path('edit_user_group_perms_update',
+                       user_group_id=user_group_id), form_data).follow()
+
+        assert 'User Group permissions updated' in response
+
+        # revoke given
+        form_data = permission_update_data_generator(
+            csrf_token,
+            default='usergroup.read',
+            revoke=[(user_id, 'user')])
+
+        response = self.app.post(
+            route_path('edit_user_group_perms_update',
+                       user_group_id=user_group_id), form_data).follow()
+
+        assert 'User Group permissions updated' in response
diff --git a/rhodecode/apps/user_group/views/__init__.py b/rhodecode/apps/user_group/views/__init__.py
--- a/rhodecode/apps/user_group/views/__init__.py
+++ b/rhodecode/apps/user_group/views/__init__.py
@@ -28,6 +28,7 @@ from pyramid.view import view_config
 from pyramid.response import Response
 from pyramid.renderers import render
 
+from rhodecode import events
 from rhodecode.lib.exceptions import (
     RepoGroupAssignmentError, UserGroupAssignedException)
 from rhodecode.model.forms import (
@@ -139,6 +140,9 @@ class UserGroupsView(UserGroupAppView):
         user_group = self.db_user_group
         user_group_id = user_group.users_group_id
 
+        old_user_group_name = self.db_user_group_name
+        new_user_group_name = old_user_group_name
+
         c = self.load_default_context()
         c.user_group = user_group
         c.group_members_obj = [x.user for x in c.user_group.members]
@@ -151,7 +155,7 @@ class UserGroupsView(UserGroupAppView):
             old_data=c.user_group.get_dict(), allow_disabled=True)()
 
         old_values = c.user_group.get_api_data()
-        user_group_name = self.request.POST.get('users_group_name')
+
         try:
             form_result = users_group_form.to_python(self.request.POST)
             pstruct = peppercorn.parse(self.request.POST.items())
@@ -159,7 +163,7 @@ class UserGroupsView(UserGroupAppView):
 
             user_group, added_members, removed_members = \
                 UserGroupModel().update(c.user_group, form_result)
-            updated_user_group = form_result['users_group_name']
+            new_user_group_name = form_result['users_group_name']
 
             for user_id in added_members:
                 user = User.get(user_id)
@@ -181,8 +185,22 @@ class UserGroupsView(UserGroupAppView):
                 'user_group.edit', action_data={'old_data': old_values},
                 user=self._rhodecode_user)
 
-            h.flash(_('Updated user group %s') % updated_user_group,
+            h.flash(_('Updated user group %s') % new_user_group_name,
                     category='success')
+
+            affected_user_ids = []
+            for user_id in added_members + removed_members:
+                affected_user_ids.append(user_id)
+
+            name_changed = old_user_group_name != new_user_group_name
+            if name_changed:
+                owner = User.get_by_username(form_result['user'])
+                owner_id = owner.user_id if owner else self._rhodecode_user.user_id
+                affected_user_ids.append(self._rhodecode_user.user_id)
+                affected_user_ids.append(owner_id)
+
+            events.trigger(events.UserPermissionsChange(affected_user_ids))
+
             Session().commit()
         except formencode.Invalid as errors:
             defaults = errors.value
@@ -204,7 +222,7 @@ class UserGroupsView(UserGroupAppView):
         except Exception:
             log.exception("Exception during update of user group")
             h.flash(_('Error occurred during update of user group %s')
-                    % user_group_name, category='error')
+                    % new_user_group_name, category='error')
 
         raise HTTPFound(
             h.route_path('edit_user_group', user_group_id=user_group_id))
@@ -354,6 +372,14 @@ class UserGroupsView(UserGroupAppView):
 
         Session().commit()
         h.flash(_('User Group permissions updated'), category='success')
+
+        affected_user_ids = []
+        for change in changes['added'] + changes['updated'] + changes['deleted']:
+            if change['type'] == 'user':
+                affected_user_ids.append(change['id'])
+
+        events.trigger(events.UserPermissionsChange(affected_user_ids))
+
         raise HTTPFound(
             h.route_path('edit_user_group_perms', user_group_id=user_group_id))
 
diff --git a/rhodecode/authentication/__init__.py b/rhodecode/authentication/__init__.py
--- a/rhodecode/authentication/__init__.py
+++ b/rhodecode/authentication/__init__.py
@@ -37,6 +37,7 @@ log = logging.getLogger(__name__)
 # Plugin ID prefixes to distinct between normal and legacy plugins.
 plugin_prefix = 'egg:'
 legacy_plugin_prefix = 'py:'
+plugin_default_auth_ttl = 30
 
 
 # TODO: Currently this is only used to discover the authentication plugins.
diff --git a/rhodecode/authentication/base.py b/rhodecode/authentication/base.py
--- a/rhodecode/authentication/base.py
+++ b/rhodecode/authentication/base.py
@@ -35,7 +35,7 @@ from pyramid.threadlocal import get_curr
 
 from rhodecode.authentication.interface import IAuthnPluginRegistry
 from rhodecode.authentication.schema import AuthnPluginSettingsSchemaBase
-from rhodecode.lib import caches
+from rhodecode.lib import rc_cache
 from rhodecode.lib.auth import PasswordGenerator, _RhodeCodeCryptoBCrypt
 from rhodecode.lib.utils2 import safe_int, safe_str
 from rhodecode.lib.exceptions import LdapConnectionError
@@ -439,7 +439,11 @@ class RhodeCodeAuthPluginBase(object):
 
     def get_ttl_cache(self, settings=None):
         plugin_settings = settings or self.get_settings()
-        cache_ttl = 0
+        # we set default to 30, we make a compromise here,
+        # performance > security, mostly due to LDAP/SVN, majority
+        # of users pick cache_ttl to be enabled
+        from rhodecode.authentication import plugin_default_auth_ttl
+        cache_ttl = plugin_default_auth_ttl
 
         if isinstance(self.AUTH_CACHE_TTL, (int, long)):
             # plugin cache set inside is more important than the settings value
@@ -633,22 +637,6 @@ def get_authn_registry(registry=None):
     return authn_registry
 
 
-def get_auth_cache_manager(custom_ttl=None, suffix=None):
-    cache_name = 'rhodecode.authentication'
-    if suffix:
-        cache_name = 'rhodecode.authentication.{}'.format(suffix)
-    return caches.get_cache_manager(
-        'auth_plugins', cache_name, custom_ttl)
-
-
-def get_perms_cache_manager(custom_ttl=None, suffix=None):
-    cache_name = 'rhodecode.permissions'
-    if suffix:
-        cache_name = 'rhodecode.permissions.{}'.format(suffix)
-    return caches.get_cache_manager(
-        'auth_plugins', cache_name, custom_ttl)
-
-
 def authenticate(username, password, environ=None, auth_type=None,
                  skip_missing=False, registry=None, acl_repo_name=None):
     """
@@ -707,45 +695,37 @@ def authenticate(username, password, env
 
         plugin_cache_active, cache_ttl = plugin.get_ttl_cache(plugin_settings)
 
-        # get instance of cache manager configured for a namespace
-        cache_manager = get_auth_cache_manager(
-            custom_ttl=cache_ttl, suffix=user.user_id if user else '')
-
         log.debug('AUTH_CACHE_TTL for plugin `%s` active: %s (TTL: %s)',
                   plugin.get_id(), plugin_cache_active, cache_ttl)
 
-        # for environ based password can be empty, but then the validation is
-        # on the server that fills in the env data needed for authentication
-
-        _password_hash = caches.compute_key_from_params(
-            plugin.name, username, (password or ''))
+        user_id = user.user_id if user else None
+        # don't cache for empty users
+        plugin_cache_active = plugin_cache_active and user_id
+        cache_namespace_uid = 'cache_user_auth.{}'.format(user_id)
+        region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
 
-        # _authenticate is a wrapper for .auth() method of plugin.
-        # it checks if .auth() sends proper data.
-        # For RhodeCodeExternalAuthPlugin it also maps users to
-        # Database and maps the attributes returned from .auth()
-        # to RhodeCode database. If this function returns data
-        # then auth is correct.
-        start = time.time()
-        log.debug('Running plugin `%s` _authenticate method', plugin.get_id())
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                               expiration_time=cache_ttl,
+                                               condition=plugin_cache_active)
+        def compute_auth(
+                cache_name, plugin_name, username, password):
 
-        def auth_func():
-            """
-            This function is used internally in Cache of Beaker to calculate
-            Results
-            """
-            log.debug('auth: calculating password access now...')
+            # _authenticate is a wrapper for .auth() method of plugin.
+            # it checks if .auth() sends proper data.
+            # For RhodeCodeExternalAuthPlugin it also maps users to
+            # Database and maps the attributes returned from .auth()
+            # to RhodeCode database. If this function returns data
+            # then auth is correct.
+            log.debug('Running plugin `%s` _authenticate method '
+                      'using username and password', plugin.get_id())
             return plugin._authenticate(
                 user, username, password, plugin_settings,
                 environ=environ or {})
 
-        if plugin_cache_active:
-            log.debug('Trying to fetch cached auth by pwd hash `...%s`',
-                      _password_hash[:6])
-            plugin_user = cache_manager.get(
-                _password_hash, createfunc=auth_func)
-        else:
-            plugin_user = auth_func()
+        start = time.time()
+        # for environ based auth, password can be empty, but then the validation is
+        # on the server that fills in the env data needed for authentication
+        plugin_user = compute_auth('auth', plugin.name, username, (password or ''))
 
         auth_time = time.time() - start
         log.debug('Authentication for plugin `%s` completed in %.3fs, '
diff --git a/rhodecode/authentication/plugins/auth_ldap.py b/rhodecode/authentication/plugins/auth_ldap.py
--- a/rhodecode/authentication/plugins/auth_ldap.py
+++ b/rhodecode/authentication/plugins/auth_ldap.py
@@ -52,6 +52,7 @@ except ImportError:
 class LdapError(Exception):
     pass
 
+
 def plugin_factory(plugin_id, *args, **kwds):
     """
     Factory function that is called during plugin discovery.
diff --git a/rhodecode/authentication/plugins/auth_pam.py b/rhodecode/authentication/plugins/auth_pam.py
--- a/rhodecode/authentication/plugins/auth_pam.py
+++ b/rhodecode/authentication/plugins/auth_pam.py
@@ -111,8 +111,8 @@ class RhodeCodeAuthPlugin(RhodeCodeExter
         if not username or not password:
             log.debug('Empty username or password skipping...')
             return None
-
-        auth_result = pam.authenticate(username, password, settings["service"])
+        _pam = pam.pam()
+        auth_result = _pam.authenticate(username, password, settings["service"])
 
         if not auth_result:
             log.error("PAM was unable to authenticate user: %s" % (username, ))
diff --git a/rhodecode/authentication/schema.py b/rhodecode/authentication/schema.py
--- a/rhodecode/authentication/schema.py
+++ b/rhodecode/authentication/schema.py
@@ -20,6 +20,7 @@
 
 import colander
 
+from rhodecode.authentication import plugin_default_auth_ttl
 from rhodecode.translation import _
 
 
@@ -39,7 +40,7 @@ class AuthnPluginSettingsSchemaBase(cola
     )
     cache_ttl = colander.SchemaNode(
         colander.Int(),
-        default=0,
+        default=plugin_default_auth_ttl,
         description=_('Amount of seconds to cache the authentication and '
                       'permissions check response call for this plugin. \n'
                       'Useful for expensive calls like LDAP to improve the '
diff --git a/rhodecode/authentication/tests/conftest.py b/rhodecode/authentication/tests/conftest.py
--- a/rhodecode/authentication/tests/conftest.py
+++ b/rhodecode/authentication/tests/conftest.py
@@ -30,10 +30,7 @@ class EnabledAuthPlugin(object):
     """
 
     def __init__(self, plugin):
-        self.new_value = set([
-            'egg:rhodecode-enterprise-ce#rhodecode',
-            plugin.get_id()
-        ])
+        self.new_value = {'egg:rhodecode-enterprise-ce#rhodecode', plugin.get_id()}
 
     def __enter__(self):
         from rhodecode.model.settings import SettingsModel
@@ -47,7 +44,7 @@ class EnabledAuthPlugin(object):
             'auth_plugins', ','.join(self._old_value))
 
 
-class DisabledAuthPlugin():
+class DisabledAuthPlugin(object):
     """
     Context manager that updates the 'auth_plugins' setting in DB to disable
     a plugin. Previous setting is restored on exit.
diff --git a/rhodecode/authentication/views.py b/rhodecode/authentication/views.py
--- a/rhodecode/authentication/views.py
+++ b/rhodecode/authentication/views.py
@@ -27,12 +27,10 @@ from pyramid.renderers import render
 from pyramid.response import Response
 
 from rhodecode.apps._base import BaseAppView
-from rhodecode.authentication.base import (
-    get_auth_cache_manager, get_perms_cache_manager, get_authn_registry)
+from rhodecode.authentication.base import get_authn_registry
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator, CSRFRequired)
-from rhodecode.lib.caches import clear_cache_manager
 from rhodecode.model.forms import AuthSettingsForm
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import SettingsModel
@@ -102,16 +100,6 @@ class AuthnPluginViewBase(BaseAppView):
             self.plugin.create_or_update_setting(name, value)
         Session().commit()
 
-        # cleanup cache managers in case of change for plugin
-        # TODO(marcink): because we can register multiple namespaces
-        # we should at some point figure out how to retrieve ALL namespace
-        # cache managers and clear them...
-        cache_manager = get_auth_cache_manager()
-        clear_cache_manager(cache_manager)
-
-        cache_manager = get_perms_cache_manager()
-        clear_cache_manager(cache_manager)
-
         # Display success message and redirect.
         h.flash(_('Auth settings updated successfully.'), category='success')
         redirect_to = self.request.resource_path(
diff --git a/rhodecode/config/environment.py b/rhodecode/config/environment.py
--- a/rhodecode/config/environment.py
+++ b/rhodecode/config/environment.py
@@ -18,12 +18,10 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-
 import os
 import logging
 import rhodecode
 
-
 from rhodecode.config import utils
 
 from rhodecode.lib.utils import load_rcextensions
@@ -52,6 +50,8 @@ def load_pyramid_environment(global_conf
     if settings['is_test']:
         rhodecode.is_test = True
         rhodecode.disable_error_handler = True
+        from rhodecode import authentication
+        authentication.plugin_default_auth_ttl = 0
 
         utils.initialize_test_environment(settings_merged)
 
diff --git a/rhodecode/config/licenses.json b/rhodecode/config/licenses.json
--- a/rhodecode/config/licenses.json
+++ b/rhodecode/config/licenses.json
@@ -310,11 +310,7 @@
   }, 
   "python2.7-requests-2.9.1": {
     "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
-  }, 
-  "python2.7-setuptools-19.4": {
-    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0", 
-    "Zope Public License 2.0": "http://spdx.org/licenses/ZPL-2.0"
-  }, 
+  },
   "python2.7-setuptools-scm-1.15.6": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -18,18 +18,20 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import os
+import sys
 import logging
-import traceback
 import collections
+import tempfile
 
 from paste.gzipper import make_gzip_middleware
+import pyramid.events
 from pyramid.wsgi import wsgiapp
 from pyramid.authorization import ACLAuthorizationPolicy
 from pyramid.config import Configurator
 from pyramid.settings import asbool, aslist
 from pyramid.httpexceptions import (
     HTTPException, HTTPError, HTTPInternalServerError, HTTPFound, HTTPNotFound)
-from pyramid.events import ApplicationCreated
 from pyramid.renderers import render_to_response
 
 from rhodecode.model import meta
@@ -37,7 +39,9 @@ from rhodecode.config import patches
 from rhodecode.config import utils as config_utils
 from rhodecode.config.environment import load_pyramid_environment
 
+import rhodecode.events
 from rhodecode.lib.middleware.vcs import VCSMiddleware
+from rhodecode.lib.request import Request
 from rhodecode.lib.vcs import VCSCommunicationError
 from rhodecode.lib.exceptions import VCSServerUnavailable
 from rhodecode.lib.middleware.appenlight import wrap_in_appenlight_if_enabled
@@ -45,6 +49,7 @@ from rhodecode.lib.middleware.https_fixu
 from rhodecode.lib.celerylib.loader import configure_celery
 from rhodecode.lib.plugins.utils import register_rhodecode_plugin
 from rhodecode.lib.utils2 import aslist as rhodecode_aslist, AttributeDict
+from rhodecode.lib.exc_tracking import store_exception
 from rhodecode.subscribers import (
     scan_repositories_if_enabled, write_js_routes_if_enabled,
     write_metadata_if_needed, inject_app_settings)
@@ -70,6 +75,15 @@ def make_pyramid_app(global_config, **se
       cases when these fragments are assembled from another place.
 
     """
+
+    # Allows to use format style "{ENV_NAME}" placeholders in the configuration. It
+    # will be replaced by the value of the environment variable "NAME" in this case.
+    environ = {
+        'ENV_{}'.format(key): value for key, value in os.environ.items()}
+
+    global_config = _substitute_values(global_config, environ)
+    settings = _substitute_values(settings, environ)
+
     sanitize_settings_and_apply_defaults(settings)
 
     config = Configurator(settings=settings)
@@ -160,7 +174,17 @@ def error_handler(exception, request):
         c.causes = base_response.causes
 
     c.messages = helpers.flash.pop_messages(request=request)
-    c.traceback = traceback.format_exc()
+
+    exc_info = sys.exc_info()
+    c.exception_id = id(exc_info)
+    c.show_exception_id = isinstance(base_response, VCSServerUnavailable) \
+                          or base_response.status_code > 499
+    c.exception_id_url = request.route_url(
+        'admin_settings_exception_tracker_show', exception_id=c.exception_id)
+
+    if c.show_exception_id:
+        store_exception(c.exception_id, exc_info)
+
     response = render_to_response(
         '/errors/error_document.mako', {'c': c, 'h': helpers}, request=request,
         response=base_response)
@@ -192,6 +216,7 @@ def includeme_first(config):
 
 def includeme(config):
     settings = config.registry.settings
+    config.set_request_factory(Request)
 
     # plugin information
     config.registry.rhodecode_plugins = collections.OrderedDict()
@@ -207,7 +232,7 @@ def includeme(config):
     # Includes which are required. The application would fail without them.
     config.include('pyramid_mako')
     config.include('pyramid_beaker')
-    config.include('rhodecode.lib.caches')
+    config.include('rhodecode.lib.rc_cache')
 
     config.include('rhodecode.authentication')
     config.include('rhodecode.integrations')
@@ -243,16 +268,14 @@ def includeme(config):
     settings['default_locale_name'] = settings.get('lang', 'en')
 
     # Add subscribers.
-    config.add_subscriber(inject_app_settings, ApplicationCreated)
-    config.add_subscriber(scan_repositories_if_enabled, ApplicationCreated)
-    config.add_subscriber(write_metadata_if_needed, ApplicationCreated)
-    config.add_subscriber(write_js_routes_if_enabled, ApplicationCreated)
-
-    # events
-    # TODO(marcink): this should be done when pyramid migration is finished
-    # config.add_subscriber(
-    #     'rhodecode.integrations.integrations_event_handler',
-    #     'rhodecode.events.RhodecodeEvent')
+    config.add_subscriber(inject_app_settings,
+                          pyramid.events.ApplicationCreated)
+    config.add_subscriber(scan_repositories_if_enabled,
+                          pyramid.events.ApplicationCreated)
+    config.add_subscriber(write_metadata_if_needed,
+                          pyramid.events.ApplicationCreated)
+    config.add_subscriber(write_js_routes_if_enabled,
+                          pyramid.events.ApplicationCreated)
 
     # request custom methods
     config.add_request_method(
@@ -290,14 +313,15 @@ def wrap_app_in_wsgi_middlewares(pyramid
     """
     Apply outer WSGI middlewares around the application.
     """
-    settings = config.registry.settings
+    registry = config.registry
+    settings = registry.settings
 
     # enable https redirects based on HTTP_X_URL_SCHEME set by proxy
     pyramid_app = HttpsFixup(pyramid_app, settings)
 
     pyramid_app, _ae_client = wrap_in_appenlight_if_enabled(
         pyramid_app, settings)
-    config.registry.ae_client = _ae_client
+    registry.ae_client = _ae_client
 
     if settings['gzip_responses']:
         pyramid_app = make_gzip_middleware(
@@ -318,6 +342,7 @@ def wrap_app_in_wsgi_middlewares(pyramid
             # if not, then something, somewhere is leaving a connection open
             pool = meta.Base.metadata.bind.engine.pool
             log.debug('sa pool status: %s', pool.status())
+            log.debug('Request processing finalized')
 
     return pyramid_app_with_cleanup
 
@@ -370,6 +395,7 @@ def sanitize_settings_and_apply_defaults
     # Call split out functions that sanitize settings for each topic.
     _sanitize_appenlight_settings(settings)
     _sanitize_vcs_settings(settings)
+    _sanitize_cache_settings(settings)
 
     # configure instance id
     config_utils.set_instance_id(settings)
@@ -389,6 +415,7 @@ def _sanitize_vcs_settings(settings):
     _string_setting(settings, 'vcs.svn.compatible_version', '')
     _string_setting(settings, 'git_rev_filter', '--all')
     _string_setting(settings, 'vcs.hooks.protocol', 'http')
+    _string_setting(settings, 'vcs.hooks.host', '127.0.0.1')
     _string_setting(settings, 'vcs.scm_app_implementation', 'http')
     _string_setting(settings, 'vcs.server', '')
     _string_setting(settings, 'vcs.server.log_level', 'debug')
@@ -401,13 +428,87 @@ def _sanitize_vcs_settings(settings):
     _int_setting(settings, 'vcs.connection_timeout', 3600)
 
     # Support legacy values of vcs.scm_app_implementation. Legacy
-    # configurations may use 'rhodecode.lib.middleware.utils.scm_app_http'
-    # which is now mapped to 'http'.
+    # configurations may use 'rhodecode.lib.middleware.utils.scm_app_http', or
+    # disabled since 4.13 'vcsserver.scm_app' which is now mapped to 'http'.
     scm_app_impl = settings['vcs.scm_app_implementation']
-    if scm_app_impl == 'rhodecode.lib.middleware.utils.scm_app_http':
+    if scm_app_impl in ['rhodecode.lib.middleware.utils.scm_app_http', 'vcsserver.scm_app']:
         settings['vcs.scm_app_implementation'] = 'http'
 
 
+def _sanitize_cache_settings(settings):
+    _string_setting(settings, 'cache_dir',
+                    os.path.join(tempfile.gettempdir(), 'rc_cache'))
+    # cache_perms
+    _string_setting(
+        settings,
+        'rc_cache.cache_perms.backend',
+        'dogpile.cache.rc.file_namespace')
+    _int_setting(
+        settings,
+        'rc_cache.cache_perms.expiration_time',
+        60)
+    _string_setting(
+        settings,
+        'rc_cache.cache_perms.arguments.filename',
+        os.path.join(tempfile.gettempdir(), 'rc_cache_1'))
+
+    # cache_repo
+    _string_setting(
+        settings,
+        'rc_cache.cache_repo.backend',
+        'dogpile.cache.rc.file_namespace')
+    _int_setting(
+        settings,
+        'rc_cache.cache_repo.expiration_time',
+        60)
+    _string_setting(
+        settings,
+        'rc_cache.cache_repo.arguments.filename',
+        os.path.join(tempfile.gettempdir(), 'rc_cache_2'))
+
+    # cache_license
+    _string_setting(
+        settings,
+        'rc_cache.cache_license.backend',
+        'dogpile.cache.rc.file_namespace')
+    _int_setting(
+        settings,
+        'rc_cache.cache_license.expiration_time',
+        5*60)
+    _string_setting(
+        settings,
+        'rc_cache.cache_license.arguments.filename',
+        os.path.join(tempfile.gettempdir(), 'rc_cache_3'))
+
+    # cache_repo_longterm memory, 96H
+    _string_setting(
+        settings,
+        'rc_cache.cache_repo_longterm.backend',
+        'dogpile.cache.rc.memory_lru')
+    _int_setting(
+        settings,
+        'rc_cache.cache_repo_longterm.expiration_time',
+        345600)
+    _int_setting(
+        settings,
+        'rc_cache.cache_repo_longterm.max_size',
+        10000)
+
+    # sql_cache_short
+    _string_setting(
+        settings,
+        'rc_cache.sql_cache_short.backend',
+        'dogpile.cache.rc.memory_lru')
+    _int_setting(
+        settings,
+        'rc_cache.sql_cache_short.expiration_time',
+        30)
+    _int_setting(
+        settings,
+        'rc_cache.sql_cache_short.max_size',
+        10000)
+
+
 def _int_setting(settings, name, default):
     settings[name] = int(settings.get(name, default))
 
@@ -436,3 +537,20 @@ def _string_setting(settings, name, defa
     if lower:
         value = value.lower()
     settings[name] = value
+
+
+def _substitute_values(mapping, substitutions):
+
+    try:
+        result = {
+            # Note: Cannot use regular replacements, since they would clash
+            # with the implementation of ConfigParser. Using "format" instead.
+            key: value.format(**substitutions)
+            for key, value in mapping.items()
+        }
+    except KeyError as e:
+        raise ValueError(
+            'Failed to substitute env variable: {}. '
+            'Make sure you have specified this env variable without ENV_ prefix'.format(e))
+
+    return result
diff --git a/rhodecode/config/utils.py b/rhodecode/config/utils.py
--- a/rhodecode/config/utils.py
+++ b/rhodecode/config/utils.py
@@ -25,12 +25,13 @@ import platform
 from rhodecode.model import init_model
 
 
-
 def configure_vcs(config):
     """
     Patch VCS config with some RhodeCode specific stuff
     """
     from rhodecode.lib.vcs import conf
+    import rhodecode.lib.vcs.conf.settings
+
     conf.settings.BACKENDS = {
         'hg': 'rhodecode.lib.vcs.backends.hg.MercurialRepository',
         'git': 'rhodecode.lib.vcs.backends.git.GitRepository',
@@ -38,6 +39,7 @@ def configure_vcs(config):
     }
 
     conf.settings.HOOKS_PROTOCOL = config['vcs.hooks.protocol']
+    conf.settings.HOOKS_HOST = config['vcs.hooks.host']
     conf.settings.HOOKS_DIRECT_CALLS = config['vcs.hooks.direct_calls']
     conf.settings.GIT_REV_FILTER = shlex.split(config['git_rev_filter'])
     conf.settings.DEFAULT_ENCODINGS = config['default_encoding']
diff --git a/rhodecode/events/__init__.py b/rhodecode/events/__init__.py
--- a/rhodecode/events/__init__.py
+++ b/rhodecode/events/__init__.py
@@ -18,7 +18,7 @@
 
 import logging
 from pyramid.threadlocal import get_current_registry
-from rhodecode.events.base import RhodecodeEvent
+from rhodecode.events.base import RhodeCodeIntegrationEvent
 
 
 log = logging.getLogger(__name__)
@@ -32,28 +32,24 @@ def trigger(event, registry=None):
     # For the first step we are using pyramids thread locals here. If the
     # event mechanism works out as a good solution we should think about
     # passing the registry as an argument to get rid of it.
+    event_name = event.__class__
+    log.debug('event %s sent for execution', event_name)
     registry = registry or get_current_registry()
     registry.notify(event)
-    log.debug('event %s triggered using registry %s', event, registry)
-
-    # Until we can work around the problem that VCS operations do not have a
-    # pyramid context to work with, we send the events to integrations directly
+    log.debug('event %s triggered using registry %s', event_name, registry)
 
-    # Later it will be possible to use regular pyramid subscribers ie:
-    # config.add_subscriber(
-    #     'rhodecode.integrations.integrations_event_handler',
-    #     'rhodecode.events.RhodecodeEvent')
-    # trigger(event, request.registry)
+    # Send the events to integrations directly
+    from rhodecode.integrations import integrations_event_handler
+    if isinstance(event, RhodeCodeIntegrationEvent):
+        integrations_event_handler(event)
 
-    from rhodecode.integrations import integrations_event_handler
-    if isinstance(event, RhodecodeEvent):
-        integrations_event_handler(event)
 
 from rhodecode.events.user import (  # noqa
     UserPreCreate,
     UserPostCreate,
     UserPreUpdate,
-    UserRegistered
+    UserRegistered,
+    UserPermissionsChange,
 )
 
 from rhodecode.events.repo import (  # noqa
diff --git a/rhodecode/events/base.py b/rhodecode/events/base.py
--- a/rhodecode/events/base.py
+++ b/rhodecode/events/base.py
@@ -110,3 +110,9 @@ class RhodecodeEvent(object):
             'server_url': self.server_url
         }
         return data
+
+
+class RhodeCodeIntegrationEvent(RhodecodeEvent):
+    """
+    Special subclass for Integration events
+    """
diff --git a/rhodecode/events/repo.py b/rhodecode/events/repo.py
--- a/rhodecode/events/repo.py
+++ b/rhodecode/events/repo.py
@@ -22,7 +22,7 @@ import datetime
 
 from rhodecode.translation import lazy_ugettext
 from rhodecode.model.db import User, Repository, Session
-from rhodecode.events.base import RhodecodeEvent
+from rhodecode.events.base import RhodeCodeIntegrationEvent
 from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError
 
 log = logging.getLogger(__name__)
@@ -147,7 +147,7 @@ def _issues_as_dict(commits):
     return issues
 
 
-class RepoEvent(RhodecodeEvent):
+class RepoEvent(RhodeCodeIntegrationEvent):
     """
     Base class for events acting on a repository.
 
diff --git a/rhodecode/events/repo_group.py b/rhodecode/events/repo_group.py
--- a/rhodecode/events/repo_group.py
+++ b/rhodecode/events/repo_group.py
@@ -19,13 +19,13 @@
 import logging
 
 from rhodecode.translation import lazy_ugettext
-from rhodecode.events.base import RhodecodeEvent
+from rhodecode.events.base import RhodeCodeIntegrationEvent
 
 
 log = logging.getLogger(__name__)
 
 
-class RepoGroupEvent(RhodecodeEvent):
+class RepoGroupEvent(RhodeCodeIntegrationEvent):
     """
     Base class for events acting on a repository group.
 
diff --git a/rhodecode/events/user.py b/rhodecode/events/user.py
--- a/rhodecode/events/user.py
+++ b/rhodecode/events/user.py
@@ -20,7 +20,7 @@ import logging
 from zope.interface import implementer
 
 from rhodecode.translation import lazy_ugettext
-from rhodecode.events.base import RhodecodeEvent
+from rhodecode.events.base import RhodecodeEvent, RhodeCodeIntegrationEvent
 from rhodecode.events.interfaces import (
     IUserRegistered, IUserPreCreate, IUserPreUpdate)
 
@@ -28,7 +28,7 @@ log = logging.getLogger(__name__)
 
 
 @implementer(IUserRegistered)
-class UserRegistered(RhodecodeEvent):
+class UserRegistered(RhodeCodeIntegrationEvent):
     """
     An instance of this class is emitted as an :term:`event` whenever a user
     account is registered.
@@ -43,7 +43,7 @@ class UserRegistered(RhodecodeEvent):
 
 
 @implementer(IUserPreCreate)
-class UserPreCreate(RhodecodeEvent):
+class UserPreCreate(RhodeCodeIntegrationEvent):
     """
     An instance of this class is emitted as an :term:`event` before a new user
     object is created.
@@ -57,7 +57,7 @@ class UserPreCreate(RhodecodeEvent):
 
 
 @implementer(IUserPreCreate)
-class UserPostCreate(RhodecodeEvent):
+class UserPostCreate(RhodeCodeIntegrationEvent):
     """
     An instance of this class is emitted as an :term:`event` after a new user
     object is created.
@@ -71,7 +71,7 @@ class UserPostCreate(RhodecodeEvent):
 
 
 @implementer(IUserPreUpdate)
-class UserPreUpdate(RhodecodeEvent):
+class UserPreUpdate(RhodeCodeIntegrationEvent):
     """
     An instance of this class is emitted as an :term:`event` before a user
     object is updated.
@@ -83,3 +83,22 @@ class UserPreUpdate(RhodecodeEvent):
         super(UserPreUpdate, self).__init__()
         self.user = user
         self.user_data = user_data
+
+
+class UserPermissionsChange(RhodecodeEvent):
+    """
+    This event should be triggered on an event that permissions of user might changed.
+    Currently this should be triggered on:
+
+      - user added/removed from user group
+      - repo permissions changed
+      - repo group permissions changed
+      - user group permissions changed
+
+    """
+    name = 'user-permissions-change'
+    display_name = lazy_ugettext('user permissions change')
+
+    def __init__(self, user_ids):
+        super(UserPermissionsChange, self).__init__()
+        self.user_ids = user_ids
diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot
--- a/rhodecode/i18n/rhodecode.pot
+++ b/rhodecode/i18n/rhodecode.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rhodecode-enterprise-ce 4.12.0\n"
+"Project-Id-Version: rhodecode-enterprise-ce 4.13.0\n"
 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
-"POT-Creation-Date: 2018-04-23 15:50+0200\n"
+"POT-Creation-Date: 2018-09-04 13:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,7 +24,7 @@ msgid "Global"
 msgstr ""
 
 #: rhodecode/apps/admin/navigation.py:74
-#: rhodecode/templates/admin/repos/repo_edit.mako:55
+#: rhodecode/templates/admin/repos/repo_edit.mako:58
 msgid "VCS"
 msgstr ""
 
@@ -37,17 +37,17 @@ msgid "Remap and Rescan"
 msgstr ""
 
 #: rhodecode/apps/admin/navigation.py:80
-#: rhodecode/templates/admin/repos/repo_edit.mako:61
+#: rhodecode/templates/admin/repos/repo_edit.mako:64
 msgid "Issue Tracker"
 msgstr ""
 
 #: rhodecode/apps/admin/navigation.py:82
 #: rhodecode/integrations/types/email.py:176
-#: rhodecode/templates/register.mako:76
+#: rhodecode/templates/register.mako:91
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48
 #: rhodecode/templates/admin/users/user_add.mako:86
 #: rhodecode/templates/admin/users/user_edit_profile.mako:65
-#: rhodecode/templates/admin/users/users.mako:65
+#: rhodecode/templates/admin/users/users.mako:73
 #: rhodecode/templates/email_templates/user_registration.mako:25
 #: rhodecode/templates/users/user_profile.mako:51
 msgid "Email"
@@ -74,7 +74,7 @@ msgstr ""
 #: rhodecode/templates/admin/integrations/new.mako:17
 #: rhodecode/templates/admin/integrations/new.mako:23
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51
-#: rhodecode/templates/admin/repos/repo_edit.mako:75
+#: rhodecode/templates/admin/repos/repo_edit.mako:78
 #: rhodecode/templates/base/base.mako:84
 msgid "Integrations"
 msgstr ""
@@ -85,23 +85,27 @@ msgid "System Info"
 msgstr ""
 
 #: rhodecode/apps/admin/navigation.py:92
+msgid "Exceptions Tracker"
+msgstr ""
+
+#: rhodecode/apps/admin/navigation.py:95
 msgid "Processes"
 msgstr ""
 
-#: rhodecode/apps/admin/navigation.py:94
+#: rhodecode/apps/admin/navigation.py:97
 msgid "User Sessions"
 msgstr ""
 
-#: rhodecode/apps/admin/navigation.py:96
+#: rhodecode/apps/admin/navigation.py:99
 msgid "Open Source Licenses"
 msgstr ""
 
-#: rhodecode/apps/admin/navigation.py:98
-#: rhodecode/templates/admin/repos/repo_edit.mako:83
+#: rhodecode/apps/admin/navigation.py:101
+#: rhodecode/templates/admin/repos/repo_edit.mako:86
 msgid "Automation"
 msgstr ""
 
-#: rhodecode/apps/admin/navigation.py:102
+#: rhodecode/apps/admin/navigation.py:105
 msgid "Labs"
 msgstr ""
 
@@ -113,25 +117,33 @@ msgstr ""
 msgid "Error occurred during update of default values"
 msgstr ""
 
+#: rhodecode/apps/admin/views/exception_tracker.py:136
+msgid "Removed {} Exceptions"
+msgstr ""
+
+#: rhodecode/apps/admin/views/exception_tracker.py:153
+msgid "Removed Exception {}"
+msgstr ""
+
 #: rhodecode/apps/admin/views/permissions.py:120
 msgid "Application permissions updated successfully"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:141
-#: rhodecode/apps/admin/views/permissions.py:213
-#: rhodecode/apps/admin/views/permissions.py:288
+#: rhodecode/apps/admin/views/permissions.py:214
+#: rhodecode/apps/admin/views/permissions.py:313
 msgid "Error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:193
+#: rhodecode/apps/admin/views/permissions.py:194
 msgid "Object permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:268
+#: rhodecode/apps/admin/views/permissions.py:293
 msgid "Global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:450
+#: rhodecode/apps/admin/views/permissions.py:475
 #: rhodecode/templates/admin/gists/show.mako:63
 #: rhodecode/templates/admin/integrations/list.mako:174
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5
@@ -146,27 +158,27 @@ msgstr ""
 #: rhodecode/templates/files/files_edit.mako:168
 #: rhodecode/templates/files/files_source.mako:54
 #: rhodecode/templates/files/files_source.mako:57
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:63
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:345
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:64
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:347
 #: rhodecode/templates/user_group/profile.mako:7
 #: rhodecode/templates/users/user_profile.mako:7
 msgid "Edit"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:478
+#: rhodecode/apps/admin/views/permissions.py:503
 msgid "Updated SSH keys file: {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:481
+#: rhodecode/apps/admin/views/permissions.py:506
 msgid "SSH key support is disabled in .ini file"
 msgstr ""
 
-#: rhodecode/apps/admin/views/repo_groups.py:181
+#: rhodecode/apps/admin/views/repo_groups.py:182
 #, python-format
 msgid "Created repository group %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/repo_groups.py:199
+#: rhodecode/apps/admin/views/repo_groups.py:200
 #, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr ""
@@ -326,289 +338,297 @@ msgid "Platform UUID"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:115
-msgid "Python version"
+msgid "Lang"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:116
+msgid "Python version"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:117
 msgid "Python path"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:120
-msgid "CPU"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:121
-msgid "Load"
+msgid "CPU"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:122
-msgid "Memory"
+msgid "Load"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:123
+msgid "Memory"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:124
 msgid "Uptime"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:127
+#: rhodecode/apps/admin/views/system_info.py:128
 msgid "Ulimit"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:130
-msgid "Storage location"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:131
-msgid "Storage info"
+msgid "Storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:132
+msgid "Storage info"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:133
 msgid "Storage inodes"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:134
-msgid "Gist storage location"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:135
+msgid "Gist storage location"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:136
 msgid "Gist storage info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:137
-msgid "Archive cache storage location"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:138
+msgid "Archive cache storage location"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:139
 msgid "Archive cache info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:140
-msgid "Temp storage location"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:141
+msgid "Temp storage location"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:142
 msgid "Temp storage info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:143
-msgid "Search info"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:144
+msgid "Search info"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:145
 msgid "Search location"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:148
-msgid "VCS Backends"
-msgstr ""
-
 #: rhodecode/apps/admin/views/system_info.py:149
-msgid "VCS Server"
+msgid "VCS Backends"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:150
-msgid "GIT"
+msgid "VCS Server"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:151
-msgid "HG"
+msgid "GIT"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:152
+msgid "HG"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:153
 msgid "SVN"
 msgstr ""
 
-#: rhodecode/apps/admin/views/user_groups.py:219
+#: rhodecode/apps/admin/views/user_groups.py:231
 #, python-format
 msgid "Created user group %(user_group_link)s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/user_groups.py:241
+#: rhodecode/apps/admin/views/user_groups.py:253
 #, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:209
+#: rhodecode/apps/admin/views/users.py:218
 #, python-format
 msgid "Created user %(user_link)s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:230
+#: rhodecode/apps/admin/views/users.py:239
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:304
+#: rhodecode/apps/admin/views/users.py:313
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:322
+#: rhodecode/apps/admin/views/users.py:331
 #, python-format
 msgid "Error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:354
+#: rhodecode/apps/admin/views/users.py:363
 #, python-format
 msgid "Detached %s repositories"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:359
+#: rhodecode/apps/admin/views/users.py:368
 #, python-format
 msgid "Deleted %s repositories"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:367
+#: rhodecode/apps/admin/views/users.py:376
 #, python-format
 msgid "Detached %s repository groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:372
+#: rhodecode/apps/admin/views/users.py:381
 #, python-format
 msgid "Deleted %s repository groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:380
+#: rhodecode/apps/admin/views/users.py:389
 #, python-format
 msgid "Detached %s user groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:385
+#: rhodecode/apps/admin/views/users.py:394
 #, python-format
 msgid "Deleted %s user groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:402
+#: rhodecode/apps/admin/views/users.py:411
 msgid "Successfully deleted user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:408
+#: rhodecode/apps/admin/views/users.py:417
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:473
+#: rhodecode/apps/admin/views/users.py:482
 msgid ""
 "The user participates as reviewer in {} pull request and cannot be deleted. \n"
 "You can set the user to \"{}\" instead of deleting it."
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:479
+#: rhodecode/apps/admin/views/users.py:488
 msgid ""
 "The user participates as reviewer in {} pull requests and cannot be deleted. \n"
 "You can set the user to \"{}\" instead of deleting it."
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:567
+#: rhodecode/apps/admin/views/users.py:576
 msgid "User global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:585
-#: rhodecode/apps/user_group/views/__init__.py:448
+#: rhodecode/apps/admin/views/users.py:594
+#: rhodecode/apps/user_group/views/__init__.py:474
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:610
+#: rhodecode/apps/admin/views/users.py:619
 msgid "Force password change disabled for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:615
-msgid "Force password change enabled for user"
-msgstr ""
-
 #: rhodecode/apps/admin/views/users.py:624
+msgid "Force password change enabled for user"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:633
 msgid "An error occurred during password reset for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:663
+#: rhodecode/apps/admin/views/users.py:672
 #, python-format
 msgid "Linked repository group `%s` as personal"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:669
-#, python-format
-msgid "Created repository group `%s`"
-msgstr ""
-
-#: rhodecode/apps/admin/views/users.py:673
-#, python-format
-msgid "Repository group `%s` is already taken"
-msgstr ""
-
 #: rhodecode/apps/admin/views/users.py:678
+#, python-format
+msgid "Created repository group `%s`"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:682
+#, python-format
+msgid "Repository group `%s` is already taken"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:687
 msgid "An error occurred during repository group creation for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:701
+#: rhodecode/apps/admin/views/users.py:710
 #: rhodecode/apps/my_account/views/my_account.py:160
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16
 msgid "Role"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:739
-#: rhodecode/apps/my_account/views/my_account.py:194
+#: rhodecode/apps/admin/views/users.py:749
+#: rhodecode/apps/my_account/views/my_account.py:195
 msgid "Auth token successfully created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:768
-#: rhodecode/apps/my_account/views/my_account.py:218
+#: rhodecode/apps/admin/views/users.py:778
+#: rhodecode/apps/my_account/views/my_account.py:219
 msgid "Auth token successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:841
+#: rhodecode/apps/admin/views/users.py:851
 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113
 msgid "Ssh Key successfully created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:847
-#: rhodecode/apps/admin/views/users.py:851
+#: rhodecode/apps/admin/views/users.py:857
+#: rhodecode/apps/admin/views/users.py:861
 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:119
 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:123
 msgid "An error occurred during ssh key saving: {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:885
+#: rhodecode/apps/admin/views/users.py:895
 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:153
 msgid "Ssh key successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:931
-#, python-format
-msgid "Added new email address `%s` for user account"
-msgstr ""
-
-#: rhodecode/apps/admin/views/users.py:937
-msgid "Email `{}` is already registered for another user."
-msgstr ""
-
 #: rhodecode/apps/admin/views/users.py:941
+#, python-format
+msgid "Added new email address `%s` for user account"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:947
+msgid "Email `{}` is already registered for another user."
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:951
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:968
+#: rhodecode/apps/admin/views/users.py:978
 msgid "Removed email address from user account"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1014
+#: rhodecode/apps/admin/views/users.py:1024
 #, python-format
 msgid "An error occurred during ip saving:%s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1036
+#: rhodecode/apps/admin/views/users.py:1046
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1040
+#: rhodecode/apps/admin/views/users.py:1050
 #, python-format
 msgid "Added ips %s to user whitelist"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1070
+#: rhodecode/apps/admin/views/users.py:1080
 msgid "Removed ip address from user whitelist"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1135
+#: rhodecode/apps/admin/views/users.py:1145
 msgid "Groups successfully changed"
 msgstr ""
 
+#: rhodecode/apps/admin/views/users.py:1239
+msgid "Deleted {} cache keys"
+msgstr ""
+
 #: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51
 msgid "forever"
 msgstr ""
@@ -630,8 +650,8 @@ msgid "1 month"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:64
-#: rhodecode/public/js/rhodecode-components.js:49292
-#: rhodecode/public/js/scripts.js:41140
+#: rhodecode/public/js/rhodecode-components.js:54572
+#: rhodecode/public/js/scripts.js:41322
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
 #: rhodecode/public/js/src/rhodecode.js:502
 msgid "Lifetime"
@@ -684,27 +704,18 @@ msgstr ""
 msgid "Error occurred during update of gist %s"
 msgstr ""
 
-#: rhodecode/apps/home/views.py:218 rhodecode/apps/home/views.py:251
-#: rhodecode/apps/repository/views/repo_pull_requests.py:775
+#: rhodecode/apps/home/views.py:295
+#: rhodecode/apps/repository/views/repo_pull_requests.py:784
 #: rhodecode/templates/admin/my_account/my_account.mako:41
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:197
 #: rhodecode/templates/admin/repos/repo_add.mako:15
 #: rhodecode/templates/admin/repos/repo_add.mako:19
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11
 #: rhodecode/templates/base/base.mako:78 rhodecode/templates/base/base.mako:150
-#: rhodecode/templates/base/base.mako:584
+#: rhodecode/templates/base/base.mako:655
 msgid "Repositories"
 msgstr ""
 
-#: rhodecode/apps/home/views.py:244
-msgid "Groups"
-msgstr ""
-
-#: rhodecode/apps/home/views.py:264
-#, python-format
-msgid "Commits in %(repo)s"
-msgstr ""
-
 #: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178
 msgid "public journal"
 msgstr ""
@@ -713,27 +724,27 @@ msgstr ""
 msgid "journal"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:349
+#: rhodecode/apps/login/views.py:293 rhodecode/apps/login/views.py:374
 msgid "Bad captcha"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:288
+#: rhodecode/apps/login/views.py:315
 msgid "You have successfully registered with RhodeCode"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:325
+#: rhodecode/apps/login/views.py:352
 msgid "If such email exists, a password reset link was sent to it."
 msgstr ""
 
-#: rhodecode/apps/login/views.py:331
+#: rhodecode/apps/login/views.py:358
 msgid "Password reset has been disabled."
 msgstr ""
 
-#: rhodecode/apps/login/views.py:420
+#: rhodecode/apps/login/views.py:446
 msgid "Given reset token is invalid"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:428
+#: rhodecode/apps/login/views.py:454
 msgid "Your password reset was successful, a new password has been sent to your email"
 msgstr ""
 
@@ -745,23 +756,23 @@ msgstr ""
 msgid "Successfully updated password"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:282
+#: rhodecode/apps/my_account/views/my_account.py:283
 msgid "Error occurred during adding email"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:285
+#: rhodecode/apps/my_account/views/my_account.py:286
 msgid "Successfully added email"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:307
+#: rhodecode/apps/my_account/views/my_account.py:308
 msgid "Email successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:490
+#: rhodecode/apps/my_account/views/my_account.py:491
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:497
+#: rhodecode/apps/my_account/views/my_account.py:498
 msgid "Error occurred during update of user"
 msgstr ""
 
@@ -775,42 +786,42 @@ msgstr ""
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_permissions.py:73
-#: rhodecode/apps/user_group/views/__init__.py:328
+#: rhodecode/apps/repo_group/views/repo_group_permissions.py:74
+#: rhodecode/apps/user_group/views/__init__.py:346
 msgid "Cannot change permission for yourself as admin"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_permissions.py:97
+#: rhodecode/apps/repo_group/views/repo_group_permissions.py:98
 msgid "Repository Group permissions updated"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_settings.py:174
+#: rhodecode/apps/repo_group/views/repo_group_settings.py:173
 msgid "Repository Group `{}` updated successfully"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_settings.py:179
+#: rhodecode/apps/repo_group/views/repo_group_settings.py:178
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_caches.py:72
+#: rhodecode/apps/repository/views/repo_caches.py:80
 msgid "Cache invalidation successful"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_caches.py:76
+#: rhodecode/apps/repository/views/repo_caches.py:84
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_changelog.py:66
 #: rhodecode/apps/repository/views/repo_compare.py:66
-#: rhodecode/apps/repository/views/repo_pull_requests.py:641
+#: rhodecode/apps/repository/views/repo_pull_requests.py:647
 msgid "There are no commits yet"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_changelog.py:71
 #: rhodecode/apps/repository/views/repo_commits.py:199
-#: rhodecode/apps/repository/views/repo_files.py:150
-#: rhodecode/apps/repository/views/repo_files.py:170
+#: rhodecode/apps/repository/views/repo_files.py:162
+#: rhodecode/apps/repository/views/repo_files.py:182
 msgid "No such commit exists for this repository"
 msgstr ""
 
@@ -854,12 +865,12 @@ msgid "Increase context for all diffs"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_commits.py:415
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1185
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1211
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:459
+#: rhodecode/apps/repository/views/repo_commits.py:460
 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
 msgstr ""
 
@@ -888,215 +899,224 @@ msgstr ""
 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_feed.py:70
+#: rhodecode/apps/repository/views/repo_feed.py:69
 #, python-format
 msgid "Changes on %s repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_feed.py:71
+#: rhodecode/apps/repository/views/repo_feed.py:70
 #, python-format
 msgid "%s %s feed"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:94
+#: rhodecode/apps/repository/views/repo_files.py:92
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:140
+#: rhodecode/apps/repository/views/repo_files.py:108
+msgid "Branch `{}` changes forbidden by rule {}."
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_files.py:152
 msgid "Click here to add a new file."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:145
+#: rhodecode/apps/repository/views/repo_files.py:157
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:259
+#: rhodecode/apps/repository/views/repo_files.py:293
 msgid "Downloads disabled"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:265
+#: rhodecode/apps/repository/views/repo_files.py:299
 msgid "Unknown archive type for: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:271
-msgid "Unknown commit_id {}"
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_files.py:274
-msgid "Empty repository"
-msgstr ""
-
 #: rhodecode/apps/repository/views/repo_files.py:305
+msgid "Unknown commit_id {}"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_files.py:308
+msgid "Empty repository"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_files.py:340
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:865
+#: rhodecode/apps/repository/views/repo_files.py:906
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:886
-#: rhodecode/apps/repository/views/repo_summary.py:322
-#: rhodecode/model/pull_request.py:1421 rhodecode/model/scm.py:789
+#: rhodecode/apps/repository/views/repo_files.py:927
+#: rhodecode/apps/repository/views/repo_summary.py:340
+#: rhodecode/model/pull_request.py:1445 rhodecode/model/scm.py:795
 #: rhodecode/templates/base/vcs_settings.mako:235
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:890 rhodecode/model/scm.py:804
+#: rhodecode/apps/repository/views/repo_files.py:931 rhodecode/model/scm.py:810
 #: rhodecode/templates/base/vcs_settings.mako:260
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:987
-#: rhodecode/apps/repository/views/repo_files.py:1018
-msgid "You can only delete files with commit being a valid branch "
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_files.py:997
-#: rhodecode/apps/repository/views/repo_files.py:1028
+#: rhodecode/apps/repository/views/repo_files.py:1030
+#: rhodecode/apps/repository/views/repo_files.py:1064
+msgid "You can only delete files with commit being a valid branch head."
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_files.py:1041
+#: rhodecode/apps/repository/views/repo_files.py:1075
 msgid "Deleted file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1049
+#: rhodecode/apps/repository/views/repo_files.py:1096
 msgid "Successfully deleted file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1053
-#: rhodecode/apps/repository/views/repo_files.py:1171
-#: rhodecode/apps/repository/views/repo_files.py:1290
+#: rhodecode/apps/repository/views/repo_files.py:1100
+#: rhodecode/apps/repository/views/repo_files.py:1225
+#: rhodecode/apps/repository/views/repo_files.py:1383
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1071
-#: rhodecode/apps/repository/views/repo_files.py:1108
-msgid "You can only edit files with commit being a valid branch "
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_files.py:1088
-#: rhodecode/apps/repository/views/repo_files.py:1125
+#: rhodecode/apps/repository/views/repo_files.py:1120
+#: rhodecode/apps/repository/views/repo_files.py:1160
+msgid "You can only edit files with commit being a valid branch head."
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_files.py:1138
+#: rhodecode/apps/repository/views/repo_files.py:1179
 msgid "Edited file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1143
+#: rhodecode/apps/repository/views/repo_files.py:1197
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1167
+#: rhodecode/apps/repository/views/repo_files.py:1221
 msgid "Successfully committed changes to file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1191
-#: rhodecode/apps/repository/views/repo_files.py:1215
+#: rhodecode/apps/repository/views/repo_files.py:1245
+#: rhodecode/apps/repository/views/repo_files.py:1308
 msgid "Added file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1248
+#: rhodecode/apps/repository/views/repo_files.py:1258
+#: rhodecode/apps/repository/views/repo_files.py:1299
+msgid "You can only add files with commit being a valid branch head."
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_files.py:1341
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1278
+#: rhodecode/apps/repository/views/repo_files.py:1371
 msgid "Successfully committed new file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1282
+#: rhodecode/apps/repository/views/repo_files.py:1375
 msgid "The location specified must be a relative path and must not contain .. in the path"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_forks.py:146
+#: rhodecode/apps/repository/views/repo_forks.py:147
 #: rhodecode/templates/base/base.mako:264
 msgid "Compare fork"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_forks.py:251
+#: rhodecode/apps/repository/views/repo_forks.py:252
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_permissions.py:86
+#: rhodecode/apps/repository/views/repo_permissions.py:85
 msgid "Repository permissions updated"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:671
+#: rhodecode/apps/repository/views/repo_pull_requests.py:677
 msgid "Commit does not exist"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:806
+#: rhodecode/apps/repository/views/repo_pull_requests.py:815
 msgid "Error creating pull request: {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:831
+#: rhodecode/apps/repository/views/repo_pull_requests.py:840
 msgid "Not Enough permissions to source repo `{}`."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:846
+#: rhodecode/apps/repository/views/repo_pull_requests.py:855
 msgid "Not Enough permissions to target repo `{}`."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:897
+#: rhodecode/apps/repository/views/repo_pull_requests.py:918
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:900
+#: rhodecode/apps/repository/views/repo_pull_requests.py:921
 msgid "Error occurred during creation of this pull request."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:931
-#: rhodecode/apps/repository/views/repo_pull_requests.py:961
+#: rhodecode/apps/repository/views/repo_pull_requests.py:952
+#: rhodecode/apps/repository/views/repo_pull_requests.py:986
 msgid "Cannot update closed pull requests."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:967
+#: rhodecode/apps/repository/views/repo_pull_requests.py:992
 msgid "Pull request title & description updated."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:986
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1011
 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1002
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1027
 msgid "Reload page"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1066
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1092
 msgid "Pull request was successfully merged and closed."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1090
-msgid "Pull request reviewers updated."
-msgstr ""
-
 #: rhodecode/apps/repository/views/repo_pull_requests.py:1116
+msgid "Pull request reviewers updated."
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1142
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:172
+#: rhodecode/apps/repository/views/repo_settings.py:171
 msgid "Repository `{}` updated successfully"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:176
+#: rhodecode/apps/repository/views/repo_settings.py:175
 msgid "Error occurred during update of repository {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:198
+#: rhodecode/apps/repository/views/repo_settings.py:204
 msgid "Unlocked"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:203
-msgid "Locked"
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_settings.py:205
-#, python-format
-msgid "Repository has been %s"
-msgstr ""
-
 #: rhodecode/apps/repository/views/repo_settings.py:209
+msgid "Locked"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings.py:211
+#, python-format
+msgid "Repository has been %s"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings.py:215
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:228
 msgid "An error occurred during unlocking"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:253
+#: rhodecode/apps/repository/views/repo_settings.py:259
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
@@ -1158,7 +1178,7 @@ msgid "Unlocked repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:245
-msgid "installed hooks repository"
+msgid "installed updated hooks into this repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_fields.py:86
@@ -1185,19 +1205,21 @@ msgstr ""
 msgid "Error occurred during updating repository VCS settings"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:297
+#: rhodecode/apps/repository/views/repo_summary.py:315
+#: rhodecode/templates/admin/permissions/permissions.mako:42
+#: rhodecode/templates/files/files_add.mako:15
 msgid "Branch"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:298
+#: rhodecode/apps/repository/views/repo_summary.py:316
 msgid "Tag"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:299
+#: rhodecode/apps/repository/views/repo_summary.py:317
 msgid "Bookmark"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:323
+#: rhodecode/apps/repository/views/repo_summary.py:341
 msgid "Closed branches"
 msgstr ""
 
@@ -1209,80 +1231,80 @@ msgstr ""
 msgid "Configuration for Apache mad_dav_svn changed."
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:184
+#: rhodecode/apps/user_group/views/__init__.py:188
 #, python-format
 msgid "Updated user group %s"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:206
+#: rhodecode/apps/user_group/views/__init__.py:224
 #, python-format
 msgid "Error occurred during update of user group %s"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:232
+#: rhodecode/apps/user_group/views/__init__.py:250
 msgid "Successfully deleted user group"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:237
+#: rhodecode/apps/user_group/views/__init__.py:255
 msgid "An error occurred during deletion of user group"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:341
+#: rhodecode/apps/user_group/views/__init__.py:359
 msgid "Target group cannot be the same"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:356
+#: rhodecode/apps/user_group/views/__init__.py:374
 msgid "User Group permissions updated"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:428
+#: rhodecode/apps/user_group/views/__init__.py:454
 msgid "User Group global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:510
+#: rhodecode/apps/user_group/views/__init__.py:536
 msgid "User Group synchronization updated successfully"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:514
+#: rhodecode/apps/user_group/views/__init__.py:540
 msgid "An error occurred during synchronization update"
 msgstr ""
 
-#: rhodecode/authentication/schema.py:35
+#: rhodecode/authentication/schema.py:36
 msgid "Enable or disable this authentication plugin."
 msgstr ""
 
-#: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32
-#: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105
-#: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113
-#: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121
-#: rhodecode/model/validation_schema/schemas/integration_schema.py:197
+#: rhodecode/authentication/schema.py:38 rhodecode/integrations/schema.py:32
+#: rhodecode/model/permission.py:110 rhodecode/model/permission.py:114
+#: rhodecode/model/permission.py:118 rhodecode/model/permission.py:122
+#: rhodecode/model/permission.py:126 rhodecode/model/permission.py:130
+#: rhodecode/model/validation_schema/schemas/integration_schema.py:195
 #: rhodecode/templates/admin/integrations/list.mako:71
 msgid "Enabled"
 msgstr ""
 
-#: rhodecode/authentication/schema.py:43
+#: rhodecode/authentication/schema.py:44
 msgid ""
 "Amount of seconds to cache the authentication and permissions check response call for this plugin. \n"
 "Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)."
 msgstr ""
 
-#: rhodecode/authentication/schema.py:48
+#: rhodecode/authentication/schema.py:49
 msgid "Auth Cache TTL"
 msgstr ""
 
-#: rhodecode/authentication/views.py:94
+#: rhodecode/authentication/views.py:92
 msgid "Errors exist when saving plugin settings. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/authentication/views.py:116 rhodecode/authentication/views.py:175
+#: rhodecode/authentication/views.py:104 rhodecode/authentication/views.py:163
 msgid "Auth settings updated successfully."
 msgstr ""
 
-#: rhodecode/authentication/views.py:178
+#: rhodecode/authentication/views.py:166
 msgid "Errors exist when saving plugin setting. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/authentication/views.py:186
+#: rhodecode/authentication/views.py:174
 msgid "Error occurred during update of auth settings."
 msgstr ""
 
@@ -1299,7 +1321,7 @@ msgid "The Port in use by the Atlassian 
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:69
-#: rhodecode/authentication/plugins/auth_ldap.py:91
+#: rhodecode/authentication/plugins/auth_ldap.py:89
 msgid "Port"
 msgstr ""
 
@@ -1371,46 +1393,46 @@ msgstr ""
 msgid "Jasig-CAS"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:79
+#: rhodecode/authentication/plugins/auth_ldap.py:77
 msgid ""
 "Host[s] of the LDAP Server \n"
 "(e.g., 192.168.2.154, or ldap-server.domain.com.\n"
 " Multiple servers can be specified using commas"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:83
+#: rhodecode/authentication/plugins/auth_ldap.py:81
 msgid "LDAP Host"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:88
+#: rhodecode/authentication/plugins/auth_ldap.py:86
 msgid "Custom port that the LDAP server is listening on. Default value is: 389"
 msgstr ""
 
+#: rhodecode/authentication/plugins/auth_ldap.py:96
+msgid "Timeout for LDAP connection"
+msgstr ""
+
 #: rhodecode/authentication/plugins/auth_ldap.py:98
-msgid "Timeout for LDAP connection"
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:100
 msgid "Connection timeout"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:107
+#: rhodecode/authentication/plugins/auth_ldap.py:105
 msgid ""
 "Optional user DN/account to connect to LDAP if authentication is required. \n"
 "e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or admin@mydomain.com"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:112
+#: rhodecode/authentication/plugins/auth_ldap.py:110
 msgid "Account"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:117
+#: rhodecode/authentication/plugins/auth_ldap.py:115
 msgid "Password to authenticate for given user DN."
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:120
+#: rhodecode/authentication/plugins/auth_ldap.py:118
 #: rhodecode/integrations/types/webhook.py:92 rhodecode/templates/login.mako:50
-#: rhodecode/templates/register.mako:48
+#: rhodecode/templates/register.mako:58
 #: rhodecode/templates/admin/my_account/my_account.mako:30
 #: rhodecode/templates/admin/users/user_add.mako:44
 #: rhodecode/templates/base/base.mako:326
@@ -1418,93 +1440,93 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:125
+#: rhodecode/authentication/plugins/auth_ldap.py:123
 msgid "TLS Type"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:126
+#: rhodecode/authentication/plugins/auth_ldap.py:124
 msgid "Connection Security"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:132
+#: rhodecode/authentication/plugins/auth_ldap.py:130
 msgid ""
 "Require Cert over TLS?. Self-signed and custom certificates can be used when\n"
 " `RhodeCode Certificate` found in admin > settings > system info page is extended."
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:135
+#: rhodecode/authentication/plugins/auth_ldap.py:133
 msgid "Certificate Checks"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:141
+#: rhodecode/authentication/plugins/auth_ldap.py:139
 msgid ""
 "Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials \n"
 "(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:146
+#: rhodecode/authentication/plugins/auth_ldap.py:144
 msgid "Base DN"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:151
+#: rhodecode/authentication/plugins/auth_ldap.py:149
 msgid ""
 "Filter to narrow results \n"
 "(e.g., (&(objectCategory=Person)(objectClass=user)), or \n"
 "(memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:156
+#: rhodecode/authentication/plugins/auth_ldap.py:154
 msgid "LDAP Search Filter"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:162
+#: rhodecode/authentication/plugins/auth_ldap.py:160
 msgid "How deep to search LDAP. If unsure set to SUBTREE"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:163
+#: rhodecode/authentication/plugins/auth_ldap.py:161
 msgid "LDAP Search Scope"
 msgstr ""
 
+#: rhodecode/authentication/plugins/auth_ldap.py:167
+msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)"
+msgstr ""
+
 #: rhodecode/authentication/plugins/auth_ldap.py:169
-msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)"
-msgstr ""
-
-#: rhodecode/authentication/plugins/auth_ldap.py:171
 msgid "Login Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:172
+#: rhodecode/authentication/plugins/auth_ldap.py:170
 msgid "The LDAP Login attribute of the CN must be specified"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:177
+#: rhodecode/authentication/plugins/auth_ldap.py:175
 msgid "LDAP Attribute to map to first name (e.g., givenName)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:180
+#: rhodecode/authentication/plugins/auth_ldap.py:178
 msgid "First Name Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:185
+#: rhodecode/authentication/plugins/auth_ldap.py:183
 msgid "LDAP Attribute to map to last name (e.g., sn)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:188
+#: rhodecode/authentication/plugins/auth_ldap.py:186
 msgid "Last Name Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:193
+#: rhodecode/authentication/plugins/auth_ldap.py:191
 msgid ""
 "LDAP Attribute to map to email address (e.g., mail).\n"
 "Emails are a crucial part of RhodeCode. \n"
 "If possible add a valid email attribute to ldap users."
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:198
+#: rhodecode/authentication/plugins/auth_ldap.py:196
 msgid "Email Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:426
+#: rhodecode/authentication/plugins/auth_ldap.py:390
 msgid "LDAP"
 msgstr ""
 
@@ -1620,17 +1642,21 @@ msgstr ""
 msgid "user pre update"
 msgstr ""
 
+#: rhodecode/events/user.py:100
+msgid "user permissions change"
+msgstr ""
+
 #: rhodecode/forms/__init__.py:35 rhodecode/templates/admin/gists/new.mako:62
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:68
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:70
 #: rhodecode/templates/admin/permissions/permissions_application.mako:60
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:64
-#: rhodecode/templates/admin/permissions/permissions_objects.mako:57
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:60
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:205
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:187
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:244
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44
 #: rhodecode/templates/admin/settings/settings_global.mako:140
@@ -1638,12 +1664,12 @@ msgstr ""
 #: rhodecode/templates/admin/settings/settings_labs.mako:49
 #: rhodecode/templates/admin/settings/settings_vcs.mako:14
 #: rhodecode/templates/admin/settings/settings_visual.mako:215
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:192
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83
 #: rhodecode/templates/admin/users/user_edit_emails.mako:63
 #: rhodecode/templates/admin/users/user_edit_ips.mako:71
 #: rhodecode/templates/admin/users/user_edit_profile.mako:135
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:65
 #: rhodecode/templates/base/default_perms_box.mako:89
 msgid "Reset"
 msgstr ""
@@ -1652,7 +1678,7 @@ msgstr ""
 #: rhodecode/templates/admin/integrations/list.mako:181
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:31
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:33
 #: rhodecode/templates/admin/notifications/notifications_data.mako:22
 #: rhodecode/templates/admin/notifications/notifications_show.mako:35
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:29
@@ -1661,13 +1687,13 @@ msgstr ""
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45
 #: rhodecode/templates/admin/users/user_edit_emails.mako:31
 #: rhodecode/templates/admin/users/user_edit_ips.mako:35
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:30
 #: rhodecode/templates/base/issue_tracker_settings.mako:69
 #: rhodecode/templates/base/vcs_settings.mako:244
 #: rhodecode/templates/base/vcs_settings.mako:269
-#: rhodecode/templates/changeset/changeset_file_comment.mako:143
-#: rhodecode/templates/changeset/changeset_file_comment.mako:145
-#: rhodecode/templates/changeset/changeset_file_comment.mako:148
+#: rhodecode/templates/changeset/changeset_file_comment.mako:144
+#: rhodecode/templates/changeset/changeset_file_comment.mako:146
+#: rhodecode/templates/changeset/changeset_file_comment.mako:149
 #: rhodecode/templates/data_table/_dt_elements.mako:171
 #: rhodecode/templates/data_table/_dt_elements.mako:244
 #: rhodecode/templates/data_table/_dt_elements.mako:258
@@ -1676,23 +1702,23 @@ msgstr ""
 #: rhodecode/templates/files/files_source.mako:51
 #: rhodecode/templates/files/files_source.mako:55
 #: rhodecode/templates/files/files_source.mako:58
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:56
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:60
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:57
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:61
 msgid "Delete"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:30
-#: rhodecode/model/validation_schema/schemas/integration_schema.py:195
+#: rhodecode/model/validation_schema/schemas/integration_schema.py:193
 msgid "Enable or disable this integration."
 msgstr ""
 
 #: rhodecode/integrations/schema.py:37
-#: rhodecode/model/validation_schema/schemas/integration_schema.py:176
+#: rhodecode/model/validation_schema/schemas/integration_schema.py:174
 msgid "Short name for this integration."
 msgstr ""
 
 #: rhodecode/integrations/schema.py:39
-#: rhodecode/model/validation_schema/schemas/integration_schema.py:178
+#: rhodecode/model/validation_schema/schemas/integration_schema.py:176
 msgid "Integration name"
 msgstr ""
 
@@ -1815,7 +1841,7 @@ msgstr ""
 
 #: rhodecode/integrations/types/slack.py:60
 #: rhodecode/integrations/types/webhook.py:82 rhodecode/templates/login.mako:43
-#: rhodecode/templates/register.mako:41
+#: rhodecode/templates/register.mako:46
 #: rhodecode/templates/admin/admin_log_base.mako:7
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:23
@@ -1823,7 +1849,7 @@ msgstr ""
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70
 #: rhodecode/templates/admin/users/user_add.mako:35
 #: rhodecode/templates/admin/users/user_edit_profile.mako:39
-#: rhodecode/templates/admin/users/users.mako:63
+#: rhodecode/templates/admin/users/users.mako:71
 #: rhodecode/templates/base/base.mako:317
 #: rhodecode/templates/debug_style/login.html:36
 #: rhodecode/templates/email_templates/user_registration.mako:23
@@ -2006,7 +2032,7 @@ msgid "fork name %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:191
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:51
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:52
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
@@ -2039,16 +2065,16 @@ msgstr ""
 msgid "Commit not found"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1441
+#: rhodecode/lib/auth.py:1600
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1531
+#: rhodecode/lib/auth.py:1687
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1575
+#: rhodecode/lib/auth.py:1731
 msgid "You need to be signed in to view this page"
 msgstr ""
 
@@ -2056,7 +2082,7 @@ msgstr ""
 msgid "Click to select line"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1868
+#: rhodecode/lib/helpers.py:1881
 msgid ""
 "Example filter terms:\n"
 "     repository:vcs\n"
@@ -2067,6 +2093,8 @@ msgid ""
 "     date:20120101\n"
 "     date:[20120101100000 TO 20120102]\n"
 "\n"
+"Actions: {actions}\n"
+"\n"
 "Generate wildcards using '*' character:\n"
 "     \"repository:vcs*\" - search everything starting with 'vcs'\n"
 "     \"repository:*vcs*\" - search for repository containing 'vcs'\n"
@@ -2076,7 +2104,7 @@ msgid ""
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1892
+#: rhodecode/lib/helpers.py:1907
 msgid ""
 "Example filter terms for `{searcher}` search:\n"
 "{terms}\n"
@@ -2090,46 +2118,46 @@ msgid ""
 "More: {search_doc}"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1909
+#: rhodecode/lib/helpers.py:1924
 #, python-format
 msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:524
+#: rhodecode/lib/utils2.py:535
 msgid "in ${ago}"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:530
-msgid "${ago} ago"
-msgstr ""
-
-#: rhodecode/lib/utils2.py:539
-msgid "${val}, ${detail}"
-msgstr ""
-
 #: rhodecode/lib/utils2.py:541
+msgid "${ago} ago"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:550
+msgid "${val}, ${detail}"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:552
 msgid "${val}, ${detail} ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:543
+#: rhodecode/lib/utils2.py:554
 msgid "in ${val}, ${detail}"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:545
+#: rhodecode/lib/utils2.py:556
 msgid "${val} and ${detail}"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:547
+#: rhodecode/lib/utils2.py:558
 msgid "${val} and ${detail} ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:549
+#: rhodecode/lib/utils2.py:560
 msgid "in ${val} and ${detail}"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:553
-#: rhodecode/public/js/rhodecode-components.js:30702
-#: rhodecode/public/js/scripts.js:22550
+#: rhodecode/lib/utils2.py:564
+#: rhodecode/public/js/rhodecode-components.js:35750
+#: rhodecode/public/js/scripts.js:22544
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
 msgid "just now"
@@ -2158,15 +2186,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2599
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:2662
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2588
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2654
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2276
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2268
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2268
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2272
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2272
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2322
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2323
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:2717
 msgid "Repository no access"
 msgstr ""
 
@@ -2193,15 +2222,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2600
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 rhodecode/model/db.py:2663
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2589
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2655
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2277
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2269
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2269
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2273
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2273
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2323
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2324
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:2718
 msgid "Repository read access"
 msgstr ""
 
@@ -2228,15 +2258,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2601
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:2664
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2590
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2656
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2278
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2270
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2270
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2274
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2274
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2324
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2325
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2526 rhodecode/model/db.py:2719
 msgid "Repository write access"
 msgstr ""
 
@@ -2263,15 +2294,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2602
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:2665
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2591
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2657
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2279
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2271
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2271
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2275
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2275
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2325
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2326
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:2720
 msgid "Repository admin access"
 msgstr ""
 
@@ -2338,15 +2370,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2620
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:2683
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2609
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2680
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:2743
 msgid "Repository creation disabled"
 msgstr ""
 
@@ -2373,15 +2406,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2621
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:2684
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2610
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2681
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:2744
 msgid "Repository creation enabled"
 msgstr ""
 
@@ -2408,15 +2442,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2625
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 rhodecode/model/db.py:2688
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2614
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2685
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 rhodecode/model/db.py:2748
 msgid "Repository forking disabled"
 msgstr ""
 
@@ -2443,15 +2478,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2626
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:2689
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2615
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2686
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:2749
 msgid "Repository forking enabled"
 msgstr ""
 
@@ -2499,17 +2535,18 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3328
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 rhodecode/model/db.py:3391
-#: rhodecode/public/js/rhodecode-components.js:48219
-#: rhodecode/public/js/scripts.js:40067
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3296
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3379
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2916
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2908
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2909
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2912
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2912
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3012
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3013
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3466
+#: rhodecode/public/js/rhodecode-components.js:53541
+#: rhodecode/public/js/scripts.js:40291
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:319
 msgid "Not Reviewed"
@@ -2538,15 +2575,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3329
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 rhodecode/model/db.py:3392
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3297
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3380
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2917
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2909
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2910
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2913
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2913
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3013
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3014
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3467
 msgid "Approved"
 msgstr ""
 
@@ -2573,15 +2611,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3330
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 rhodecode/model/db.py:3393
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3298
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3381
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2918
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2910
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2911
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2914
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2914
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3014
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3015
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3234 rhodecode/model/db.py:3468
 msgid "Rejected"
 msgstr ""
 
@@ -2608,15 +2647,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3331
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 rhodecode/model/db.py:3394
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3299
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3382
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2919
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2911
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2912
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2915
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2915
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3015
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3016
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3235 rhodecode/model/db.py:3469
 msgid "Under Review"
 msgstr ""
 
@@ -2640,15 +2680,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2604
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:2667
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2593
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2659
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2281
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2273
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2273
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2277
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2277
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2327
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2328
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:2722
 msgid "Repository group no access"
 msgstr ""
 
@@ -2672,15 +2713,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2605
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:2668
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2594
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2660
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2282
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2274
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2274
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2278
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2278
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2328
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2329
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:2723
 msgid "Repository group read access"
 msgstr ""
 
@@ -2704,15 +2746,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2606
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 rhodecode/model/db.py:2669
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2595
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2661
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2283
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2275
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2275
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2279
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2279
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2329
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2330
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2531 rhodecode/model/db.py:2724
 msgid "Repository group write access"
 msgstr ""
 
@@ -2736,15 +2779,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2607
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:2670
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2596
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2662
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2284
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2276
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2276
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2280
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2280
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2330
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2331
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:2725
 msgid "Repository group admin access"
 msgstr ""
 
@@ -2767,15 +2811,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2609
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:2672
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2598
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2664
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2286
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2278
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2278
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2282
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2282
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2332
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2333
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:2727
 msgid "User group no access"
 msgstr ""
 
@@ -2798,15 +2843,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2610
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:2673
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2599
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2665
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:2728
 msgid "User group read access"
 msgstr ""
 
@@ -2829,15 +2875,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2611
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 rhodecode/model/db.py:2674
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2600
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2666
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 rhodecode/model/db.py:2729
 msgid "User group write access"
 msgstr ""
 
@@ -2860,15 +2907,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2612
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:2675
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2601
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2667
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:2730
 msgid "User group admin access"
 msgstr ""
 
@@ -2891,15 +2939,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2614
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 rhodecode/model/db.py:2677
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2603
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2674
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2539 rhodecode/model/db.py:2737
 msgid "Repository Group creation disabled"
 msgstr ""
 
@@ -2922,15 +2971,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2615
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:2678
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2604
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2675
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:2738
 msgid "Repository Group creation enabled"
 msgstr ""
 
@@ -2953,15 +3003,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2617
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:2680
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2606
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2677
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 rhodecode/model/db.py:2740
 msgid "User Group creation disabled"
 msgstr ""
 
@@ -2984,15 +3035,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2618
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 rhodecode/model/db.py:2681
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2607
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2678
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:2741
 msgid "User Group creation enabled"
 msgstr ""
 
@@ -3015,15 +3067,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2628
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 rhodecode/model/db.py:2691
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2617
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2688
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:2751
 msgid "Registration disabled"
 msgstr ""
 
@@ -3046,15 +3099,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2629
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 rhodecode/model/db.py:2692
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2618
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2689
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 rhodecode/model/db.py:2752
 msgid "User Registration with manual account activation"
 msgstr ""
 
@@ -3077,15 +3131,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2630
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 rhodecode/model/db.py:2693
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2619
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2690
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2307
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2299
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2299
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2303
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2303
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2353
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2354
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:2753
 msgid "User Registration with automatic account activation"
 msgstr ""
 
@@ -3108,16 +3163,17 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2636
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 rhodecode/model/db.py:2699
-#: rhodecode/model/permission.py:96
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2625
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2696
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 rhodecode/model/db.py:2759
+#: rhodecode/model/permission.py:105
 msgid "Manual activation of external account"
 msgstr ""
 
@@ -3140,16 +3196,17 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2637
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 rhodecode/model/db.py:2700
-#: rhodecode/model/permission.py:97
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2626
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2697
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:2760
+#: rhodecode/model/permission.py:106
 msgid "Automatic activation of external account"
 msgstr ""
 
@@ -3166,15 +3223,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2622
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 rhodecode/model/db.py:2685
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2611
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2682
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 rhodecode/model/db.py:2745
 msgid "Repository creation enabled with write permission to a repository group"
 msgstr ""
 
@@ -3191,15 +3249,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2623
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:2686
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2612
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2683
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:2746
 msgid "Repository creation disabled with write permission to a repository group"
 msgstr ""
 
@@ -3213,15 +3272,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2597
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:2660
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2586
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2652
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2274
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2266
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2266
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2270
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2270
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2320
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2321
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:2715
 msgid "RhodeCode Super Administrator"
 msgstr ""
 
@@ -3233,15 +3293,16 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2639
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 rhodecode/model/db.py:2702
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2628
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2699
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 rhodecode/model/db.py:2762
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
@@ -3253,19 +3314,21 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2640
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 rhodecode/model/db.py:2703
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2629
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2700
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 rhodecode/model/db.py:2763
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1107
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911
@@ -3273,11 +3336,12 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1107
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1103
 msgid "all"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1108
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912
@@ -3285,11 +3349,12 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1108
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1104
 msgid "http/web interface"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1109
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913
@@ -3297,11 +3362,12 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1109
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1105
 msgid "vcs (git/hg/svn protocol)"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1110
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914
@@ -3309,11 +3375,12 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1110
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1106
 msgid "api calls"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1111
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915
@@ -3321,43 +3388,67 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 rhodecode/model/db.py:1111
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 rhodecode/model/db.py:1107
 msgid "feed access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2360
-#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055
-#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059
-#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 rhodecode/model/db.py:2423
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2349
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2415
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2052
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2044
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2044
+#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2048
+#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2048
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2091
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2092
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2286 rhodecode/model/db.py:2468
 msgid "No parent"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2632
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 rhodecode/model/db.py:2695
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2621
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2692
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:2755
 msgid "Password reset enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2633
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 rhodecode/model/db.py:2696
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2622
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2693
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 rhodecode/model/db.py:2756
 msgid "Password reset hidden"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2634
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 rhodecode/model/db.py:2697
+#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2623
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2694
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:2757
 msgid "Password reset disabled"
 msgstr ""
 
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2669
+#: rhodecode/model/db.py:2732
+msgid "Branch no permissions"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2670
+#: rhodecode/model/db.py:2733
+msgid "Branch access by web merge"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2671
+#: rhodecode/model/db.py:2734
+msgid "Branch access by push"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2672
+#: rhodecode/model/db.py:2735
+msgid "Branch access by push with force"
+msgstr ""
+
 #: rhodecode/lib/index/whoosh.py:164
 msgid "Index Type"
 msgstr ""
@@ -3394,11 +3485,11 @@ msgstr ""
 msgid "1 month {end_date}"
 msgstr ""
 
-#: rhodecode/model/comment.py:382
+#: rhodecode/model/comment.py:384
 msgid "made a comment"
 msgstr ""
 
-#: rhodecode/model/comment.py:383
+#: rhodecode/model/comment.py:385
 msgid "Show it now"
 msgstr ""
 
@@ -3480,35 +3571,36 @@ msgstr ""
 msgid "%(user)s commented on pull request at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74
-#: rhodecode/model/permission.py:80
+#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77
+#: rhodecode/model/permission.py:83
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:195
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11
 msgid "None"
 msgstr ""
 
-#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75
-#: rhodecode/model/permission.py:81
+#: rhodecode/model/permission.py:72 rhodecode/model/permission.py:78
+#: rhodecode/model/permission.py:84
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12
 msgid "Read"
 msgstr ""
 
-#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76
-#: rhodecode/model/permission.py:82
+#: rhodecode/model/permission.py:73 rhodecode/model/permission.py:79
+#: rhodecode/model/permission.py:85
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13
-#: rhodecode/templates/changeset/changeset_file_comment.mako:272
-#: rhodecode/templates/changeset/changeset_file_comment.mako:322
+#: rhodecode/templates/changeset/changeset_file_comment.mako:273
+#: rhodecode/templates/changeset/changeset_file_comment.mako:323
+#: rhodecode/templates/data_table/_dt_elements.mako:386
 msgid "Write"
 msgstr ""
 
-#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77
-#: rhodecode/model/permission.py:83
+#: rhodecode/model/permission.py:74 rhodecode/model/permission.py:80
+#: rhodecode/model/permission.py:86
 #: rhodecode/templates/admin/auth/auth_settings.mako:12
 #: rhodecode/templates/admin/auth/plugin_settings.mako:12
 #: rhodecode/templates/admin/defaults/defaults.mako:12
@@ -3536,36 +3628,52 @@ msgstr ""
 #: rhodecode/templates/admin/users/user_add.mako:11
 #: rhodecode/templates/admin/users/user_edit.mako:12
 #: rhodecode/templates/admin/users/users.mako:13
-#: rhodecode/templates/admin/users/users.mako:76
-#: rhodecode/templates/base/base.mako:421
-#: rhodecode/templates/base/base.mako:428
+#: rhodecode/templates/admin/users/users.mako:84
+#: rhodecode/templates/base/base.mako:452
+#: rhodecode/templates/base/base.mako:459
 msgid "Admin"
 msgstr ""
 
-#: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100
-#: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108
-#: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116
-#: rhodecode/model/permission.py:120
-msgid "Disabled"
-msgstr ""
-
-#: rhodecode/model/permission.py:87
-msgid "Allowed with manual account activation"
-msgstr ""
-
-#: rhodecode/model/permission.py:88
-msgid "Allowed with automatic account activation"
+#: rhodecode/model/permission.py:89
+msgid "Protected/No Access"
+msgstr ""
+
+#: rhodecode/model/permission.py:90
+msgid "Web merge"
 msgstr ""
 
 #: rhodecode/model/permission.py:91
-msgid "Allow password recovery"
+msgid "Push"
 msgstr ""
 
 #: rhodecode/model/permission.py:92
+msgid "Force Push"
+msgstr ""
+
+#: rhodecode/model/permission.py:95 rhodecode/model/permission.py:109
+#: rhodecode/model/permission.py:113 rhodecode/model/permission.py:117
+#: rhodecode/model/permission.py:121 rhodecode/model/permission.py:125
+#: rhodecode/model/permission.py:129
+msgid "Disabled"
+msgstr ""
+
+#: rhodecode/model/permission.py:96
+msgid "Allowed with manual account activation"
+msgstr ""
+
+#: rhodecode/model/permission.py:97
+msgid "Allowed with automatic account activation"
+msgstr ""
+
+#: rhodecode/model/permission.py:100
+msgid "Allow password recovery"
+msgstr ""
+
+#: rhodecode/model/permission.py:101
 msgid "Hide password recovery link"
 msgstr ""
 
-#: rhodecode/model/permission.py:93
+#: rhodecode/model/permission.py:102
 msgid "Disable password recovery"
 msgstr ""
 
@@ -3641,71 +3749,75 @@ msgstr ""
 msgid "This pull request cannot be updated because the source reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1218
+#: rhodecode/model/pull_request.py:1236
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1220
+#: rhodecode/model/pull_request.py:1238
 msgid "This pull request is closed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1233
+#: rhodecode/model/pull_request.py:1253
 msgid "Pull request merging is not supported."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1252
+#: rhodecode/model/pull_request.py:1272
 msgid "Target repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1255
+#: rhodecode/model/pull_request.py:1275
 msgid "Source repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1420 rhodecode/model/scm.py:797
+#: rhodecode/model/pull_request.py:1444 rhodecode/model/scm.py:803
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1425
+#: rhodecode/model/pull_request.py:1449
 msgid "Commit IDs"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1428
+#: rhodecode/model/pull_request.py:1452
 msgid "Closed Branches"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1588
+#: rhodecode/model/pull_request.py:1613
 msgid "User `{}` not allowed to perform merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1601
+#: rhodecode/model/pull_request.py:1631
+msgid "Target branch `{}` changes rejected by rule {}."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:1645
 msgid "Pull request reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1616
+#: rhodecode/model/pull_request.py:1660
 msgid "Cannot merge, {} TODO still not resolved."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1619
+#: rhodecode/model/pull_request.py:1663
 msgid "Cannot merge, {} TODOs still not resolved."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1654
+#: rhodecode/model/pull_request.py:1699
 msgid "Merge strategy: rebase"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1659
+#: rhodecode/model/pull_request.py:1704
 msgid "Merge strategy: explicit merge commit"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1666
+#: rhodecode/model/pull_request.py:1711
 msgid "Source branch will be closed after merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1668
+#: rhodecode/model/pull_request.py:1713
 msgid "Source branch will be deleted after merge."
 msgstr ""
 
-#: rhodecode/model/scm.py:775
+#: rhodecode/model/scm.py:781
 msgid "latest tip"
 msgstr ""
 
@@ -3967,19 +4079,19 @@ msgstr ""
 msgid "Only superadmins can create global integrations"
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/integration_schema.py:183
+#: rhodecode/model/validation_schema/schemas/integration_schema.py:181
 msgid "Scope of the integration. Recursive means the integration  runs on all repos of that group and children recursively."
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/integration_schema.py:186
+#: rhodecode/model/validation_schema/schemas/integration_schema.py:184
 msgid "Integration scope"
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/integration_schema.py:216
+#: rhodecode/model/validation_schema/schemas/integration_schema.py:214
 msgid "General integration options"
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/integration_schema.py:219
+#: rhodecode/model/validation_schema/schemas/integration_schema.py:217
 msgid "{integration_type} settings"
 msgstr ""
 
@@ -4043,459 +4155,459 @@ msgstr ""
 msgid "Additional emails can be specified at <a href=\"{}\">extra emails</a> page."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:28706
-#: rhodecode/public/js/scripts.js:20554
+#: rhodecode/public/js/rhodecode-components.js:13225
+#: rhodecode/public/js/scripts.js:19
+msgid ": , "
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:33754
+#: rhodecode/public/js/scripts.js:20548
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87
 msgid "No results"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30637
-#: rhodecode/public/js/scripts.js:22485
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
+#: rhodecode/public/js/rhodecode-components.js:35685
+#: rhodecode/public/js/scripts.js:22479
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109
 msgid "{0} year"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30638
-#: rhodecode/public/js/scripts.js:22486
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102
+#: rhodecode/public/js/rhodecode-components.js:35686
+#: rhodecode/public/js/scripts.js:22480
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110
 msgid "{0} month"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30639
-#: rhodecode/public/js/scripts.js:22487
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
+#: rhodecode/public/js/rhodecode-components.js:35687
+#: rhodecode/public/js/scripts.js:22481
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111
 msgid "{0} day"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30640
-#: rhodecode/public/js/scripts.js:22488
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
+#: rhodecode/public/js/rhodecode-components.js:35688
+#: rhodecode/public/js/scripts.js:22482
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112
 msgid "{0} hour"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30641
-#: rhodecode/public/js/scripts.js:22489
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
+#: rhodecode/public/js/rhodecode-components.js:35689
+#: rhodecode/public/js/scripts.js:22483
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113
 msgid "{0} min"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30642
-#: rhodecode/public/js/scripts.js:22490
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
+#: rhodecode/public/js/rhodecode-components.js:35690
+#: rhodecode/public/js/scripts.js:22484
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114
 msgid "{0} sec"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30662
-#: rhodecode/public/js/scripts.js:22510
+#: rhodecode/public/js/rhodecode-components.js:35710
+#: rhodecode/public/js/scripts.js:22504
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134
 msgid "in {0}"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30670
-#: rhodecode/public/js/scripts.js:22518
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
+#: rhodecode/public/js/rhodecode-components.js:35718
+#: rhodecode/public/js/scripts.js:22512
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142
 msgid "{0} ago"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30682
-#: rhodecode/public/js/scripts.js:22530
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
+#: rhodecode/public/js/rhodecode-components.js:35730
+#: rhodecode/public/js/scripts.js:22524
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:114
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154
 msgid "{0}, {1} ago"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30684
-#: rhodecode/public/js/scripts.js:22532
+#: rhodecode/public/js/rhodecode-components.js:35732
+#: rhodecode/public/js/scripts.js:22526
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156
 msgid "in {0}, {1}"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30688
-#: rhodecode/public/js/scripts.js:22536
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95
+#: rhodecode/public/js/rhodecode-components.js:35736
+#: rhodecode/public/js/scripts.js:22530
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160
 msgid "{0} and {1}"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30690
-#: rhodecode/public/js/scripts.js:22538
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
+#: rhodecode/public/js/rhodecode-components.js:35738
+#: rhodecode/public/js/scripts.js:22532
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162
 msgid "{0} and {1} ago"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:30692
-#: rhodecode/public/js/scripts.js:22540
+#: rhodecode/public/js/rhodecode-components.js:35740
+#: rhodecode/public/js/scripts.js:22534
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164
 msgid "in {0} and {1}"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:44751
-#: rhodecode/public/js/scripts.js:36599
+#: rhodecode/public/js/rhodecode-components.js:49799
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4
 msgid "Loading more results..."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:44754
-#: rhodecode/public/js/scripts.js:36602
+#: rhodecode/public/js/rhodecode-components.js:49802
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7
 msgid "Searching..."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:44757
-#: rhodecode/public/js/scripts.js:36605
+#: rhodecode/public/js/rhodecode-components.js:49805
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10
 msgid "No matches found"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:44760
-#: rhodecode/public/js/scripts.js:36608
+#: rhodecode/public/js/rhodecode-components.js:49808
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13
 msgid "Loading failed"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:44764
-#: rhodecode/public/js/scripts.js:36612
+#: rhodecode/public/js/rhodecode-components.js:49812
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17
 msgid "One result is available, press enter to select it."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:44766
-#: rhodecode/public/js/scripts.js:36614
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106
+#: rhodecode/public/js/rhodecode-components.js:49814
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19
 msgid "{0} results are available, use up and down arrow keys to navigate."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:44771
-#: rhodecode/public/js/scripts.js:36619
+#: rhodecode/public/js/rhodecode-components.js:49819
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24
 msgid "Please enter {0} or more character"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:44773
-#: rhodecode/public/js/scripts.js:36621
+#: rhodecode/public/js/rhodecode-components.js:49821
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26
 msgid "Please enter {0} or more characters"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:44778
-#: rhodecode/public/js/scripts.js:36626
+#: rhodecode/public/js/rhodecode-components.js:49826
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31
 msgid "Please delete {0} character"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:44780
-#: rhodecode/public/js/scripts.js:36628
+#: rhodecode/public/js/rhodecode-components.js:49828
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33
 msgid "Please delete {0} characters"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:44784
-#: rhodecode/public/js/scripts.js:36632
+#: rhodecode/public/js/rhodecode-components.js:49832
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37
 msgid "You can only select {0} item"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:44786
-#: rhodecode/public/js/scripts.js:36634
+#: rhodecode/public/js/rhodecode-components.js:49834
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:74
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39
 msgid "You can only select {0} items"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:45724
-#: rhodecode/public/js/scripts.js:37572
+#: rhodecode/public/js/rhodecode-components.js:50772
+#: rhodecode/public/js/scripts.js:37522
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:88
 #: rhodecode/public/js/src/rhodecode/changelog.js:35
 msgid "showing {0} out of {1} commit"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:45726
-#: rhodecode/public/js/scripts.js:37574
+#: rhodecode/public/js/rhodecode-components.js:50774
+#: rhodecode/public/js/scripts.js:37524
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
 #: rhodecode/public/js/src/rhodecode/changelog.js:37
 msgid "showing {0} out of {1} commits"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:46172
-#: rhodecode/public/js/scripts.js:38020
+#: rhodecode/public/js/rhodecode-components.js:51282
+#: rhodecode/public/js/scripts.js:38032
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
-#: rhodecode/public/js/src/rhodecode/codemirror.js:297
+#: rhodecode/public/js/src/rhodecode/codemirror.js:359
 msgid "Set status to Approved"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:46191
-#: rhodecode/public/js/scripts.js:38039
+#: rhodecode/public/js/rhodecode-components.js:51301
+#: rhodecode/public/js/scripts.js:38051
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
-#: rhodecode/public/js/src/rhodecode/codemirror.js:316
+#: rhodecode/public/js/src/rhodecode/codemirror.js:378
 msgid "Set status to Rejected"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:46210
-#: rhodecode/public/js/scripts.js:38058
+#: rhodecode/public/js/rhodecode-components.js:51320
+#: rhodecode/public/js/scripts.js:38070
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
-#: rhodecode/public/js/src/rhodecode/codemirror.js:335
+#: rhodecode/public/js/src/rhodecode/codemirror.js:397
 #: rhodecode/templates/email_templates/commit_comment.mako:99
 #: rhodecode/templates/email_templates/pull_request_comment.mako:107
 msgid "TODO comment"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:46230
-#: rhodecode/public/js/scripts.js:38078
+#: rhodecode/public/js/rhodecode-components.js:51340
+#: rhodecode/public/js/scripts.js:38090
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:40
-#: rhodecode/public/js/src/rhodecode/codemirror.js:355
+#: rhodecode/public/js/src/rhodecode/codemirror.js:417
 msgid "Note Comment"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:46597
-#: rhodecode/public/js/scripts.js:38445
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
-#: rhodecode/public/js/src/rhodecode/comments.js:126
-msgid "resolve comment"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode-components.js:46681
-#: rhodecode/public/js/scripts.js:38529
+#: rhodecode/public/js/rhodecode-components.js:51653
+#: rhodecode/public/js/rhodecode-components.js:52007
+#: rhodecode/public/js/scripts.js:38403 rhodecode/public/js/scripts.js:38757
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
-#: rhodecode/public/js/src/rhodecode/comments.js:210
+#: rhodecode/public/js/src/rhodecode/codemirror.js:730
+#: rhodecode/public/js/src/rhodecode/comments.js:233
 msgid "Status Review"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:46696
-#: rhodecode/public/js/scripts.js:38544
+#: rhodecode/public/js/rhodecode-components.js:51668
+#: rhodecode/public/js/rhodecode-components.js:52022
+#: rhodecode/public/js/scripts.js:38418 rhodecode/public/js/scripts.js:38772
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
-#: rhodecode/public/js/src/rhodecode/comments.js:225
+#: rhodecode/public/js/src/rhodecode/codemirror.js:745
+#: rhodecode/public/js/src/rhodecode/comments.js:248
 msgid "Comment text will be set automatically based on currently selected status ({0}) ..."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:46853
-#: rhodecode/public/js/scripts.js:38701
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
-#: rhodecode/public/js/src/rhodecode/comments.js:382
-msgid "Submitting..."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode-components.js:46904
-#: rhodecode/public/js/scripts.js:38752
+#: rhodecode/public/js/rhodecode-components.js:51749
+#: rhodecode/public/js/rhodecode-components.js:52217
+#: rhodecode/public/js/scripts.js:38499 rhodecode/public/js/scripts.js:38967
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
-#: rhodecode/public/js/src/rhodecode/comments.js:433
+#: rhodecode/public/js/src/rhodecode/codemirror.js:826
+#: rhodecode/public/js/src/rhodecode/comments.js:443
 #: rhodecode/templates/files/files_browser_tree.mako:51
 msgid "Loading ..."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:47014
-#: rhodecode/public/js/scripts.js:38862
+#: rhodecode/public/js/rhodecode-components.js:51923
+#: rhodecode/public/js/scripts.js:38673
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
+#: rhodecode/public/js/src/rhodecode/comments.js:149
+msgid "resolve comment"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:52166
+#: rhodecode/public/js/scripts.js:38916
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
+#: rhodecode/public/js/src/rhodecode/comments.js:392
+msgid "Submitting..."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:52331
+#: rhodecode/public/js/scripts.js:39081
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
-#: rhodecode/public/js/src/rhodecode/comments.js:543
+#: rhodecode/public/js/src/rhodecode/comments.js:557
 msgid "Delete this comment?"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:47086
-#: rhodecode/public/js/scripts.js:38934
+#: rhodecode/public/js/rhodecode-components.js:52403
+#: rhodecode/public/js/scripts.js:39153
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
-#: rhodecode/public/js/src/rhodecode/comments.js:615
+#: rhodecode/public/js/src/rhodecode/comments.js:629
 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:47163
-#: rhodecode/public/js/scripts.js:39011
+#: rhodecode/public/js/rhodecode-components.js:52480
+#: rhodecode/public/js/scripts.js:39230
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
-#: rhodecode/public/js/src/rhodecode/comments.js:692
+#: rhodecode/public/js/src/rhodecode/comments.js:706
 msgid "Leave a comment on line {0}."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:47277
-#: rhodecode/public/js/scripts.js:39125
+#: rhodecode/public/js/rhodecode-components.js:52598
+#: rhodecode/public/js/scripts.js:39348
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
-#: rhodecode/public/js/src/rhodecode/comments.js:806
+#: rhodecode/public/js/src/rhodecode/comments.js:824
 msgid "TODO from comment {0} was fixed."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:47457
-#: rhodecode/public/js/scripts.js:39305
+#: rhodecode/public/js/rhodecode-components.js:52778
+#: rhodecode/public/js/scripts.js:39528
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:91
 #: rhodecode/public/js/src/rhodecode/files.js:150
 msgid "truncated result"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:47459
-#: rhodecode/public/js/scripts.js:39307
+#: rhodecode/public/js/rhodecode-components.js:52780
+#: rhodecode/public/js/scripts.js:39530
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:92
 #: rhodecode/public/js/src/rhodecode/files.js:152
 msgid "truncated results"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:47468
-#: rhodecode/public/js/scripts.js:39316
+#: rhodecode/public/js/rhodecode-components.js:52789
+#: rhodecode/public/js/scripts.js:39539
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30
 #: rhodecode/public/js/src/rhodecode/files.js:161
 msgid "No matching files"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:47603
-#: rhodecode/public/js/scripts.js:39451
+#: rhodecode/public/js/rhodecode-components.js:52924
+#: rhodecode/public/js/scripts.js:39674
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
 #: rhodecode/public/js/src/rhodecode/files.js:296
 msgid "Selection link"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:47643
-#: rhodecode/public/js/scripts.js:39491
+#: rhodecode/public/js/rhodecode-components.js:52964
+#: rhodecode/public/js/scripts.js:39714
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
 #: rhodecode/public/js/src/rhodecode/followers.js:26
 msgid "Stop following this repository"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:47644
-#: rhodecode/public/js/scripts.js:39492
+#: rhodecode/public/js/rhodecode-components.js:52965
+#: rhodecode/public/js/scripts.js:39715
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
 #: rhodecode/public/js/src/rhodecode/followers.js:27
 msgid "Unfollow"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:47653
-#: rhodecode/public/js/scripts.js:39501
+#: rhodecode/public/js/rhodecode-components.js:52974
+#: rhodecode/public/js/scripts.js:39724
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
 #: rhodecode/public/js/src/rhodecode/followers.js:36
 msgid "Start following this repository"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:47654
-#: rhodecode/public/js/scripts.js:39502
+#: rhodecode/public/js/rhodecode-components.js:52975
+#: rhodecode/public/js/scripts.js:39725
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
 #: rhodecode/public/js/src/rhodecode/followers.js:37
 msgid "Follow"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48034
-#: rhodecode/public/js/scripts.js:39882
+#: rhodecode/public/js/rhodecode-components.js:53356
+#: rhodecode/public/js/scripts.js:40106
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134
 msgid "All reviewers must vote."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48043
-#: rhodecode/public/js/scripts.js:39891
+#: rhodecode/public/js/rhodecode-components.js:53365
+#: rhodecode/public/js/scripts.js:40115
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143
 msgid "All individual reviewers must vote."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48048
-#: rhodecode/public/js/scripts.js:39896
+#: rhodecode/public/js/rhodecode-components.js:53370
+#: rhodecode/public/js/scripts.js:40120
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148
 msgid "At least {0} reviewer must vote."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48054
-#: rhodecode/public/js/scripts.js:39902
+#: rhodecode/public/js/rhodecode-components.js:53376
+#: rhodecode/public/js/scripts.js:40126
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154
 msgid "At least {0} reviewers must vote."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48070
-#: rhodecode/public/js/scripts.js:39918
+#: rhodecode/public/js/rhodecode-components.js:53392
+#: rhodecode/public/js/scripts.js:40142
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:170
 msgid "Reviewers picked from source code changes."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48077
-#: rhodecode/public/js/scripts.js:39925
+#: rhodecode/public/js/rhodecode-components.js:53399
+#: rhodecode/public/js/scripts.js:40149
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:177
 msgid "Adding new reviewers is forbidden."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48084
-#: rhodecode/public/js/scripts.js:39932
+#: rhodecode/public/js/rhodecode-components.js:53406
+#: rhodecode/public/js/scripts.js:40156
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:184
 msgid "Author is not allowed to be a reviewer."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48098
-#: rhodecode/public/js/scripts.js:39946
+#: rhodecode/public/js/rhodecode-components.js:53420
+#: rhodecode/public/js/scripts.js:40170
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:198
 msgid "Commit Authors are not allowed to be a reviewer."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48206
-#: rhodecode/public/js/scripts.js:40054
+#: rhodecode/public/js/rhodecode-components.js:53528
+#: rhodecode/public/js/scripts.js:40278
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:306
 msgid "User `{0}` not allowed to be a reviewer"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48212
-#: rhodecode/public/js/scripts.js:40060
+#: rhodecode/public/js/rhodecode-components.js:53534
+#: rhodecode/public/js/scripts.js:40284
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:312
 msgid "User `{0}` already in reviewers"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48342
-#: rhodecode/public/js/scripts.js:40190
+#: rhodecode/public/js/rhodecode-components.js:53622
+#: rhodecode/public/js/scripts.js:40372
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:75
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:442
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:400
 msgid "added manually by \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48346
-#: rhodecode/public/js/scripts.js:40194
+#: rhodecode/public/js/rhodecode-components.js:53626
+#: rhodecode/public/js/scripts.js:40376
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:86
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:446
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:404
 msgid "member of \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48932
-#: rhodecode/public/js/scripts.js:40780
+#: rhodecode/public/js/rhodecode-components.js:54212
+#: rhodecode/public/js/scripts.js:40962
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
 #: rhodecode/public/js/src/rhodecode.js:142
 msgid "file"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:48952
-#: rhodecode/public/js/scripts.js:40800
+#: rhodecode/public/js/rhodecode-components.js:54232
+#: rhodecode/public/js/scripts.js:40982
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
 #: rhodecode/public/js/src/rhodecode.js:162
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:33
 msgid "Show more"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:49328
-#: rhodecode/public/js/scripts.js:41176
+#: rhodecode/public/js/rhodecode-components.js:54608
+#: rhodecode/public/js/scripts.js:41358
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
 #: rhodecode/public/js/src/rhodecode.js:538
 msgid "date not in future"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:49336
-#: rhodecode/public/js/scripts.js:41184
+#: rhodecode/public/js/rhodecode-components.js:54616
+#: rhodecode/public/js/scripts.js:41366
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
 #: rhodecode/public/js/src/rhodecode.js:546
 msgid "Specified expiration date"
@@ -4506,14 +4618,14 @@ msgid "(from usergroup {0})"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
-#: rhodecode/templates/codeblocks/diffs.mako:497
 #: rhodecode/templates/codeblocks/diffs.mako:502
+#: rhodecode/templates/codeblocks/diffs.mako:507
 msgid "Add another comment"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
 #: rhodecode/public/js/src/i18n_messages.js:5
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:331
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:333
 msgid "Close"
 msgstr ""
 
@@ -4593,7 +4705,7 @@ msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
 #: rhodecode/public/js/src/i18n_messages.js:6
-#: rhodecode/templates/admin/settings/settings_email.mako:48
+#: rhodecode/templates/admin/settings/settings_email.mako:52
 msgid "Send"
 msgstr ""
 
@@ -4642,7 +4754,7 @@ msgid "files"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
-#: rhodecode/templates/pullrequests/pullrequest.mako:140
+#: rhodecode/templates/pullrequests/pullrequest.mako:141
 msgid "loading..."
 msgstr ""
 
@@ -4651,30 +4763,46 @@ msgid "specify commit"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:93
+msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
+msgid "{0} ({1} inactive) of {2} users ({3} inactive)"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95
 msgid "{0} active out of {1} users"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
-msgid "{0} days"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:100
+msgid "{0} days"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102
 msgid "{0} hours"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
-msgid "{0} months"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104
-msgid "{0} out of {1} ssh keys"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:105
+msgid "{0} months"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106
+msgid "{0} out of {1} ssh keys"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
 msgid "{0} out of {1} users"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
+msgid "{0} user groups ({1} inactive)"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:111
+msgid "{0} users ({1} inactive)"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113
 msgid "{0} years"
 msgstr ""
 
@@ -4706,54 +4834,38 @@ msgstr ""
 msgid "Dashboard"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:8
-#: rhodecode/templates/admin/gists/index.mako:18
-#: rhodecode/templates/admin/my_account/my_account_repos.mako:7
-#: rhodecode/templates/admin/my_account/my_account_watched.mako:7
-#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11
-#: rhodecode/templates/admin/repo_groups/repo_groups.mako:12
-#: rhodecode/templates/admin/repos/repos.mako:12
-#: rhodecode/templates/admin/user_groups/user_groups.mako:12
-#: rhodecode/templates/admin/users/users.mako:12
-#: rhodecode/templates/bookmarks/bookmarks.mako:12
-#: rhodecode/templates/branches/branches.mako:12
-#: rhodecode/templates/journal/journal.mako:13
-#: rhodecode/templates/tags/tags.mako:12
-msgid "quick filter..."
-msgstr ""
-
-#: rhodecode/templates/index_base.mako:10
+#: rhodecode/templates/index_base.mako:9
 msgid "matches"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:30
-#: rhodecode/templates/index_base.mako:39
+#: rhodecode/templates/index_base.mako:29
+#: rhodecode/templates/index_base.mako:38
 #: rhodecode/templates/admin/repos/repo_add.mako:22
 #: rhodecode/templates/admin/repos/repos.mako:27
 msgid "Add Repository"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:34
-#: rhodecode/templates/index_base.mako:42
+#: rhodecode/templates/index_base.mako:33
+#: rhodecode/templates/index_base.mako:41
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:16
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:27
 msgid "Add Repository Group"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:45
+#: rhodecode/templates/index_base.mako:44
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:45
+#: rhodecode/templates/index_base.mako:44
 msgid "Edit Repository Group"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:68
+#: rhodecode/templates/index_base.mako:67
 msgid "No repositories or repositories groups exists here."
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:86
-#: rhodecode/templates/index_base.mako:116
+#: rhodecode/templates/index_base.mako:85
+#: rhodecode/templates/index_base.mako:115
 #: rhodecode/templates/admin/gists/index.mako:112
 #: rhodecode/templates/admin/integrations/list.mako:72
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55
@@ -4764,9 +4876,10 @@ msgstr ""
 #: rhodecode/templates/admin/repos/repo_add_base.mako:9
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16
 #: rhodecode/templates/admin/repos/repos.mako:54
-#: rhodecode/templates/admin/user_groups/user_groups.mako:61
+#: rhodecode/templates/admin/user_groups/user_groups.mako:73
 #: rhodecode/templates/admin/users/user_edit_groups.mako:54
-#: rhodecode/templates/base/perms_summary.mako:149
+#: rhodecode/templates/base/perms_summary.mako:168
+#: rhodecode/templates/base/perms_summary.mako:242
 #: rhodecode/templates/bookmarks/bookmarks.mako:59
 #: rhodecode/templates/branches/branches.mako:58
 #: rhodecode/templates/files/files_browser_tree.mako:5
@@ -4775,31 +4888,31 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:89
-#: rhodecode/templates/index_base.mako:119
+#: rhodecode/templates/index_base.mako:88
+#: rhodecode/templates/index_base.mako:118
 #: rhodecode/templates/admin/gists/index.mako:114
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:57
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:44
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56
-#: rhodecode/templates/admin/repos/repo_add_base.mako:43
+#: rhodecode/templates/admin/repos/repo_add_base.mako:52
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:170
 #: rhodecode/templates/admin/repos/repos.mako:57
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42
-#: rhodecode/templates/admin/user_groups/user_groups.mako:63
+#: rhodecode/templates/admin/user_groups/user_groups.mako:75
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67
 #: rhodecode/templates/admin/users/user_edit_groups.mako:59
 #: rhodecode/templates/admin/users/user_edit_ips.mako:12
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:52
 #: rhodecode/templates/base/issue_tracker_settings.mako:10
 #: rhodecode/templates/changeset/changeset.mako:76
 #: rhodecode/templates/compare/compare_commits.mako:21
@@ -4809,23 +4922,23 @@ msgstr ""
 #: rhodecode/templates/files/file_tree_detail.mako:5
 #: rhodecode/templates/files/file_tree_detail.mako:12
 #: rhodecode/templates/forks/fork.mako:48
-#: rhodecode/templates/forks/forks.mako:72
-#: rhodecode/templates/pullrequests/pullrequest.mako:54
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:169
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:481
+#: rhodecode/templates/forks/forks.mako:64
+#: rhodecode/templates/pullrequests/pullrequest.mako:55
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:170
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:484
 #: rhodecode/templates/summary/components.mako:88
 msgid "Description"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:92
-#: rhodecode/templates/index_base.mako:122
+#: rhodecode/templates/index_base.mako:91
+#: rhodecode/templates/index_base.mako:121
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:59
 #: rhodecode/templates/admin/repos/repos.mako:60
 msgid "Last Change"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:94
-#: rhodecode/templates/index_base.mako:127
+#: rhodecode/templates/index_base.mako:93
+#: rhodecode/templates/index_base.mako:126
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37
@@ -4835,15 +4948,15 @@ msgstr ""
 #: rhodecode/templates/admin/repos/repos.mako:65
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24
-#: rhodecode/templates/admin/user_groups/user_groups.mako:71
+#: rhodecode/templates/admin/user_groups/user_groups.mako:83
 #: rhodecode/templates/admin/users/user_edit_groups.mako:65
-#: rhodecode/templates/forks/forks.mako:68
+#: rhodecode/templates/forks/forks.mako:60
 #: rhodecode/templates/summary/components.mako:209
 #: rhodecode/templates/user_group/profile.mako:23
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.mako:125
+#: rhodecode/templates/index_base.mako:124
 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35
 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35
 #: rhodecode/templates/admin/repos/repos.mako:63
@@ -4855,7 +4968,7 @@ msgstr ""
 #: rhodecode/templates/email_templates/commit_comment.mako:49
 #: rhodecode/templates/email_templates/commit_comment.mako:88
 #: rhodecode/templates/files/file_authors_box.mako:31
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:479
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:482
 #: rhodecode/templates/search/search_commit.mako:6
 #: rhodecode/templates/summary/summary_commits.mako:8
 #: rhodecode/templates/tags/tags.mako:66
@@ -4895,7 +5008,6 @@ msgstr ""
 
 #: rhodecode/templates/login.mako:68 rhodecode/templates/password_reset.mako:37
 #: rhodecode/templates/base/base.mako:48
-#: rhodecode/templates/errors/error_document.mako:63
 msgid "Support"
 msgstr ""
 
@@ -4925,58 +5037,62 @@ msgstr ""
 msgid "Email Address"
 msgstr ""
 
-#: rhodecode/templates/password_reset.mako:61
-#: rhodecode/templates/register.mako:85
+#: rhodecode/templates/password_reset.mako:58
+msgid "Password reset link will be sent to matching email address"
+msgstr ""
+
+#: rhodecode/templates/password_reset.mako:62
+#: rhodecode/templates/register.mako:100
 msgid "Captcha"
 msgstr ""
 
-#: rhodecode/templates/password_reset.mako:71
+#: rhodecode/templates/password_reset.mako:73
 msgid "Send password reset email"
 msgstr ""
 
-#: rhodecode/templates/password_reset.mako:72
-msgid "Password reset link will be sent to matching email address"
-msgstr ""
-
 #: rhodecode/templates/register.mako:5
 msgid "Create an Account"
 msgstr ""
 
-#: rhodecode/templates/register.mako:35
+#: rhodecode/templates/register.mako:36
+msgid "Create an account linked with {}"
+msgstr ""
+
+#: rhodecode/templates/register.mako:38
 msgid "Create an account"
 msgstr ""
 
-#: rhodecode/templates/register.mako:36
+#: rhodecode/templates/register.mako:41
 msgid "Go to the login page to sign in with an existing account."
 msgstr ""
 
-#: rhodecode/templates/register.mako:55
+#: rhodecode/templates/register.mako:65
 msgid "Re-enter password"
 msgstr ""
 
-#: rhodecode/templates/register.mako:62
+#: rhodecode/templates/register.mako:77
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:32
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:32
 #: rhodecode/templates/admin/users/user_add.mako:68
 #: rhodecode/templates/admin/users/user_edit_profile.mako:47
-#: rhodecode/templates/admin/users/users.mako:67
+#: rhodecode/templates/admin/users/users.mako:75
 msgid "First Name"
 msgstr ""
 
-#: rhodecode/templates/register.mako:69
+#: rhodecode/templates/register.mako:84
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:40
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:41
 #: rhodecode/templates/admin/users/user_add.mako:77
 #: rhodecode/templates/admin/users/user_edit_profile.mako:56
-#: rhodecode/templates/admin/users/users.mako:69
+#: rhodecode/templates/admin/users/users.mako:77
 msgid "Last Name"
 msgstr ""
 
-#: rhodecode/templates/register.mako:97
+#: rhodecode/templates/register.mako:112
 msgid "Account activation requires admin approval."
 msgstr ""
 
-#: rhodecode/templates/register.mako:104
+#: rhodecode/templates/register.mako:119
 msgid "Create Account"
 msgstr ""
 
@@ -5010,19 +5126,19 @@ msgstr ""
 #: rhodecode/templates/admin/admin_log_base.mako:8
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18
 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:13
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:65
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13
 #: rhodecode/templates/admin/repos/repos.mako:69
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71
-#: rhodecode/templates/admin/user_groups/user_groups.mako:73
+#: rhodecode/templates/admin/user_groups/user_groups.mako:85
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18
 #: rhodecode/templates/admin/users/user_edit_groups.mako:73
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12
-#: rhodecode/templates/admin/users/users.mako:80
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:13
+#: rhodecode/templates/admin/users/users.mako:88
 #: rhodecode/templates/files/files_detail.mako:58
-#: rhodecode/templates/forks/forks.mako:79
+#: rhodecode/templates/forks/forks.mako:71
 msgid "Action"
 msgstr ""
 
@@ -5039,7 +5155,7 @@ msgstr ""
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:92
 #: rhodecode/templates/admin/admin_log_base.mako:10
 #: rhodecode/templates/admin/defaults/defaults.mako:31
-#: rhodecode/templates/admin/permissions/permissions_objects.mako:13
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:16
 #: rhodecode/templates/search/search_commit.mako:5
 #: rhodecode/templates/search/search_path.mako:3
 msgid "Repository"
@@ -5057,19 +5173,20 @@ msgstr ""
 #: rhodecode/templates/admin/admin_audit_logs.mako:14
 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:15
 #: rhodecode/templates/admin/users/user_edit_audit.mako:15
+#: rhodecode/templates/journal/journal.mako:13
 msgid "filter"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:15
-#: rhodecode/templates/admin/repos/repo_edit.mako:92
+#: rhodecode/templates/admin/repos/repo_edit.mako:95
 #: rhodecode/templates/admin/users/user_edit.mako:47
 msgid "Audit logs"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:17
-#: rhodecode/templates/admin/repos/repo_edit_audit.mako:17
-#: rhodecode/templates/admin/users/user_edit_audit.mako:17
-#: rhodecode/templates/journal/journal.mako:18
+#: rhodecode/templates/admin/repos/repo_edit_audit.mako:18
+#: rhodecode/templates/admin/users/user_edit_audit.mako:18
+#: rhodecode/templates/journal/journal.mako:16
 #: rhodecode/templates/search/search.mako:76
 msgid "Example Queries"
 msgstr ""
@@ -5118,18 +5235,18 @@ msgstr ""
 #: rhodecode/templates/admin/auth/plugin_settings.mako:87
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:63
 #: rhodecode/templates/admin/permissions/permissions_application.mako:59
-#: rhodecode/templates/admin/permissions/permissions_objects.mako:56
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:59
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:204
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83
 #: rhodecode/templates/admin/repos/repo_add_base.mako:106
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:186
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:243
 #: rhodecode/templates/admin/settings/settings_hooks.mako:63
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:191
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102
 #: rhodecode/templates/admin/users/user_add.mako:128
 #: rhodecode/templates/admin/users/user_edit_groups.mako:27
@@ -5154,7 +5271,7 @@ msgstr ""
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14
 #: rhodecode/templates/admin/gists/index.mako:110
 #: rhodecode/templates/admin/integrations/list.mako:73
-#: rhodecode/templates/admin/repos/repo_add_base.mako:80
+#: rhodecode/templates/admin/repos/repo_add_base.mako:43
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12
 msgid "Type"
 msgstr ""
@@ -5167,7 +5284,7 @@ msgstr ""
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27
 #: rhodecode/templates/admin/repos/repo_add_base.mako:102
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:192
-#: rhodecode/templates/forks/fork.mako:92
+#: rhodecode/templates/forks/fork.mako:102
 msgid "Private repositories are only visible to people explicitly added as collaborators."
 msgstr ""
 
@@ -5228,12 +5345,12 @@ msgstr ""
 
 #: rhodecode/templates/admin/gists/edit.mako:102
 #: rhodecode/templates/base/issue_tracker_settings.mako:73
-#: rhodecode/templates/changeset/changeset_file_comment.mako:391
+#: rhodecode/templates/changeset/changeset_file_comment.mako:392
 #: rhodecode/templates/codeblocks/diffs.mako:72
 #: rhodecode/templates/files/files_add.mako:108
 #: rhodecode/templates/files/files_delete.mako:69
 #: rhodecode/templates/files/files_edit.mako:108
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:64
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:65
 msgid "Cancel"
 msgstr ""
 
@@ -5258,6 +5375,21 @@ msgstr ""
 msgid "Public Gists"
 msgstr ""
 
+#: rhodecode/templates/admin/gists/index.mako:18
+#: rhodecode/templates/admin/my_account/my_account_repos.mako:7
+#: rhodecode/templates/admin/my_account/my_account_watched.mako:7
+#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11
+#: rhodecode/templates/admin/repo_groups/repo_groups.mako:12
+#: rhodecode/templates/admin/repos/repos.mako:12
+#: rhodecode/templates/admin/user_groups/user_groups.mako:12
+#: rhodecode/templates/admin/users/users.mako:12
+#: rhodecode/templates/bookmarks/bookmarks.mako:12
+#: rhodecode/templates/branches/branches.mako:12
+#: rhodecode/templates/journal/journal.mako:12
+#: rhodecode/templates/tags/tags.mako:12
+msgid "quick filter..."
+msgstr ""
+
 #: rhodecode/templates/admin/gists/index.mako:24
 #, python-format
 msgid "All Gists for user %s"
@@ -5300,7 +5432,7 @@ msgstr ""
 #: rhodecode/templates/changeset/changeset.mako:203
 #: rhodecode/templates/compare/compare_commits.mako:18
 #: rhodecode/templates/files/files_browser_tree.mako:9
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:478
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:481
 #: rhodecode/templates/pullrequests/pullrequests.mako:112
 #: rhodecode/templates/search/search_commit.mako:16
 #: rhodecode/templates/summary/summary_commits.mako:11
@@ -5309,11 +5441,13 @@ msgid "Author"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.mako:116
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:5
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11
 msgid "Created on"
 msgstr ""
 
@@ -5389,9 +5523,9 @@ msgstr ""
 #: rhodecode/templates/admin/integrations/form.mako:17
 #: rhodecode/templates/admin/integrations/list.mako:10
 #: rhodecode/templates/admin/integrations/new.mako:13
-#: rhodecode/templates/admin/permissions/permissions_objects.mako:28
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:31
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:196
 msgid "Repository Groups"
 msgstr ""
 
@@ -5521,7 +5655,7 @@ msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:32
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3
-#: rhodecode/templates/admin/permissions/permissions.mako:48
+#: rhodecode/templates/admin/permissions/permissions.mako:51
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4
 #: rhodecode/templates/admin/users/user_edit.mako:40
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3
@@ -5608,13 +5742,13 @@ msgid "Repository scope works only with 
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:69
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:63
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82
 #: rhodecode/templates/admin/users/user_edit_emails.mako:62
 #: rhodecode/templates/admin/users/user_edit_ips.mako:70
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:64
 msgid "Add"
 msgstr ""
 
@@ -5646,15 +5780,27 @@ msgstr ""
 msgid "No additional emails specified"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_notifications.mako:21
+#: rhodecode/templates/admin/my_account/my_account_emails.mako:51
+#: rhodecode/templates/admin/my_account/my_account_password.mako:6
+#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:17
+msgid "Your user account details are managed by an external source. Details cannot be managed here."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.mako:52
+#: rhodecode/templates/admin/my_account/my_account_password.mako:7
+#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:18
+msgid "Source type"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_notifications.mako:22
 msgid "Your Live Notification Settings"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_notifications.mako:33
+#: rhodecode/templates/admin/my_account/my_account_notifications.mako:34
 msgid "Notifications Status"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_notifications.mako:46
+#: rhodecode/templates/admin/my_account/my_account_notifications.mako:47
 msgid "Test Notifications"
 msgstr ""
 
@@ -5662,16 +5808,6 @@ msgstr ""
 msgid "Change Your Account Password"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_password.mako:6
-#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:17
-msgid "Your user account details are managed by an external source. Details cannot be managed here."
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_password.mako:7
-#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:18
-msgid "Source type"
-msgstr ""
-
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:4
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4
 msgid "My Profile"
@@ -5717,7 +5853,7 @@ msgstr ""
 #: rhodecode/templates/admin/settings/settings_global.mako:9
 #: rhodecode/templates/email_templates/pull_request_review.mako:39
 #: rhodecode/templates/email_templates/pull_request_review.mako:72
-#: rhodecode/templates/pullrequests/pullrequest.mako:45
+#: rhodecode/templates/pullrequests/pullrequest.mako:46
 #: rhodecode/templates/pullrequests/pullrequests.mako:114
 msgid "Title"
 msgstr ""
@@ -5737,44 +5873,44 @@ msgstr ""
 msgid "Fingerprint"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11
-#: rhodecode/templates/data_table/_dt_elements.mako:183
-msgid "Created"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12
+#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12
+msgid "Accessed on"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:16
 msgid "SSH Keys usage is currently disabled, please ask your administrator to enable them."
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:32
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:29
 #, python-format
 msgid "Confirm to remove ssh key %s"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:40
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:37
 msgid "No additional ssh keys specified"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:54
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:49
 msgid "New ssh key"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:58
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:53
 msgid "Generate random RSA key"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:64
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:59
 msgid "Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71
-#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66
+#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:73
+#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:68
 msgid "Click add to use this generate SSH key"
 msgstr ""
 
@@ -5782,11 +5918,11 @@ msgstr ""
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51
-#: rhodecode/templates/admin/user_groups/user_groups.mako:69
+#: rhodecode/templates/admin/user_groups/user_groups.mako:81
 #: rhodecode/templates/admin/users/user_add.mako:97
 #: rhodecode/templates/admin/users/user_edit_groups.mako:64
 #: rhodecode/templates/admin/users/user_edit_profile.mako:90
-#: rhodecode/templates/admin/users/users.mako:74
+#: rhodecode/templates/admin/users/users.mako:82
 #: rhodecode/templates/user_group/profile.mako:33
 msgid "Active"
 msgstr ""
@@ -5852,15 +5988,15 @@ msgstr ""
 msgid "Object"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.mako:42
+#: rhodecode/templates/admin/permissions/permissions.mako:45
 msgid "IP Whitelist"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.mako:45
+#: rhodecode/templates/admin/permissions/permissions.mako:48
 msgid "AuthToken Access"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.mako:51
+#: rhodecode/templates/admin/permissions/permissions.mako:54
 msgid "Overview"
 msgstr ""
 
@@ -5905,6 +6041,19 @@ msgstr ""
 msgid "List of views available for usage in whitelist access"
 msgstr ""
 
+#: rhodecode/templates/admin/permissions/permissions_branch.mako:3
+msgid "Default Permissions for Branches."
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_branch.mako:6
+#: rhodecode/templates/admin/repos/repo_edit_automation.mako:6
+#: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:6
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:62
+#: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6
+#: rhodecode/templates/admin/settings/settings_automation.mako:6
+msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license."
+msgstr ""
+
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:5
 msgid "Default IP Whitelist For All Users"
 msgstr ""
@@ -5946,31 +6095,35 @@ msgstr ""
 msgid "Default Permissions for Repositories, User Groups and Repository Groups."
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions_objects.mako:6
-msgid "Default system permissions. Each permissions management entity will be created with the following default settings. Check the overwrite checkbox to force any permission changes on already existing settings."
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions_objects.mako:20
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:7
+msgid "Default access permissions. This defines permissions for the `default` user from which other users inherit permissions."
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:9
+msgid "Check the overwrite checkbox to force change all previously defined permissions for `default` user to the new selected value."
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:23
 msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions_objects.mako:21
-#: rhodecode/templates/admin/permissions/permissions_objects.mako:35
-#: rhodecode/templates/admin/permissions/permissions_objects.mako:49
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:24
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:38
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:52
 msgid "Overwrite Existing Settings"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions_objects.mako:34
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:37
 msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions_objects.mako:42
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:45
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:14
 msgid "User Groups"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions_objects.mako:48
-msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on repository groups will be lost"
+#: rhodecode/templates/admin/permissions/permissions_objects.mako:51
+msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_perms.mako:1
@@ -5981,10 +6134,6 @@ msgstr ""
 msgid "Update SSH keys file"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53
-msgid "Accessed on"
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5
 msgid "Add repository group"
 msgstr ""
@@ -6011,7 +6160,7 @@ msgid "Group Parent"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69
-#: rhodecode/templates/admin/repos/repo_add_base.mako:71
+#: rhodecode/templates/admin/repos/repo_add_base.mako:89
 msgid "Copy Parent Group Permissions"
 msgstr ""
 
@@ -6029,7 +6178,7 @@ msgid "Add Child Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50
-#: rhodecode/templates/admin/repos/repo_edit.mako:52
+#: rhodecode/templates/admin/repos/repo_edit.mako:55
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35
 #: rhodecode/templates/admin/users/user_edit.mako:41
 msgid "Advanced"
@@ -6079,54 +6228,64 @@ msgstr ""
 msgid "User/User Group"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:32
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:31
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:33
 msgid "super admin"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:35
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:34
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:36
 msgid "owner"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76
-msgid "permission for all other users"
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:64
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98
-msgid "Revoke"
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80
-msgid "delegated admin"
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:86
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:66
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:109
+msgid "permission for all other users"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:68
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:111
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:90
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:70
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:113
+msgid "inactive duplicate"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:77
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:155
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117
-#: rhodecode/templates/base/issue_tracker_settings.mako:83
-msgid "Add new"
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:150
+#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:79
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:157
+msgid "Remove"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:114
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:116
+msgid "delegated admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:182
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:177
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:183
+msgid "Add user/user group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:192
 msgid "Apply to children"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:198
 msgid "Both"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:199
 msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen."
 msgstr ""
 
@@ -6180,43 +6339,43 @@ msgstr ""
 msgid "Clone from"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.mako:48
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:177
-#: rhodecode/templates/forks/fork.mako:53
-msgid "Plain text format with support of {metatags}. Add a README file for longer descriptions"
+#: rhodecode/templates/admin/repos/repo_add_base.mako:47
+msgid "Set the type of repository to create."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:57
-msgid "Repository Group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.mako:63
-#: rhodecode/templates/forks/fork.mako:69
-#, python-format
-msgid "Select my personal group (%(repo_group_name)s)"
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:177
+#: rhodecode/templates/forks/fork.mako:53
+msgid "Plain text format with support of {metatags}. Add a README file for longer descriptions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:66
-#: rhodecode/templates/forks/fork.mako:72
-msgid "Optionally select a group to put this repository into."
+msgid "Repository Group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.mako:72
+#: rhodecode/templates/forks/fork.mako:69
+#, python-format
+msgid "Select my personal group (%(repo_group_name)s)"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:75
-msgid "Copy permission set from the parent repository group."
+#: rhodecode/templates/forks/fork.mako:72
+msgid "Optionally select a group to put this repository into."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.mako:80
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:141
+#: rhodecode/templates/forks/fork.mako:78
+msgid "Landing commit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:84
-msgid "Set the type of repository to create."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.mako:89
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:141
-#: rhodecode/templates/forks/fork.mako:78
-msgid "Landing commit"
+msgid "The default commit for file pages, downloads, full text search index, and README generation."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:93
-msgid "The default commit for file pages, downloads, full text search index, and README generation."
+msgid "Copy permission set from the parent repository group."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.mako:5
@@ -6237,33 +6396,39 @@ msgstr ""
 msgid "%s repository settings"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:58
+#: rhodecode/templates/admin/repos/repo_edit.mako:52
+msgid "Branch Permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.mako:61
 msgid "Extra Fields"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:64
+#: rhodecode/templates/admin/repos/repo_edit.mako:67
+#: rhodecode/templates/admin/users/user_edit.mako:48
+#: rhodecode/templates/admin/users/user_edit_caches.mako:5
 msgid "Caches"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:68
+#: rhodecode/templates/admin/repos/repo_edit.mako:71
 msgid "Remote sync"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:72
+#: rhodecode/templates/admin/repos/repo_edit.mako:75
 #: rhodecode/templates/summary/components.mako:149
 msgid "Statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:79
+#: rhodecode/templates/admin/repos/repo_edit.mako:82
 msgid "Reviewer Rules"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:86
-#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3
-msgid "Maintenance"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.mako:89
+#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3
+msgid "Maintenance"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.mako:92
 msgid "Strip"
 msgstr ""
 
@@ -6392,13 +6557,6 @@ msgstr ""
 msgid "Repo Automation"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_automation.mako:6
-#: rhodecode/templates/admin/repos/repo_edit_remote.mako:62
-#: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6
-#: rhodecode/templates/admin/settings/settings_automation.mako:6
-msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license."
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3
 msgid "Invalidate Cache for Repository"
 msgstr ""
@@ -6420,29 +6578,44 @@ msgid "Confirm to invalidate repository 
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:39
-#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32
-#: rhodecode/templates/base/issue_tracker_settings.mako:13
-msgid "Prefix"
+#: rhodecode/templates/admin/repos/repo_edit_fields.mako:11
+msgid "Key"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:40
-#: rhodecode/templates/admin/repos/repo_edit_fields.mako:11
-msgid "Key"
+msgid "Namespace"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:58
+msgid "Cache keys"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:74
+#: rhodecode/templates/admin/users/user_edit_caches.mako:19
+msgid "Show all"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:92
+msgid "Shadow Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:104
+msgid "No Shadow repositories exist for this repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:115
 msgid "Diff Caches"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:63
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:120
 msgid "Cached diff name"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:67
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:124
 msgid "Cached diff files"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:71
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:128
 msgid "Cached diff size"
 msgstr ""
 
@@ -6498,6 +6671,7 @@ msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:30
 #: rhodecode/templates/base/issue_tracker_settings.mako:11
+#: rhodecode/templates/base/perms_summary.mako:169
 msgid "Pattern"
 msgstr ""
 
@@ -6506,6 +6680,11 @@ msgstr ""
 msgid "Url"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32
+#: rhodecode/templates/base/issue_tracker_settings.mako:13
+msgid "Prefix"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:70
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:5
 msgid "Issue Tracker / Wiki Patterns"
@@ -6544,14 +6723,26 @@ msgstr ""
 msgid "Repository Permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:42
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:55
 msgid "private repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:47
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60
 msgid "only users/user groups explicitly added here will have access"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:94
+msgid "used by {} branch rule, requires write+ permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:96
+msgid "used by {} branch rules, requires write+ permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:3
+msgid "Repository Branch Permissions."
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:3
 msgid "Remote Sync"
 msgstr ""
@@ -6642,9 +6833,10 @@ msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:60
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102
-#: rhodecode/templates/base/perms_summary.mako:92
-#: rhodecode/templates/base/perms_summary.mako:210
-#: rhodecode/templates/base/perms_summary.mako:212
+#: rhodecode/templates/base/perms_summary.mako:111
+#: rhodecode/templates/base/perms_summary.mako:228
+#: rhodecode/templates/base/perms_summary.mako:306
+#: rhodecode/templates/base/perms_summary.mako:308
 #: rhodecode/templates/debug_style/form-elements.html:45
 msgid "edit"
 msgstr ""
@@ -6769,10 +6961,6 @@ msgstr ""
 msgid "Sorry this functionality is not available for SVN repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46
-msgid "Remove"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:114
 msgid "Checking commits"
 msgstr ""
@@ -6873,18 +7061,74 @@ msgstr ""
 msgid "SMTP auth"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_email.mako:34
+#: rhodecode/templates/admin/settings/settings_email.mako:30
+msgid "You can adjust those settings in [DEFAULT] section of .ini file located at"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.mako:38
 msgid "Test Email"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_email.mako:40
-msgid "enter valid email"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings_email.mako:44
+msgid "enter valid email"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.mako:48
 msgid "Send an auto-generated email from this server to above email..."
 msgstr ""
 
+#: rhodecode/templates/admin/settings/settings_exceptions.mako:3
+msgid "Exceptions Tracker - Exception ID"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions.mako:8
+msgid "Exception `{}` generated on UTC date: {}"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions.mako:12
+msgid "Unable to Read Exception. It might be removed or non-existing."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions.mako:21
+msgid "Delete this Exception"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions.mako:29
+msgid "Confirm to delete this exception"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions.mako:31
+msgid "Delete This Exception"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:3
+msgid "Exceptions Tracker "
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:7
+msgid "There is {} stored exception."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:9
+msgid "There are {} stored exceptions."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:11
+msgid "Store directory"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:18
+msgid "Confirm to delete all exceptions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:20
+msgid "Delete All"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:32
+msgid "Exceptions Tracker - Showing the last {} Exceptions"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings_global.mako:5
 msgid "Branding"
 msgstr ""
@@ -6935,19 +7179,19 @@ msgid "Registration Captcha"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:68
-msgid "Google ReCaptcha public key"
+msgid "Google reCaptcha v2 site key."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:75
-msgid "Public key for reCaptcha system."
+msgid "Site key for reCaptcha v2 system."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:80
-msgid "Google ReCaptcha private key"
+msgid "Google reCaptcha v2 secret key."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:87
-msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration"
+msgid "Secret key for reCaptcha v2 system. Setting this value will enable captcha on registration and password reset forms."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:95
@@ -7352,7 +7596,7 @@ msgid "Permissions summary"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8
-#: rhodecode/templates/admin/user_groups/user_groups.mako:65
+#: rhodecode/templates/admin/user_groups/user_groups.mako:77
 #: rhodecode/templates/debug_style/form-elements.html:509
 #: rhodecode/templates/user_group/profile.mako:42
 msgid "Members"
@@ -7426,11 +7670,6 @@ msgstr ""
 msgid "User Group Permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:62
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:109
-msgid "revoke"
-msgstr ""
-
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:36
 msgid "Change owner of this user group."
 msgstr ""
@@ -7449,11 +7688,7 @@ msgstr ""
 msgid "User groups administration"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_groups.mako:13
-msgid "user groups"
-msgstr ""
-
-#: rhodecode/templates/admin/user_groups/user_groups.mako:67
+#: rhodecode/templates/admin/user_groups/user_groups.mako:79
 msgid "Sync"
 msgstr ""
 
@@ -7543,8 +7778,8 @@ msgid "Last login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:9
-#: rhodecode/templates/admin/users/users.mako:72
-#: rhodecode/templates/forks/forks.mako:77
+#: rhodecode/templates/admin/users/users.mako:80
+#: rhodecode/templates/forks/forks.mako:69
 msgid "Last activity"
 msgstr ""
 
@@ -7634,6 +7869,14 @@ msgstr ""
 msgid "User Audit Logs"
 msgstr ""
 
+#: rhodecode/templates/admin/users/user_edit_caches.mako:33
+msgid "Invalidate user cache"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_caches.mako:33
+msgid "Confirm to invalidate user cache"
+msgstr ""
+
 #: rhodecode/templates/admin/users/user_edit_emails.mako:5
 msgid "Additional Email Addresses"
 msgstr ""
@@ -7739,7 +7982,7 @@ msgstr ""
 msgid "Users administration"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.mako:78
+#: rhodecode/templates/admin/users/users.mako:86
 msgid "Auth type"
 msgstr ""
 
@@ -7818,7 +8061,7 @@ msgid "Compare fork with %s"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:269
-#: rhodecode/templates/base/base.mako:415
+#: rhodecode/templates/base/base.mako:446
 #: rhodecode/templates/search/search.mako:64
 msgid "Search"
 msgstr ""
@@ -7871,46 +8114,49 @@ msgstr ""
 msgid "Sign Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:397
+#: rhodecode/templates/base/base.mako:403
+msgid "search / go to..."
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:428
 msgid "Show activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:398
+#: rhodecode/templates/base/base.mako:429
 #: rhodecode/templates/journal/journal.mako:4
-#: rhodecode/templates/journal/journal.mako:15
+#: rhodecode/templates/journal/journal.mako:14
 msgid "Journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:403
+#: rhodecode/templates/base/base.mako:434
 msgid "Show Public activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:404
+#: rhodecode/templates/base/base.mako:435
 msgid "Public journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:409
+#: rhodecode/templates/base/base.mako:440
 msgid "Show Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:410
+#: rhodecode/templates/base/base.mako:441
 msgid "Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:414
+#: rhodecode/templates/base/base.mako:445
 msgid "Search in repositories you have access to"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:420
+#: rhodecode/templates/base/base.mako:451
 msgid "Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:427
+#: rhodecode/templates/base/base.mako:458
 msgid "Delegated Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:437
-#: rhodecode/templates/base/base.mako:438
+#: rhodecode/templates/base/base.mako:471
 #: rhodecode/templates/debug_style/alerts.html:5
 #: rhodecode/templates/debug_style/buttons.html:5
 #: rhodecode/templates/debug_style/code-block.html:6
@@ -7932,15 +8178,15 @@ msgstr ""
 msgid "Style"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:495
-msgid "Go to"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:548
+#: rhodecode/templates/base/base.mako:472
+msgid "[Style]"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:619
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:556
+#: rhodecode/templates/base/base.mako:627
 msgid "Site-wide shortcuts"
 msgstr ""
 
@@ -8023,6 +8269,10 @@ msgstr ""
 msgid "Read more"
 msgstr ""
 
+#: rhodecode/templates/base/issue_tracker_settings.mako:83
+msgid "Add new"
+msgstr ""
+
 #: rhodecode/templates/base/issue_tracker_settings.mako:91
 msgid "New Entry"
 msgstr ""
@@ -8032,8 +8282,9 @@ msgid "Confirm to remove this pattern:"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:191
-#: rhodecode/templates/changeset/changeset_file_comment.mako:275
-#: rhodecode/templates/changeset/changeset_file_comment.mako:325
+#: rhodecode/templates/changeset/changeset_file_comment.mako:276
+#: rhodecode/templates/changeset/changeset_file_comment.mako:326
+#: rhodecode/templates/data_table/_dt_elements.mako:389
 #: rhodecode/templates/files/files_add.mako:84
 #: rhodecode/templates/files/files_add.mako:230
 #: rhodecode/templates/files/files_edit.mako:85
@@ -8045,94 +8296,116 @@ msgstr ""
 msgid "Test Pattern Preview"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:14
+#: rhodecode/templates/base/perms_summary.mako:26
 msgid "in JSON format"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:23
+#: rhodecode/templates/base/perms_summary.mako:35
+#: rhodecode/templates/base/perms_summary.mako:43
 msgid "show"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:24
+#: rhodecode/templates/base/perms_summary.mako:36
+#: rhodecode/templates/base/perms_summary.mako:44
 msgid "none"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:25
+#: rhodecode/templates/base/perms_summary.mako:37
+#: rhodecode/templates/changelog/changelog_elements.mako:107
+#: rhodecode/templates/changeset/changeset.mako:109
+#: rhodecode/templates/files/base.mako:4
+msgid "merge"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.mako:38
+msgid "push"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.mako:39
+msgid "push force"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.mako:45
 msgid "read"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:26
+#: rhodecode/templates/base/perms_summary.mako:46
 msgid "write"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:27
+#: rhodecode/templates/base/perms_summary.mako:47
 msgid "admin"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:34
+#: rhodecode/templates/base/perms_summary.mako:55
 msgid "No permissions defined"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:42
-#: rhodecode/templates/base/perms_summary.mako:150
+#: rhodecode/templates/base/perms_summary.mako:63
+#: rhodecode/templates/base/perms_summary.mako:170
+#: rhodecode/templates/base/perms_summary.mako:243
 msgid "Permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:44
-#: rhodecode/templates/base/perms_summary.mako:152
+#: rhodecode/templates/base/perms_summary.mako:65
+#: rhodecode/templates/base/perms_summary.mako:245
 msgid "Edit Permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:100
-#: rhodecode/templates/base/perms_summary.mako:109
+#: rhodecode/templates/base/perms_summary.mako:119
+#: rhodecode/templates/base/perms_summary.mako:128
 msgid "edit global"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:117
+#: rhodecode/templates/base/perms_summary.mako:136
 msgid "Repository default permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:120
+#: rhodecode/templates/base/perms_summary.mako:139
 msgid "Repository group default permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:123
+#: rhodecode/templates/base/perms_summary.mako:142
 msgid "User group default permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:126
+#: rhodecode/templates/base/perms_summary.mako:145
 msgid "Super admin"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:129
+#: rhodecode/templates/base/perms_summary.mako:148
 msgid "Inherit permissions"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:132
+#: rhodecode/templates/base/perms_summary.mako:151
 msgid "Create repositories"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:135
+#: rhodecode/templates/base/perms_summary.mako:154
 msgid "Fork repositories"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:138
+#: rhodecode/templates/base/perms_summary.mako:157
 msgid "Create repository groups"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:141
+#: rhodecode/templates/base/perms_summary.mako:160
 msgid "Create user groups"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:190
+#: rhodecode/templates/base/perms_summary.mako:172
+msgid "Edit Branch Permission"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.mako:286
 msgid "overridden by"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:223
-msgid "No permission defined"
-msgstr ""
-
-#: rhodecode/templates/base/root.mako:165
+#: rhodecode/templates/base/perms_summary.mako:321
+msgid "No matching permission defined"
+msgstr ""
+
+#: rhodecode/templates/base/root.mako:142
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
@@ -8500,17 +8773,11 @@ msgstr ""
 
 #: rhodecode/templates/changelog/changelog_elements.mako:83
 #: rhodecode/templates/compare/compare_commits.mako:50
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:516
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:519
 #: rhodecode/templates/search/search_commit.mako:36
 msgid "Expand commit message"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_elements.mako:107
-#: rhodecode/templates/changeset/changeset.mako:109
-#: rhodecode/templates/files/base.mako:4
-msgid "merge"
-msgstr ""
-
 #: rhodecode/templates/changelog/changelog_elements.mako:129
 #: rhodecode/templates/changeset/changeset.mako:122
 #: rhodecode/templates/files/base.mako:17
@@ -8538,7 +8805,7 @@ msgid "Parent Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:65
-msgid "Parent"
+msgid "parent"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:69
@@ -8546,7 +8813,7 @@ msgid "Child Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:69
-msgid "Child"
+msgid "child"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:81
@@ -8555,7 +8822,7 @@ msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:89
 #: rhodecode/templates/changeset/changeset.mako:95
-#: rhodecode/templates/changeset/changeset_file_comment.mako:82
+#: rhodecode/templates/changeset/changeset_file_comment.mako:83
 #: rhodecode/templates/compare/compare_diff.mako:159
 msgid "Commit status"
 msgstr ""
@@ -8571,8 +8838,8 @@ msgid "Diff options"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:142
-#: rhodecode/templates/codeblocks/diffs.mako:455
-#: rhodecode/templates/codeblocks/diffs.mako:458
+#: rhodecode/templates/codeblocks/diffs.mako:460
+#: rhodecode/templates/codeblocks/diffs.mako:463
 msgid "Raw diff"
 msgstr ""
 
@@ -8589,8 +8856,8 @@ msgid "Patch Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:150
-#: rhodecode/templates/codeblocks/diffs.mako:462
-#: rhodecode/templates/codeblocks/diffs.mako:465
+#: rhodecode/templates/codeblocks/diffs.mako:467
+#: rhodecode/templates/codeblocks/diffs.mako:470
 msgid "Download diff"
 msgstr ""
 
@@ -8614,102 +8881,99 @@ msgstr ""
 msgid "No Parent Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:33
+#: rhodecode/templates/changeset/changeset_file_comment.mako:34
 msgid "Resolved by comment #{}"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:40
+#: rhodecode/templates/changeset/changeset_file_comment.mako:41
 msgid "Click to resolve this comment"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:67
-#: rhodecode/templates/changeset/changeset_file_comment.mako:69
+#: rhodecode/templates/changeset/changeset_file_comment.mako:68
+#: rhodecode/templates/changeset/changeset_file_comment.mako:70
 #, python-format
 msgid "pull request #%s"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:74
+#: rhodecode/templates/changeset/changeset_file_comment.mako:75
 msgid "Status change on commit"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:89
+#: rhodecode/templates/changeset/changeset_file_comment.mako:90
 msgid "resolves comment #{}"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:97
-msgid "Pull request author"
-msgstr ""
-
 #: rhodecode/templates/changeset/changeset_file_comment.mako:98
+msgid "Pull request author"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:99
 msgid "author"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:106
-msgid "Outdated comment from pull request version {0}"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:110
-#: rhodecode/templates/changeset/changeset_file_comment.mako:125
-msgid "Comment from pull request version {0}"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:122
-msgid "Outdated comment from pull request version {}"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:152
-#: rhodecode/templates/changeset/changeset_file_comment.mako:155
-msgid "Prev"
+#: rhodecode/templates/changeset/changeset_file_comment.mako:107
+#: rhodecode/templates/changeset/changeset_file_comment.mako:123
+msgid "Outdated comment from pull request version v{0}, latest v{1}"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:111
+#: rhodecode/templates/changeset/changeset_file_comment.mako:126
+msgid "Comment from pull request version v{0}, latest v{1}"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:153
 #: rhodecode/templates/changeset/changeset_file_comment.mako:156
+msgid "Prev"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:154
+#: rhodecode/templates/changeset/changeset_file_comment.mako:157
 msgid "Next"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:191
+#: rhodecode/templates/changeset/changeset_file_comment.mako:192
 msgid "Leave a comment on this Pull Request."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:193
+#: rhodecode/templates/changeset/changeset_file_comment.mako:194
 msgid "Leave a comment on {} commits in this range."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:195
+#: rhodecode/templates/changeset/changeset_file_comment.mako:196
 msgid "Leave a comment on this Commit."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:283
-#: rhodecode/templates/codeblocks/diffs.mako:67
-msgid "You need to be logged in to leave comments."
-msgstr ""
-
 #: rhodecode/templates/changeset/changeset_file_comment.mako:284
 #: rhodecode/templates/codeblocks/diffs.mako:67
+msgid "You need to be logged in to leave comments."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:285
+#: rhodecode/templates/codeblocks/diffs.mako:67
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:349
+#: rhodecode/templates/changeset/changeset_file_comment.mako:350
 #, python-format
 msgid "Comments parsed using %s syntax with %s, and %s actions support."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:351
-msgid "Use @username inside this text to send notification to this RhodeCode user"
-msgstr ""
-
 #: rhodecode/templates/changeset/changeset_file_comment.mako:352
+msgid "Use @username inside this text to send notification to this RhodeCode user"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:353
 msgid "Start typing with / for certain actions to be triggered via text box."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:369
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:15
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:159
+#: rhodecode/templates/changeset/changeset_file_comment.mako:370
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:16
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:160
 #: rhodecode/templates/pullrequests/pullrequests.mako:52
 msgid "Closed"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:399
+#: rhodecode/templates/changeset/changeset_file_comment.mako:400
 #: rhodecode/templates/compare/compare_diff.mako:104
 #: rhodecode/templates/compare/compare_diff.mako:112
 #: rhodecode/templates/compare/compare_diff.mako:120
@@ -8809,82 +9073,82 @@ msgstr ""
 msgid "Hide them"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:294
-msgid "File was deleted in this version, and outdated comments were made on it"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:360
+#: rhodecode/templates/codeblocks/diffs.mako:299
+msgid "File was deleted in this version. There are still outdated/unresolved comments attached to it."
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:365
 #: rhodecode/templates/files/files_source.mako:19
 msgid "Copy the full path"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:425
-#: rhodecode/templates/codeblocks/diffs.mako:441
+#: rhodecode/templates/codeblocks/diffs.mako:430
+#: rhodecode/templates/codeblocks/diffs.mako:446
 #, python-format
 msgid "Show file at commit: %(commit_id)s"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:427
-#: rhodecode/templates/codeblocks/diffs.mako:434
-msgid "Show file before"
-msgstr ""
-
 #: rhodecode/templates/codeblocks/diffs.mako:432
-#: rhodecode/templates/codeblocks/diffs.mako:448
+#: rhodecode/templates/codeblocks/diffs.mako:439
+msgid "Show file before"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:437
+#: rhodecode/templates/codeblocks/diffs.mako:453
 #, python-format
 msgid "File no longer present at commit: %(commit_id)s"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:443
-#: rhodecode/templates/codeblocks/diffs.mako:450
+#: rhodecode/templates/codeblocks/diffs.mako:448
+#: rhodecode/templates/codeblocks/diffs.mako:455
 msgid "Show file after"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:481
+#: rhodecode/templates/codeblocks/diffs.mako:486
 msgid "Show comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:481
+#: rhodecode/templates/codeblocks/diffs.mako:486
 msgid "Hide comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:547
-#: rhodecode/templates/codeblocks/diffs.mako:590
-#: rhodecode/templates/codeblocks/diffs.mako:645
+#: rhodecode/templates/codeblocks/diffs.mako:552
+#: rhodecode/templates/codeblocks/diffs.mako:595
+#: rhodecode/templates/codeblocks/diffs.mako:650
 msgid "comments including outdated"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:549
-#: rhodecode/templates/codeblocks/diffs.mako:592
-#: rhodecode/templates/codeblocks/diffs.mako:647
+#: rhodecode/templates/codeblocks/diffs.mako:554
+#: rhodecode/templates/codeblocks/diffs.mako:597
+#: rhodecode/templates/codeblocks/diffs.mako:652
 msgid "comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:701
+#: rhodecode/templates/codeblocks/diffs.mako:706
 msgid "View side by side"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:703
-msgid "Side by Side"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:707
-msgid "View unified"
-msgstr ""
-
 #: rhodecode/templates/codeblocks/diffs.mako:708
+msgid "Side by Side"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:712
+msgid "View unified"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:713
 msgid "Unified"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:718
+#: rhodecode/templates/codeblocks/diffs.mako:723
 msgid "Expand All Files"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:722
+#: rhodecode/templates/codeblocks/diffs.mako:727
 msgid "Collapse All Files"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:726
+#: rhodecode/templates/codeblocks/diffs.mako:731
 msgid "Wide Mode Diff"
 msgstr ""
 
@@ -8901,7 +9165,7 @@ msgid "Compare was calculated based on t
 msgstr ""
 
 #: rhodecode/templates/compare/compare_commits.mako:17
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:477
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:480
 msgid "Time"
 msgstr ""
 
@@ -8928,7 +9192,7 @@ msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:60
 #: rhodecode/templates/email_templates/pull_request_review.mako:74
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:107
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:108
 msgid "Target"
 msgstr ""
 
@@ -8936,7 +9200,7 @@ msgstr ""
 #: rhodecode/templates/email_templates/pull_request_comment.mako:90
 #: rhodecode/templates/email_templates/pull_request_review.mako:73
 #: rhodecode/templates/files/files_source.mako:29
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:71
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:72
 msgid "Source"
 msgstr ""
 
@@ -9003,6 +9267,10 @@ msgstr ""
 msgid "Creating"
 msgstr ""
 
+#: rhodecode/templates/data_table/_dt_elements.mako:183
+msgid "Created"
+msgstr ""
+
 #: rhodecode/templates/data_table/_dt_elements.mako:225
 msgid "personal"
 msgstr ""
@@ -9019,15 +9287,20 @@ msgid "User group"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:332
-#: rhodecode/templates/forks/fork.mako:88
+#: rhodecode/templates/forks/fork.mako:98
 msgid "Private"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.mako:366
+#: rhodecode/templates/data_table/_dt_elements.mako:365
 #, python-format
 msgid "Pull request #%(pr_number)s"
 msgstr ""
 
+#: rhodecode/templates/data_table/_dt_elements.mako:406
+#, python-format
+msgid "Parsed using %s syntax"
+msgstr ""
+
 #: rhodecode/templates/debug_style/buttons.html:131
 msgid "Confirm to remove this field: Field"
 msgstr ""
@@ -9266,7 +9539,7 @@ msgid "%(user)s left %(comment_type)s on
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:49
-#: rhodecode/templates/pullrequests/pullrequest.mako:72
+#: rhodecode/templates/pullrequests/pullrequest.mako:73
 msgid "Source repository"
 msgstr ""
 
@@ -9349,6 +9622,10 @@ msgstr ""
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 
+#: rhodecode/templates/errors/error_document.mako:63
+msgid "Support Page"
+msgstr ""
+
 #: rhodecode/templates/feed/atom_feed_entry.mako:3
 #, python-format
 msgid "%(user)s commited on %(date)s UTC"
@@ -9634,7 +9911,7 @@ msgid "New Fork"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:37
-#: rhodecode/templates/forks/forks.mako:70
+#: rhodecode/templates/forks/forks.mako:62
 msgid "Fork name"
 msgstr ""
 
@@ -9642,11 +9919,11 @@ msgstr ""
 msgid "Default commit for files page, downloads, whoosh and readme"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.mako:98
+#: rhodecode/templates/forks/fork.mako:88
 msgid "Copy permissions"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.mako:102
+#: rhodecode/templates/forks/fork.mako:92
 msgid "Copy permissions from forked repository"
 msgstr ""
 
@@ -9667,19 +9944,15 @@ msgstr ""
 msgid "Create new fork"
 msgstr ""
 
-#: rhodecode/templates/forks/forks.mako:74
+#: rhodecode/templates/forks/forks.mako:66
 msgid "Forked"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.mako:14
-msgid "Filter"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.mako:24
-msgid "ATOM journal feed"
-msgstr ""
-
 #: rhodecode/templates/journal/journal.mako:25
+msgid "ATOM journal feed"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.mako:26
 msgid "RSS journal feed"
 msgstr ""
 
@@ -9700,74 +9973,70 @@ msgstr ""
 msgid "RSS public journal feed"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:4
-#: rhodecode/templates/pullrequests/pullrequest.mako:8
+#: rhodecode/templates/pullrequests/pullrequest.mako:5
+#: rhodecode/templates/pullrequests/pullrequest.mako:9
 msgid "New pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:35
+#: rhodecode/templates/pullrequests/pullrequest.mako:36
 msgid "Pull request summary"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:58
-msgid "Write a short description on this pull request"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.mako:64
+#: rhodecode/templates/pullrequests/pullrequest.mako:65
 msgid "Commit flow"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:90
+#: rhodecode/templates/pullrequests/pullrequest.mako:91
 msgid "Loading refs..."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:101
+#: rhodecode/templates/pullrequests/pullrequest.mako:102
 msgid "Submit Pull Request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:115
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:315
+#: rhodecode/templates/pullrequests/pullrequest.mako:116
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:317
 msgid "Author of this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:129
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:329
+#: rhodecode/templates/pullrequests/pullrequest.mako:130
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:331
 msgid "Reviewer rules"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:139
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:343
+#: rhodecode/templates/pullrequests/pullrequest.mako:140
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:345
 msgid "Pull request reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:150
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:386
+#: rhodecode/templates/pullrequests/pullrequest.mako:151
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:388
 msgid "Add reviewer or reviewer group"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:305
-#: rhodecode/templates/pullrequests/pullrequest.mako:513
+#: rhodecode/templates/pullrequests/pullrequest.mako:307
+#: rhodecode/templates/pullrequests/pullrequest.mako:524
 msgid "Please select source and target"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:311
+#: rhodecode/templates/pullrequests/pullrequest.mako:313
 msgid "Loading compare ..."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:367
+#: rhodecode/templates/pullrequests/pullrequest.mako:372
 msgid "Show detailed compare."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:374
+#: rhodecode/templates/pullrequests/pullrequest.mako:379
 msgid "There are no commits to merge."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:424
-#: rhodecode/templates/pullrequests/pullrequest.mako:450
+#: rhodecode/templates/pullrequests/pullrequest.mako:429
+#: rhodecode/templates/pullrequests/pullrequest.mako:455
 msgid "Select commit reference"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:440
+#: rhodecode/templates/pullrequests/pullrequest.mako:445
 msgid "Target repository"
 msgstr ""
 
@@ -9802,179 +10071,187 @@ msgstr ""
 msgid "Close with status {}"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:5
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:6
 #, python-format
 msgid "%s Pull Request #%s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:51
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:52
 msgid "From"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:57
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:58
 msgid "Confirm to delete this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:88
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:89
 msgid "Common ancestor"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:100
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:101
 msgid "Copy the pull url"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:129
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:130
 msgid "Merge"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:140
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:141
 #: rhodecode/templates/summary/components.mako:66
 msgid "Copy the clone url"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:144
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:145
 msgid "Shadow repository data not available"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:152
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:153
 msgid "Review"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:181
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:169
+msgid "Rendered using {} renderer"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:183
 msgid "Versions"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:193
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:195
 msgid "Hide all versions of this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:218
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:220
 msgid "Your review status at this version"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:224
-msgid "Comment from pull request version {0}, general:{1} inline:{2}"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:241
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:245
-msgid "select versions to show changes"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:242
-msgid "show changes between versions"
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:226
+msgid "Comment from pull request version v{0}, general:{1} inline:{2}"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:243
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:247
+msgid "select versions to show changes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:244
+msgid "show changes between versions"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:245
 msgid "show pull request for this version"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:258
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:260
 msgid "Comments at this version"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:262
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:264
 msgid "Comments for this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:267
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:269
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:271
 #, python-format
 msgid "%d General "
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:273
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:275
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:277
 #, python-format
 msgid "%d Inline"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:279
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:283
-#, python-format
-msgid "%d Outdated"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:280
-msgid "show outdated comments"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:281
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:285
+#, python-format
+msgid "%d Outdated"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:282
+msgid "show outdated comments"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:283
 msgid "hide outdated comments"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:292
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:294
 msgid "Pull request versions not available"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:306
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:391
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:308
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:393
 msgid "Save Changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:408
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:410
 msgid "Missing requirements:"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:409
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:411
 msgid "These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:417
-msgid "Missing commits"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:418
-msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository."
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:419
+msgid "Missing commits"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:420
+msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:421
 msgid "Please update this pull request, push the commits back into the source repository, or consider closing this pull request."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:430
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:422
+msgid "Consider doing a {force_refresh_url} in case you think this is an error."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:433
 #, python-format
 msgid "Showing changes at v%d, commenting is disabled."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:453
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:455
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:456
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:458
 msgid "Update commits"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:455
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:458
 msgid "Update is disabled for current view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:466
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:469
 msgid "Commits and changes between v{ver_from} and {ver_to} of this pull request, commenting is disabled"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:470
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:473
 msgid "commits added: {}, removed: {}"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:488
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:491
 msgid "Commit added in displayed changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:490
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:493
 msgid "Commit removed in displayed changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:594
-msgid "there is {num} general comment from older versions"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:595
-msgid "show it"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:597
-msgid "there are {num} general comments from older versions"
+msgid "there is {num} general comment from older versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:598
+msgid "show it"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:600
+msgid "there are {num} general comments from older versions"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:601
 msgid "show them"
 msgstr ""
 
diff --git a/rhodecode/integrations/types/hipchat.py b/rhodecode/integrations/types/hipchat.py
--- a/rhodecode/integrations/types/hipchat.py
+++ b/rhodecode/integrations/types/hipchat.py
@@ -243,9 +243,11 @@ class HipchatIntegrationType(Integration
 @async_task(ignore_result=True, base=RequestContextTask)
 def post_text_to_hipchat(settings, text):
     log.debug('sending %s to hipchat %s' % (text, settings['server_url']))
-    resp = requests.post(settings['server_url'], json={
+    json_message = {
         "message": text,
         "color": settings.get('color', 'yellow'),
         "notify": settings.get('notify', False),
-    })
+    }
+
+    resp = requests.post(settings['server_url'], json=json_message, timeout=60)
     resp.raise_for_status()  # raise exception on a failed request
diff --git a/rhodecode/integrations/types/slack.py b/rhodecode/integrations/types/slack.py
--- a/rhodecode/integrations/types/slack.py
+++ b/rhodecode/integrations/types/slack.py
@@ -346,5 +346,5 @@ def post_text_to_slack(settings, title, 
         "attachments": [message_data]
     }
 
-    resp = requests.post(settings['service'], json=json_message)
+    resp = requests.post(settings['service'], json=json_message, timeout=60)
     resp.raise_for_status()  # raise exception on a failed request
diff --git a/rhodecode/integrations/types/webhook.py b/rhodecode/integrations/types/webhook.py
--- a/rhodecode/integrations/types/webhook.py
+++ b/rhodecode/integrations/types/webhook.py
@@ -264,7 +264,7 @@ def post_to_webhook(url_calls, settings)
         resp = call_method(url, json={
             'token': token,
             'event': data
-        }, headers=call_headers, auth=auth)
+        }, headers=call_headers, auth=auth, timeout=60)
         log.debug('Got Webhook response: %s', resp)
 
         try:
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -241,20 +241,24 @@ def store(action, user, action_data=None
         action_name = safe_unicode(action)
         ip_address = safe_unicode(ip_addr)
 
-        user_log = _store_log(
-            action_name=action_name,
-            action_data=action_data or {},
-            user_id=user_id,
-            username=username,
-            user_data=user_data or {},
-            ip_address=ip_address,
-            repository_id=repository_id,
-            repository_name=repository_name
-        )
+        with sa_session.no_autoflush:
+            update_user_last_activity(sa_session, user_id)
 
-        sa_session.add(user_log)
-        if commit:
-            sa_session.commit()
+            user_log = _store_log(
+                action_name=action_name,
+                action_data=action_data or {},
+                user_id=user_id,
+                username=username,
+                user_data=user_data or {},
+                ip_address=ip_address,
+                repository_id=repository_id,
+                repository_name=repository_name
+            )
+
+            sa_session.add(user_log)
+
+            if commit:
+                sa_session.commit()
 
         entry_id = user_log.entry_id or ''
         log.info('AUDIT[%s]: Logging action: `%s` by user:id:%s[%s] ip:%s',
@@ -262,3 +266,14 @@ def store(action, user, action_data=None
 
     except Exception:
         log.exception('AUDIT: failed to store audit log')
+
+
+def update_user_last_activity(sa_session, user_id):
+    _last_activity = datetime.datetime.now()
+    try:
+        sa_session.query(User).filter(User.user_id == user_id).update(
+            {"last_activity": _last_activity})
+        log.debug(
+            'updated user `%s` last activity to:%s', user_id, _last_activity)
+    except Exception:
+        log.exception("Failed last activity update")
diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -23,6 +23,7 @@ authentication and permission libraries
 """
 
 import os
+import time
 import inspect
 import collections
 import fnmatch
@@ -47,8 +48,8 @@ from rhodecode.model.user import UserMod
 from rhodecode.model.db import (
     User, Repository, Permission, UserToPerm, UserGroupToPerm, UserGroupMember,
     UserIpMap, UserApiKeys, RepoGroup, UserGroup)
-from rhodecode.lib import caches
-from rhodecode.lib.utils2 import safe_unicode, aslist, safe_str, md5
+from rhodecode.lib import rc_cache
+from rhodecode.lib.utils2 import safe_unicode, aslist, safe_str, md5, safe_int, sha1
 from rhodecode.lib.utils import (
     get_repo_slug, get_repo_group_slug, get_user_group_slug)
 from rhodecode.lib.caching_query import FromCache
@@ -90,7 +91,7 @@ class PasswordGenerator(object):
     def gen_password(self, length, type_=None):
         if type_ is None:
             type_ = self.ALPHABETS_FULL
-        self.passwd = ''.join([random.choice(type_) for _ in xrange(length)])
+        self.passwd = ''.join([random.choice(type_) for _ in range(length)])
         return self.passwd
 
 
@@ -209,12 +210,12 @@ class _RhodeCodeCryptoSha256(_RhodeCodeC
         return hashlib.sha256(password).hexdigest() == hashed
 
 
-class _RhodeCodeCryptoMd5(_RhodeCodeCryptoBase):
+class _RhodeCodeCryptoTest(_RhodeCodeCryptoBase):
     ENC_PREF = '_'
 
     def hash_create(self, str_):
         self._assert_bytes(str_)
-        return hashlib.md5(str_).hexdigest()
+        return sha1(str_)
 
     def hash_check(self, password, hashed):
         """
@@ -224,18 +225,18 @@ class _RhodeCodeCryptoMd5(_RhodeCodeCryp
         :param hashed: password in hashed form
         """
         self._assert_bytes(password)
-        return hashlib.md5(password).hexdigest() == hashed
+        return sha1(password) == hashed
 
 
 def crypto_backend():
     """
     Return the matching crypto backend.
 
-    Selection is based on if we run tests or not, we pick md5 backend to run
+    Selection is based on if we run tests or not, we pick sha1-test backend to run
     tests faster since BCRYPT is expensive to calculate
     """
     if rhodecode.is_test:
-        RhodeCodeCrypto = _RhodeCodeCryptoMd5()
+        RhodeCodeCrypto = _RhodeCodeCryptoTest()
     else:
         RhodeCodeCrypto = _RhodeCodeCryptoBCrypt()
 
@@ -366,23 +367,51 @@ class PermOriginDict(dict):
         self.perm_origin_stack = collections.OrderedDict()
 
     def __setitem__(self, key, (perm, origin)):
-        self.perm_origin_stack.setdefault(key, []).append((perm, origin))
+        self.perm_origin_stack.setdefault(key, []).append(
+            (perm, origin))
         dict.__setitem__(self, key, perm)
 
 
+class BranchPermOriginDict(PermOriginDict):
+    """
+    Dedicated branch permissions dict, with tracking of patterns and origins.
+
+    >>> perms = BranchPermOriginDict()
+    >>> perms['resource'] = '*pattern', 'read', 'default'
+    >>> perms['resource']
+    {'*pattern': 'read'}
+    >>> perms['resource'] = '*pattern', 'write', 'admin'
+    >>> perms['resource']
+    {'*pattern': 'write'}
+    >>> perms.perm_origin_stack
+    {'resource': {'*pattern': [('read', 'default'), ('write', 'admin')]}}
+    """
+    def __setitem__(self, key, (pattern, perm, origin)):
+
+        self.perm_origin_stack.setdefault(key, {}) \
+            .setdefault(pattern, []).append((perm, origin))
+
+        if key in self:
+            self[key].__setitem__(pattern, perm)
+        else:
+            patterns = collections.OrderedDict()
+            patterns[pattern] = perm
+            dict.__setitem__(self, key, patterns)
+
+
 class PermissionCalculator(object):
 
     def __init__(
             self, user_id, scope, user_is_admin,
             user_inherit_default_permissions, explicit, algo,
-            calculate_super_admin=False):
+            calculate_super_admin_as_user=False):
 
         self.user_id = user_id
         self.user_is_admin = user_is_admin
         self.inherit_default_permissions = user_inherit_default_permissions
         self.explicit = explicit
         self.algo = algo
-        self.calculate_super_admin = calculate_super_admin
+        self.calculate_super_admin_as_user = calculate_super_admin_as_user
 
         scope = scope or {}
         self.scope_repo_id = scope.get('repo_id')
@@ -394,6 +423,7 @@ class PermissionCalculator(object):
         self.permissions_repositories = PermOriginDict()
         self.permissions_repository_groups = PermOriginDict()
         self.permissions_user_groups = PermOriginDict()
+        self.permissions_repository_branches = BranchPermOriginDict()
         self.permissions_global = set()
 
         self.default_repo_perms = Permission.get_default_repo_perms(
@@ -404,19 +434,25 @@ class PermissionCalculator(object):
             Permission.get_default_user_group_perms(
                 self.default_user_id, self.scope_user_group_id)
 
+        # default branch perms
+        self.default_branch_repo_perms = \
+            Permission.get_default_repo_branch_perms(
+                self.default_user_id, self.scope_repo_id)
+
     def calculate(self):
-        if self.user_is_admin and not self.calculate_super_admin:
-            return self._admin_permissions()
+        if self.user_is_admin and not self.calculate_super_admin_as_user:
+            return self._calculate_admin_permissions()
 
         self._calculate_global_default_permissions()
         self._calculate_global_permissions()
         self._calculate_default_permissions()
         self._calculate_repository_permissions()
+        self._calculate_repository_branch_permissions()
         self._calculate_repository_group_permissions()
         self._calculate_user_group_permissions()
         return self._permission_structure()
 
-    def _admin_permissions(self):
+    def _calculate_admin_permissions(self):
         """
         admin user have all default rights for repositories
         and groups set to admin
@@ -442,6 +478,13 @@ class PermissionCalculator(object):
             p = 'usergroup.admin'
             self.permissions_user_groups[u_k] = p, PermOrigin.SUPER_ADMIN
 
+        # branch permissions
+        # since super-admin also can have custom rule permissions
+        # we *always* need to calculate those inherited from default, and also explicit
+        self._calculate_default_permissions_repository_branches(
+            user_inherit_object_permissions=False)
+        self._calculate_repository_branch_permissions()
+
         return self._permission_structure()
 
     def _calculate_global_default_permissions(self):
@@ -471,18 +514,14 @@ class PermissionCalculator(object):
         # now we read the defined permissions and overwrite what we have set
         # before those can be configured from groups or users explicitly.
 
-        # TODO: johbo: This seems to be out of sync, find out the reason
-        # for the comment below and update it.
-
-        # In case we want to extend this list we should be always in sync with
-        # User.DEFAULT_USER_PERMISSIONS definitions
+        # In case we want to extend this list we should make sure
+        # this is in sync with User.DEFAULT_USER_PERMISSIONS definitions
         _configurable = frozenset([
             'hg.fork.none', 'hg.fork.repository',
             'hg.create.none', 'hg.create.repository',
             'hg.usergroup.create.false', 'hg.usergroup.create.true',
             'hg.repogroup.create.false', 'hg.repogroup.create.true',
-            'hg.create.write_on_repogroup.false',
-            'hg.create.write_on_repogroup.true',
+            'hg.create.write_on_repogroup.false', 'hg.create.write_on_repogroup.true',
             'hg.inherit_default_perms.false', 'hg.inherit_default_perms.true'
         ])
 
@@ -505,7 +544,7 @@ class PermissionCalculator(object):
         for gr, perms in _explicit_grouped_perms:
             # since user can be in multiple groups iterate over them and
             # select the lowest permissions first (more explicit)
-            # TODO: marcink: do this^^
+            # TODO(marcink): do this^^
 
             # group doesn't inherit default permissions so we actually set them
             if not gr.inherit_default_permissions:
@@ -530,28 +569,7 @@ class PermissionCalculator(object):
             for perm in user_perms:
                 self.permissions_global.add(perm.permission.permission_name)
 
-    def _calculate_default_permissions(self):
-        """
-        Set default user permissions for repositories, repository groups
-        taken from the default user.
-
-        Calculate inheritance of object permissions based on what we have now
-        in GLOBAL permissions. We check if .false is in GLOBAL since this is
-        explicitly set. Inherit is the opposite of .false being there.
-
-        .. note::
-
-           the syntax is little bit odd but what we need to check here is
-           the opposite of .false permission being in the list so even for
-           inconsistent state when both .true/.false is there
-           .false is more important
-
-        """
-        user_inherit_object_permissions = not ('hg.inherit_default_perms.false'
-                                               in self.permissions_global)
-
-        # defaults for repositories, taken from `default` user permissions
-        # on given repo
+    def _calculate_default_permissions_repositories(self, user_inherit_object_permissions):
         for perm in self.default_repo_perms:
             r_k = perm.UserRepoToPerm.repository.repo_name
             p = perm.Permission.permission_name
@@ -584,8 +602,24 @@ class PermissionCalculator(object):
                 o = PermOrigin.SUPER_ADMIN
                 self.permissions_repositories[r_k] = p, o
 
-        # defaults for repository groups taken from `default` user permission
-        # on given group
+    def _calculate_default_permissions_repository_branches(self, user_inherit_object_permissions):
+        for perm in self.default_branch_repo_perms:
+
+            r_k = perm.UserRepoToPerm.repository.repo_name
+            p = perm.Permission.permission_name
+            pattern = perm.UserToRepoBranchPermission.branch_pattern
+            o = PermOrigin.REPO_USER % perm.UserRepoToPerm.user.username
+
+            if not self.explicit:
+                # TODO(marcink): fix this for multiple entries
+                cur_perm = self.permissions_repository_branches.get(r_k) or 'branch.none'
+                p = self._choose_permission(p, cur_perm)
+
+            # NOTE(marcink): register all pattern/perm instances in this
+            # special dict that aggregates entries
+            self.permissions_repository_branches[r_k] = pattern, p, o
+
+    def _calculate_default_permissions_repository_groups(self, user_inherit_object_permissions):
         for perm in self.default_repo_groups_perms:
             rg_k = perm.UserRepoGroupToPerm.group.group_name
             p = perm.Permission.permission_name
@@ -610,8 +644,7 @@ class PermissionCalculator(object):
                 o = PermOrigin.SUPER_ADMIN
                 self.permissions_repository_groups[rg_k] = p, o
 
-        # defaults for user groups taken from `default` user permission
-        # on given user group
+    def _calculate_default_permissions_user_groups(self, user_inherit_object_permissions):
         for perm in self.default_user_group_perms:
             u_k = perm.UserUserGroupToPerm.user_group.users_group_name
             p = perm.Permission.permission_name
@@ -636,6 +669,39 @@ class PermissionCalculator(object):
                 o = PermOrigin.SUPER_ADMIN
                 self.permissions_user_groups[u_k] = p, o
 
+    def _calculate_default_permissions(self):
+        """
+        Set default user permissions for repositories, repository branches,
+        repository groups, user groups taken from the default user.
+
+        Calculate inheritance of object permissions based on what we have now
+        in GLOBAL permissions. We check if .false is in GLOBAL since this is
+        explicitly set. Inherit is the opposite of .false being there.
+
+        .. note::
+
+           the syntax is little bit odd but what we need to check here is
+           the opposite of .false permission being in the list so even for
+           inconsistent state when both .true/.false is there
+           .false is more important
+
+        """
+        user_inherit_object_permissions = not ('hg.inherit_default_perms.false'
+                                               in self.permissions_global)
+
+        # default permissions inherited from `default` user permissions
+        self._calculate_default_permissions_repositories(
+            user_inherit_object_permissions)
+
+        self._calculate_default_permissions_repository_branches(
+            user_inherit_object_permissions)
+
+        self._calculate_default_permissions_repository_groups(
+            user_inherit_object_permissions)
+
+        self._calculate_default_permissions_user_groups(
+            user_inherit_object_permissions)
+
     def _calculate_repository_permissions(self):
         """
         Repository permissions for the current user.
@@ -702,6 +768,49 @@ class PermissionCalculator(object):
                 o = PermOrigin.SUPER_ADMIN
                 self.permissions_repositories[r_k] = p, o
 
+    def _calculate_repository_branch_permissions(self):
+        # user group for repositories permissions
+        user_repo_branch_perms_from_user_group = Permission\
+            .get_default_repo_branch_perms_from_user_group(
+                self.user_id, self.scope_repo_id)
+
+        multiple_counter = collections.defaultdict(int)
+        for perm in user_repo_branch_perms_from_user_group:
+            r_k = perm.UserGroupRepoToPerm.repository.repo_name
+            p = perm.Permission.permission_name
+            pattern = perm.UserGroupToRepoBranchPermission.branch_pattern
+            o = PermOrigin.REPO_USERGROUP % perm.UserGroupRepoToPerm\
+                .users_group.users_group_name
+
+            multiple_counter[r_k] += 1
+            if multiple_counter[r_k] > 1:
+                # TODO(marcink): fix this for multi branch support, and multiple entries
+                cur_perm = self.permissions_repository_branches[r_k]
+                p = self._choose_permission(p, cur_perm)
+
+            self.permissions_repository_branches[r_k] = pattern, p, o
+
+        # user explicit branch permissions for repositories, overrides
+        # any specified by the group permission
+        user_repo_branch_perms = Permission.get_default_repo_branch_perms(
+            self.user_id, self.scope_repo_id)
+
+        for perm in user_repo_branch_perms:
+
+            r_k = perm.UserRepoToPerm.repository.repo_name
+            p = perm.Permission.permission_name
+            pattern = perm.UserToRepoBranchPermission.branch_pattern
+            o = PermOrigin.REPO_USER % perm.UserRepoToPerm.user.username
+
+            if not self.explicit:
+                # TODO(marcink): fix this for multiple entries
+                cur_perm = self.permissions_repository_branches.get(r_k) or 'branch.none'
+                p = self._choose_permission(p, cur_perm)
+
+            # NOTE(marcink): register all pattern/perm instances in this
+            # special dict that aggregates entries
+            self.permissions_repository_branches[r_k] = pattern, p, o
+
     def _calculate_repository_group_permissions(self):
         """
         Repository group permissions for the current user.
@@ -844,6 +953,7 @@ class PermissionCalculator(object):
         return {
             'global': self.permissions_global,
             'repositories': self.permissions_repositories,
+            'repository_branches': self.permissions_repository_branches,
             'repositories_groups': self.permissions_repository_groups,
             'user_groups': self.permissions_user_groups,
         }
@@ -937,30 +1047,33 @@ class AuthUser(object):
 
     @LazyProperty
     def permissions(self):
-        return self.get_perms(user=self, cache=False)
+        return self.get_perms(user=self, cache=None)
 
     @LazyProperty
     def permissions_safe(self):
         """
         Filtered permissions excluding not allowed repositories
         """
-        perms = self.get_perms(user=self, cache=False)
+        perms = self.get_perms(user=self, cache=None)
 
         perms['repositories'] = {
-            k: v for k, v in perms['repositories'].iteritems()
+            k: v for k, v in perms['repositories'].items()
             if v != 'repository.none'}
         perms['repositories_groups'] = {
-            k: v for k, v in perms['repositories_groups'].iteritems()
+            k: v for k, v in perms['repositories_groups'].items()
             if v != 'group.none'}
         perms['user_groups'] = {
-            k: v for k, v in perms['user_groups'].iteritems()
+            k: v for k, v in perms['user_groups'].items()
             if v != 'usergroup.none'}
+        perms['repository_branches'] = {
+            k: v for k, v in perms['repository_branches'].iteritems()
+            if v != 'branch.none'}
         return perms
 
     @LazyProperty
     def permissions_full_details(self):
         return self.get_perms(
-            user=self, cache=False, calculate_super_admin=True)
+            user=self, cache=None, calculate_super_admin=True)
 
     def permissions_with_scope(self, scope):
         """
@@ -975,29 +1088,22 @@ class AuthUser(object):
             obj = Repository.get_by_repo_name(scope['repo_name'])
             if obj:
                 scope['repo_id'] = obj.repo_id
-        _scope = {
-            'repo_id': -1,
-            'user_group_id': -1,
-            'repo_group_id': -1,
-        }
-        _scope.update(scope)
-        cache_key = "_".join(map(safe_str, reduce(lambda a, b: a+b,
-                                                  _scope.items())))
-        if cache_key not in self._permissions_scoped_cache:
-            # store in cache to mimic how the @LazyProperty works,
-            # the difference here is that we use the unique key calculated
-            # from params and values
-            res = self.get_perms(user=self, cache=False, scope=_scope)
-            self._permissions_scoped_cache[cache_key] = res
-        return self._permissions_scoped_cache[cache_key]
+        _scope = collections.OrderedDict()
+        _scope['repo_id'] = -1
+        _scope['user_group_id'] = -1
+        _scope['repo_group_id'] = -1
+
+        for k in sorted(scope.keys()):
+            _scope[k] = scope[k]
+
+        # store in cache to mimic how the @LazyProperty works,
+        # the difference here is that we use the unique key calculated
+        # from params and values
+        return self.get_perms(user=self, cache=None, scope=_scope)
 
     def get_instance(self):
         return User.get(self.user_id)
 
-    def update_lastactivity(self):
-        if self.user_id:
-            User.get(self.user_id).update_lastactivity()
-
     def propagate_data(self):
         """
         Fills in user data and propagates values to this instance. Maps fetched
@@ -1048,7 +1154,7 @@ class AuthUser(object):
         log.debug('AuthUser: propagated user is now %s', self)
 
     def get_perms(self, user, scope=None, explicit=True, algo='higherwin',
-                  calculate_super_admin=False, cache=False):
+                  calculate_super_admin=False, cache=None):
         """
         Fills user permission attribute with permissions taken from database
         works for permissions given for repositories, and for permissions that
@@ -1063,6 +1169,9 @@ class AuthUser(object):
             it's multiple defined, eg user in two different groups. It also
             decides if explicit flag is turned off how to specify the permission
             for case when user is in a group + have defined separate permission
+        :param calculate_super_admin: calculate permissions for super-admin in the
+            same way as for regular user without speedups
+        :param cache: Use caching for calculation, None = let the cache backend decide
         """
         user_id = user.user_id
         user_is_admin = user.is_admin
@@ -1070,19 +1179,44 @@ class AuthUser(object):
         # inheritance of global permissions like create repo/fork repo etc
         user_inherit_default_permissions = user.inherit_default_permissions
 
-        log.debug('Computing PERMISSION tree for scope %s' % (scope, ))
-        compute = caches.conditional_cache(
-            'short_term', 'cache_desc',
-            condition=cache, func=_cached_perms_data)
-        result = compute(user_id, scope, user_is_admin,
-                         user_inherit_default_permissions, explicit, algo,
-                         calculate_super_admin)
+        cache_seconds = safe_int(
+            rhodecode.CONFIG.get('rc_cache.cache_perms.expiration_time'))
+
+        if cache is None:
+            # let the backend cache decide
+            cache_on = cache_seconds > 0
+        else:
+            cache_on = cache
+
+        log.debug(
+            'Computing PERMISSION tree for user %s scope `%s` '
+            'with caching: %s[TTL: %ss]' % (user, scope, cache_on, cache_seconds or 0))
+
+        cache_namespace_uid = 'cache_user_auth.{}'.format(user_id)
+        region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
+
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                               condition=cache_on)
+        def compute_perm_tree(cache_name,
+                user_id, scope, user_is_admin,user_inherit_default_permissions,
+                explicit, algo, calculate_super_admin):
+            return _cached_perms_data(
+                user_id, scope, user_is_admin, user_inherit_default_permissions,
+                explicit, algo, calculate_super_admin)
+
+        start = time.time()
+        result = compute_perm_tree(
+            'permissions', user_id, scope, user_is_admin,
+             user_inherit_default_permissions, explicit, algo,
+             calculate_super_admin)
 
         result_repr = []
         for k in result:
             result_repr.append((k, len(result[k])))
-
-        log.debug('PERMISSION tree computed %s' % (result_repr,))
+        total = time.time() - start
+        log.debug('PERMISSION tree for user %s computed in %.3fs: %s' % (
+            user, total, result_repr))
+
         return result
 
     @property
@@ -1103,7 +1237,7 @@ class AuthUser(object):
         Returns list of repositories you're an admin of
         """
         return [
-            x[0] for x in self.permissions['repositories'].iteritems()
+            x[0] for x in self.permissions['repositories'].items()
             if x[1] == 'repository.admin']
 
     @property
@@ -1112,7 +1246,7 @@ class AuthUser(object):
         Returns list of repository groups you're an admin of
         """
         return [
-            x[0] for x in self.permissions['repositories_groups'].iteritems()
+            x[0] for x in self.permissions['repositories_groups'].items()
             if x[1] == 'group.admin']
 
     @property
@@ -1121,7 +1255,7 @@ class AuthUser(object):
         Returns list of user groups you're an admin of
         """
         return [
-            x[0] for x in self.permissions['user_groups'].iteritems()
+            x[0] for x in self.permissions['user_groups'].items()
             if x[1] == 'usergroup.admin']
 
     def repo_acl_ids(self, perms=None, name_filter=None, cache=False):
@@ -1135,20 +1269,17 @@ class AuthUser(object):
             perms = [
                 'repository.read', 'repository.write', 'repository.admin']
 
-        def _cached_repo_acl(user_id, perm_def, name_filter):
+        def _cached_repo_acl(user_id, perm_def, _name_filter):
             qry = Repository.query()
-            if name_filter:
-                ilike_expression = u'%{}%'.format(safe_unicode(name_filter))
+            if _name_filter:
+                ilike_expression = u'%{}%'.format(safe_unicode(_name_filter))
                 qry = qry.filter(
                     Repository.repo_name.ilike(ilike_expression))
 
             return [x.repo_id for x in
                     RepoList(qry, perm_set=perm_def)]
 
-        compute = caches.conditional_cache(
-            'long_term', 'repo_acl_ids',
-            condition=cache, func=_cached_repo_acl)
-        return compute(self.user_id, perms, name_filter)
+        return _cached_repo_acl(self.user_id, perms, name_filter)
 
     def repo_group_acl_ids(self, perms=None, name_filter=None, cache=False):
         """
@@ -1161,20 +1292,17 @@ class AuthUser(object):
             perms = [
                 'group.read', 'group.write', 'group.admin']
 
-        def _cached_repo_group_acl(user_id, perm_def, name_filter):
+        def _cached_repo_group_acl(user_id, perm_def, _name_filter):
             qry = RepoGroup.query()
-            if name_filter:
-                ilike_expression = u'%{}%'.format(safe_unicode(name_filter))
+            if _name_filter:
+                ilike_expression = u'%{}%'.format(safe_unicode(_name_filter))
                 qry = qry.filter(
                     RepoGroup.group_name.ilike(ilike_expression))
 
             return [x.group_id for x in
                     RepoGroupList(qry, perm_set=perm_def)]
 
-        compute = caches.conditional_cache(
-            'long_term', 'repo_group_acl_ids',
-            condition=cache, func=_cached_repo_group_acl)
-        return compute(self.user_id, perms, name_filter)
+        return _cached_repo_group_acl(self.user_id, perms, name_filter)
 
     def user_group_acl_ids(self, perms=None, name_filter=None, cache=False):
         """
@@ -1197,10 +1325,7 @@ class AuthUser(object):
             return [x.users_group_id for x in
                     UserGroupList(qry, perm_set=perm_def)]
 
-        compute = caches.conditional_cache(
-            'long_term', 'user_group_acl_ids',
-            condition=cache, func=_cached_user_group_acl)
-        return compute(self.user_id, perms, name_filter)
+        return _cached_user_group_acl(self.user_id, perms, name_filter)
 
     @property
     def ip_allowed(self):
@@ -1227,13 +1352,42 @@ class AuthUser(object):
         allowed_ips = AuthUser.get_allowed_ips(
             user_id, cache=True, inherit_from_default=inherit_from_default)
         if check_ip_access(source_ip=ip_addr, allowed_ips=allowed_ips):
-            log.debug('IP:%s is in range of %s' % (ip_addr, allowed_ips))
+            log.debug('IP:%s for user %s is in range of %s' % (
+                ip_addr, user_id, allowed_ips))
             return True
         else:
-            log.info('Access for IP:%s forbidden, '
-                     'not in %s' % (ip_addr, allowed_ips))
+            log.info('Access for IP:%s forbidden for user %s, '
+                     'not in %s' % (ip_addr, user_id, allowed_ips))
             return False
 
+    def get_branch_permissions(self, repo_name, perms=None):
+        perms = perms or self.permissions_with_scope({'repo_name': repo_name})
+        branch_perms = perms.get('repository_branches', {})
+        if not branch_perms:
+            return {}
+        repo_branch_perms = branch_perms.get(repo_name)
+        return repo_branch_perms or {}
+
+    def get_rule_and_branch_permission(self, repo_name, branch_name):
+        """
+        Check if this AuthUser has defined any permissions for branches. If any of
+        the rules match in order, we return the matching permissions
+        """
+
+        rule = default_perm = ''
+
+        repo_branch_perms = self.get_branch_permissions(repo_name=repo_name)
+        if not repo_branch_perms:
+            return rule, default_perm
+
+        # now calculate the permissions
+        for pattern, branch_perm in repo_branch_perms.items():
+            if fnmatch.fnmatch(branch_name, pattern):
+                rule = '`{}`=>{}'.format(pattern, branch_perm)
+                return rule, branch_perm
+
+        return rule, default_perm
+
     def __repr__(self):
         return "<AuthUser('id:%s[%s] ip:%s auth:%s')>"\
             % (self.user_id, self.username, self.ip_addr, self.is_authenticated)
@@ -1268,8 +1422,8 @@ class AuthUser(object):
         _set = set()
 
         if inherit_from_default:
-            default_ips = UserIpMap.query().filter(
-                UserIpMap.user == User.get_default_user(cache=True))
+            def_user_id = User.get_default_user(cache=True).user_id
+            default_ips = UserIpMap.query().filter(UserIpMap.user_id == def_user_id)
             if cache:
                 default_ips = default_ips.options(
                     FromCache("sql_cache_short", "get_user_ips_default"))
@@ -1283,10 +1437,15 @@ class AuthUser(object):
                     # we get deleted objects here, we just skip them
                     pass
 
-        user_ips = UserIpMap.query().filter(UserIpMap.user_id == user_id)
-        if cache:
-            user_ips = user_ips.options(
-                FromCache("sql_cache_short", "get_user_ips_%s" % user_id))
+        # NOTE:(marcink) we don't want to load any rules for empty
+        # user_id which is the case of access of non logged users when anonymous
+        # access is disabled
+        user_ips = []
+        if user_id:
+            user_ips = UserIpMap.query().filter(UserIpMap.user_id == user_id)
+            if cache:
+                user_ips = user_ips.options(
+                    FromCache("sql_cache_short", "get_user_ips_%s" % user_id))
 
         for ip in user_ips:
             try:
@@ -1295,7 +1454,7 @@ class AuthUser(object):
                 # since we use heavy caching sometimes it happens that we get
                 # deleted objects here, we just skip them
                 pass
-        return _set or set(['0.0.0.0/0', '::/0'])
+        return _set or {ip for ip in ['0.0.0.0/0', '::/0']}
 
 
 def set_available_permissions(settings):
@@ -1486,9 +1645,6 @@ class LoginRequired(object):
                 'user %s authenticating with:%s IS authenticated on func %s'
                 % (user, reason, loc))
 
-            # update user data to check last activity
-            user.update_lastactivity()
-            Session().commit()
             return func(*fargs, **fkwargs)
         else:
             log.warning(
@@ -1627,7 +1783,7 @@ class HasRepoPermissionAllDecorator(Perm
         repo_name = self._get_repo_name()
 
         try:
-            user_perms = set([perms['repositories'][repo_name]])
+            user_perms = {perms['repositories'][repo_name]}
         except KeyError:
             log.debug('cannot locate repo with name: `%s` in permissions defs',
                       repo_name)
@@ -1654,7 +1810,7 @@ class HasRepoPermissionAnyDecorator(Perm
         repo_name = self._get_repo_name()
 
         try:
-            user_perms = set([perms['repositories'][repo_name]])
+            user_perms = {perms['repositories'][repo_name]}
         except KeyError:
             log.debug(
                 'cannot locate repo with name: `%s` in permissions defs',
@@ -1682,7 +1838,7 @@ class HasRepoGroupPermissionAllDecorator
         perms = user.permissions
         group_name = self._get_repo_group_name()
         try:
-            user_perms = set([perms['repositories_groups'][group_name]])
+            user_perms = {perms['repositories_groups'][group_name]}
         except KeyError:
             log.debug(
                 'cannot locate repo group with name: `%s` in permissions defs',
@@ -1711,7 +1867,7 @@ class HasRepoGroupPermissionAnyDecorator
         group_name = self._get_repo_group_name()
 
         try:
-            user_perms = set([perms['repositories_groups'][group_name]])
+            user_perms = {perms['repositories_groups'][group_name]}
         except KeyError:
             log.debug(
                 'cannot locate repo group with name: `%s` in permissions defs',
@@ -1738,7 +1894,7 @@ class HasUserGroupPermissionAllDecorator
         perms = user.permissions
         group_name = self._get_user_group_name()
         try:
-            user_perms = set([perms['user_groups'][group_name]])
+            user_perms = {perms['user_groups'][group_name]}
         except KeyError:
             return False
 
@@ -1760,7 +1916,7 @@ class HasUserGroupPermissionAnyDecorator
         perms = user.permissions
         group_name = self._get_user_group_name()
         try:
-            user_perms = set([perms['user_groups'][group_name]])
+            user_perms = {perms['user_groups'][group_name]}
         except KeyError:
             return False
 
@@ -1793,7 +1949,6 @@ class PermsFunction(object):
     def __call__(self, check_location='', user=None):
         if not user:
             log.debug('Using user attribute from global request')
-            # TODO: remove this someday,put as user as attribute here
             request = self._get_request()
             user = request.user
 
@@ -1873,7 +2028,7 @@ class HasRepoPermissionAll(PermsFunction
         self.repo_name = self._get_repo_name()
         perms = user.permissions
         try:
-            user_perms = set([perms['repositories'][self.repo_name]])
+            user_perms = {perms['repositories'][self.repo_name]}
         except KeyError:
             return False
         if self.required_perms.issubset(user_perms):
@@ -1896,7 +2051,7 @@ class HasRepoPermissionAny(PermsFunction
         self.repo_name = self._get_repo_name()
         perms = user.permissions
         try:
-            user_perms = set([perms['repositories'][self.repo_name]])
+            user_perms = {perms['repositories'][self.repo_name]}
         except KeyError:
             return False
         if self.required_perms.intersection(user_perms):
@@ -1913,8 +2068,7 @@ class HasRepoGroupPermissionAny(PermsFun
     def check_permissions(self, user):
         perms = user.permissions
         try:
-            user_perms = set(
-                [perms['repositories_groups'][self.repo_group_name]])
+            user_perms = {perms['repositories_groups'][self.repo_group_name]}
         except KeyError:
             return False
         if self.required_perms.intersection(user_perms):
@@ -1931,8 +2085,7 @@ class HasRepoGroupPermissionAll(PermsFun
     def check_permissions(self, user):
         perms = user.permissions
         try:
-            user_perms = set(
-                [perms['repositories_groups'][self.repo_group_name]])
+            user_perms = {perms['repositories_groups'][self.repo_group_name]}
         except KeyError:
             return False
         if self.required_perms.issubset(user_perms):
@@ -1949,7 +2102,7 @@ class HasUserGroupPermissionAny(PermsFun
     def check_permissions(self, user):
         perms = user.permissions
         try:
-            user_perms = set([perms['user_groups'][self.user_group_name]])
+            user_perms = {perms['user_groups'][self.user_group_name]}
         except KeyError:
             return False
         if self.required_perms.intersection(user_perms):
@@ -1966,7 +2119,7 @@ class HasUserGroupPermissionAll(PermsFun
     def check_permissions(self, user):
         perms = user.permissions
         try:
-            user_perms = set([perms['user_groups'][self.user_group_name]])
+            user_perms = {perms['user_groups'][self.user_group_name]}
         except KeyError:
             return False
         if self.required_perms.issubset(user_perms):
@@ -1979,30 +2132,29 @@ class HasPermissionAnyMiddleware(object)
     def __init__(self, *perms):
         self.required_perms = set(perms)
 
-    def __call__(self, user, repo_name):
+    def __call__(self, auth_user, repo_name):
         # repo_name MUST be unicode, since we handle keys in permission
         # dict by unicode
         repo_name = safe_unicode(repo_name)
-        user = AuthUser(user.user_id)
         log.debug(
             'Checking VCS protocol permissions %s for user:%s repo:`%s`',
-            self.required_perms, user, repo_name)
-
-        if self.check_permissions(user, repo_name):
+            self.required_perms, auth_user, repo_name)
+
+        if self.check_permissions(auth_user, repo_name):
             log.debug('Permission to repo:`%s` GRANTED for user:%s @ %s',
-                      repo_name, user, 'PermissionMiddleware')
+                      repo_name, auth_user, 'PermissionMiddleware')
             return True
 
         else:
             log.debug('Permission to repo:`%s` DENIED for user:%s @ %s',
-                      repo_name, user, 'PermissionMiddleware')
+                      repo_name, auth_user, 'PermissionMiddleware')
             return False
 
     def check_permissions(self, user, repo_name):
         perms = user.permissions_with_scope({'repo_name': repo_name})
 
         try:
-            user_perms = set([perms['repositories'][repo_name]])
+            user_perms = {perms['repositories'][repo_name]}
         except Exception:
             log.exception('Error while accessing user permissions')
             return False
@@ -2085,7 +2237,7 @@ class HasRepoPermissionAllApi(_BaseApiPe
     def check_permissions(self, perm_defs, repo_name=None, group_name=None,
                           user_group_name=None):
         try:
-            _user_perms = set([perm_defs['repositories'][repo_name]])
+            _user_perms = {perm_defs['repositories'][repo_name]}
         except KeyError:
             log.warning(traceback.format_exc())
             return False
@@ -2098,7 +2250,7 @@ class HasRepoPermissionAnyApi(_BaseApiPe
     def check_permissions(self, perm_defs, repo_name=None, group_name=None,
                           user_group_name=None):
         try:
-            _user_perms = set([perm_defs['repositories'][repo_name]])
+            _user_perms = {perm_defs['repositories'][repo_name]}
         except KeyError:
             log.warning(traceback.format_exc())
             return False
@@ -2111,7 +2263,7 @@ class HasRepoGroupPermissionAnyApi(_Base
     def check_permissions(self, perm_defs, repo_name=None, group_name=None,
                           user_group_name=None):
         try:
-            _user_perms = set([perm_defs['repositories_groups'][group_name]])
+            _user_perms = {perm_defs['repositories_groups'][group_name]}
         except KeyError:
             log.warning(traceback.format_exc())
             return False
@@ -2124,7 +2276,7 @@ class HasRepoGroupPermissionAllApi(_Base
     def check_permissions(self, perm_defs, repo_name=None, group_name=None,
                           user_group_name=None):
         try:
-            _user_perms = set([perm_defs['repositories_groups'][group_name]])
+            _user_perms = {perm_defs['repositories_groups'][group_name]}
         except KeyError:
             log.warning(traceback.format_exc())
             return False
@@ -2137,7 +2289,7 @@ class HasUserGroupPermissionAnyApi(_Base
     def check_permissions(self, perm_defs, repo_name=None, group_name=None,
                           user_group_name=None):
         try:
-            _user_perms = set([perm_defs['user_groups'][user_group_name]])
+            _user_perms = {perm_defs['user_groups'][user_group_name]}
         except KeyError:
             log.warning(traceback.format_exc())
             return False
diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py
--- a/rhodecode/lib/base.py
+++ b/rhodecode/lib/base.py
@@ -42,7 +42,7 @@ from rhodecode.lib.auth import AuthUser,
 from rhodecode.lib.exceptions import UserCreationError
 from rhodecode.lib.utils import (password_changed, get_enabled_hook_classes)
 from rhodecode.lib.utils2 import (
-    str2bool, safe_unicode, AttributeDict, safe_int, md5, aslist, safe_str)
+    str2bool, safe_unicode, AttributeDict, safe_int, sha1, aslist, safe_str)
 from rhodecode.model.db import Repository, User, ChangesetComment
 from rhodecode.model.notification import NotificationModel
 from rhodecode.model.settings import VcsSettingsModel, SettingsModel
@@ -153,7 +153,7 @@ def get_user_agent(environ):
 
 def vcs_operation_context(
         environ, repo_name, username, action, scm, check_locking=True,
-        is_shadow_repo=False):
+        is_shadow_repo=False, check_branch_perms=False, detect_force_push=False):
     """
     Generate the context for a vcs operation, e.g. push or pull.
 
@@ -179,7 +179,9 @@ def vcs_operation_context(
     settings_model = VcsSettingsModel(repo=repo_name)
     ui_settings = settings_model.get_ui_settings()
 
-    extras = {
+    # NOTE(marcink): This should be also in sync with
+    # rhodecode/apps/ssh_support/lib/backends/base.py:update_enviroment scm_data
+    scm_data = {
         'ip': get_ip_addr(environ),
         'username': username,
         'user_id': user_id,
@@ -193,8 +195,10 @@ def vcs_operation_context(
         'user_agent': get_user_agent(environ),
         'hooks': get_enabled_hook_classes(ui_settings),
         'is_shadow_repo': is_shadow_repo,
+        'detect_force_push': detect_force_push,
+        'check_branch_perms': check_branch_perms,
     }
-    return extras
+    return scm_data
 
 
 class BasicAuth(AuthBasicAuthenticator):
@@ -256,7 +260,7 @@ class BasicAuth(AuthBasicAuthenticator):
 
 
 def calculate_version_hash(config):
-    return md5(
+    return sha1(
         config.get('beaker.session.secret', '') +
         rhodecode.__version__)[:8]
 
@@ -504,7 +508,7 @@ def bootstrap_config(request):
     # allow pyramid lookup in testing
     config.include('pyramid_mako')
     config.include('pyramid_beaker')
-    config.include('rhodecode.lib.caches')
+    config.include('rhodecode.lib.rc_cache')
 
     add_events_routes(config)
 
diff --git a/rhodecode/lib/caches.py b/rhodecode/lib/caches.py
deleted file mode 100644
--- a/rhodecode/lib/caches.py
+++ /dev/null
@@ -1,269 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2015-2018 RhodeCode GmbH
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License, version 3
-# (only), as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This program is dual-licensed. If you wish to learn more about the
-# RhodeCode Enterprise Edition, including its added features, Support services,
-# and proprietary license terms, please see https://rhodecode.com/licenses/
-
-
-import beaker
-import logging
-import threading
-
-from beaker.cache import _cache_decorate, cache_regions, region_invalidate
-from sqlalchemy.exc import IntegrityError
-
-from rhodecode.lib.utils import safe_str, md5
-from rhodecode.model.db import Session, CacheKey
-
-log = logging.getLogger(__name__)
-
-FILE_TREE = 'cache_file_tree'
-FILE_TREE_META = 'cache_file_tree_metadata'
-FILE_SEARCH_TREE_META = 'cache_file_search_metadata'
-SUMMARY_STATS = 'cache_summary_stats'
-
-# This list of caches gets purged when invalidation happens
-USED_REPO_CACHES = (FILE_TREE, FILE_SEARCH_TREE_META)
-
-DEFAULT_CACHE_MANAGER_CONFIG = {
-    'type': 'memorylru_base',
-    'max_items': 10240,
-    'key_length': 256,
-    'enabled': True
-}
-
-
-def get_default_cache_settings(settings):
-    cache_settings = {}
-    for key in settings.keys():
-        for prefix in ['beaker.cache.', 'cache.']:
-            if key.startswith(prefix):
-                name = key.split(prefix)[1].strip()
-                cache_settings[name] = settings[key].strip()
-    return cache_settings
-
-
-# set cache regions for beaker so celery can utilise it
-def configure_caches(settings, default_region_settings=None):
-    cache_settings = {'regions': None}
-    # main cache settings used as default ...
-    cache_settings.update(get_default_cache_settings(settings))
-    default_region_settings = default_region_settings or \
-                              {'type': DEFAULT_CACHE_MANAGER_CONFIG['type']}
-    if cache_settings['regions']:
-        for region in cache_settings['regions'].split(','):
-            region = region.strip()
-            region_settings = default_region_settings.copy()
-            for key, value in cache_settings.items():
-                if key.startswith(region):
-                    region_settings[key.split(region + '.')[-1]] = value
-            log.debug('Configuring cache region `%s` with settings %s',
-                      region, region_settings)
-            configure_cache_region(
-                region, region_settings, cache_settings)
-
-
-def configure_cache_region(
-        region_name, region_settings, default_cache_kw, default_expire=60):
-    default_type = default_cache_kw.get('type', 'memory')
-    default_lock_dir = default_cache_kw.get('lock_dir')
-    default_data_dir = default_cache_kw.get('data_dir')
-
-    region_settings['lock_dir'] = region_settings.get('lock_dir', default_lock_dir)
-    region_settings['data_dir'] = region_settings.get('data_dir', default_data_dir)
-    region_settings['type'] = region_settings.get('type', default_type)
-    region_settings['expire'] = int(region_settings.get('expire', default_expire))
-
-    beaker.cache.cache_regions[region_name] = region_settings
-
-
-def get_cache_manager(region_name, cache_name, custom_ttl=None):
-    """
-    Creates a Beaker cache manager. Such instance can be used like that::
-
-    _namespace = caches.get_repo_namespace_key(caches.XXX, repo_name)
-    cache_manager = caches.get_cache_manager('repo_cache_long', _namespace)
-    _cache_key = caches.compute_key_from_params(repo_name, commit.raw_id)
-    def heavy_compute():
-        ...
-    result = cache_manager.get(_cache_key, createfunc=heavy_compute)
-
-    :param region_name: region from ini file
-    :param cache_name: custom cache name, usually prefix+repo_name. eg
-        file_switcher_repo1
-    :param custom_ttl: override .ini file timeout on this cache
-    :return: instance of cache manager
-    """
-
-    cache_config = cache_regions.get(region_name, DEFAULT_CACHE_MANAGER_CONFIG)
-    if custom_ttl:
-        log.debug('Updating region %s with custom ttl: %s',
-                  region_name, custom_ttl)
-        cache_config.update({'expire': custom_ttl})
-
-    return beaker.cache.Cache._get_cache(cache_name, cache_config)
-
-
-def clear_cache_manager(cache_manager):
-    """
-    namespace = 'foobar'
-    cache_manager = get_cache_manager('repo_cache_long', namespace)
-    clear_cache_manager(cache_manager)
-    """
-
-    log.debug('Clearing all values for cache manager %s', cache_manager)
-    cache_manager.clear()
-
-
-def clear_repo_caches(repo_name):
-    # invalidate cache manager for this repo
-    for prefix in USED_REPO_CACHES:
-        namespace = get_repo_namespace_key(prefix, repo_name)
-        cache_manager = get_cache_manager('repo_cache_long', namespace)
-        clear_cache_manager(cache_manager)
-
-
-def compute_key_from_params(*args):
-    """
-    Helper to compute key from given params to be used in cache manager
-    """
-    return md5("_".join(map(safe_str, args)))
-
-
-def get_repo_namespace_key(prefix, repo_name):
-    return '{0}_{1}'.format(prefix, compute_key_from_params(repo_name))
-
-
-def conditional_cache(region, prefix, condition, func):
-    """
-    Conditional caching function use like::
-        def _c(arg):
-            # heavy computation function
-            return data
-
-        # depending on the condition the compute is wrapped in cache or not
-        compute = conditional_cache('short_term', 'cache_desc',
-                                    condition=True, func=func)
-        return compute(arg)
-
-    :param region: name of cache region
-    :param prefix: cache region prefix
-    :param condition: condition for cache to be triggered, and
-        return data cached
-    :param func: wrapped heavy function to compute
-
-    """
-    wrapped = func
-    if condition:
-        log.debug('conditional_cache: True, wrapping call of '
-                  'func: %s into %s region cache', region, func)
-        cached_region = _cache_decorate((prefix,), None, None, region)
-        wrapped = cached_region(func)
-    return wrapped
-
-
-class ActiveRegionCache(object):
-    def __init__(self, context):
-        self.context = context
-
-    def invalidate(self, *args, **kwargs):
-        return False
-
-    def compute(self):
-        log.debug('Context cache: getting obj %s from cache', self.context)
-        return self.context.compute_func(self.context.cache_key)
-
-
-class FreshRegionCache(ActiveRegionCache):
-    def invalidate(self):
-        log.debug('Context cache: invalidating cache for %s', self.context)
-        region_invalidate(
-            self.context.compute_func, None, self.context.cache_key)
-        return True
-
-
-class InvalidationContext(object):
-    def __repr__(self):
-        return '<InvalidationContext:{}[{}]>'.format(
-            safe_str(self.repo_name), safe_str(self.cache_type))
-
-    def __init__(self, compute_func, repo_name, cache_type,
-                 raise_exception=False, thread_scoped=False):
-        self.compute_func = compute_func
-        self.repo_name = repo_name
-        self.cache_type = cache_type
-        self.cache_key = compute_key_from_params(
-            repo_name, cache_type)
-        self.raise_exception = raise_exception
-
-        # Append the thread id to the cache key if this invalidation context
-        # should be scoped to the current thread.
-        if thread_scoped:
-            thread_id = threading.current_thread().ident
-            self.cache_key = '{cache_key}_{thread_id}'.format(
-                cache_key=self.cache_key, thread_id=thread_id)
-
-    def get_cache_obj(self):
-        cache_key = CacheKey.get_cache_key(
-            self.repo_name, self.cache_type)
-        cache_obj = CacheKey.get_active_cache(cache_key)
-        if not cache_obj:
-            cache_obj = CacheKey(cache_key, self.repo_name)
-        return cache_obj
-
-    def __enter__(self):
-        """
-        Test if current object is valid, and return CacheRegion function
-        that does invalidation and calculation
-        """
-
-        self.cache_obj = self.get_cache_obj()
-        if self.cache_obj.cache_active:
-            # means our cache obj is existing and marked as it's
-            # cache is not outdated, we return BaseInvalidator
-            self.skip_cache_active_change = True
-            return ActiveRegionCache(self)
-
-        # the key is either not existing or set to False, we return
-        # the real invalidator which re-computes value. We additionally set
-        # the flag to actually update the Database objects
-        self.skip_cache_active_change = False
-        return FreshRegionCache(self)
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-
-        if self.skip_cache_active_change:
-            return
-
-        try:
-            self.cache_obj.cache_active = True
-            Session().add(self.cache_obj)
-            Session().commit()
-        except IntegrityError:
-            # if we catch integrity error, it means we inserted this object
-            # assumption is that's really an edge race-condition case and
-            # it's safe is to skip it
-            Session().rollback()
-        except Exception:
-            log.exception('Failed to commit on cache key update')
-            Session().rollback()
-            if self.raise_exception:
-                raise
-
-
-def includeme(config):
-    configure_caches(config.registry.settings)
diff --git a/rhodecode/lib/caching_query.py b/rhodecode/lib/caching_query.py
--- a/rhodecode/lib/caching_query.py
+++ b/rhodecode/lib/caching_query.py
@@ -18,16 +18,16 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-"""
-caching_query.py
+"""caching_query.py
 
-Represent persistence structures which allow the usage of
-Beaker caching with SQLAlchemy.
+Represent functions and classes
+which allow the usage of Dogpile caching with SQLAlchemy.
+Introduces a query option called FromCache.
 
 The three new concepts introduced here are:
 
  * CachingQuery - a Query subclass that caches and
-   retrieves results in/from Beaker.
+   retrieves results in/from dogpile.cache.
  * FromCache - a query option that establishes caching
    parameters on a Query
  * RelationshipCache - a variant of FromCache which is specific
@@ -36,57 +36,44 @@ The three new concepts introduced here a
    a Query.
 
 The rest of what's here are standard SQLAlchemy and
-Beaker constructs.
+dogpile.cache constructs.
 
 """
-import beaker
-from beaker.exceptions import BeakerException
-
 from sqlalchemy.orm.interfaces import MapperOption
 from sqlalchemy.orm.query import Query
 from sqlalchemy.sql import visitors
+from dogpile.cache.api import NO_VALUE
 
 from rhodecode.lib.utils2 import safe_str
 
 
 class CachingQuery(Query):
-    """A Query subclass which optionally loads full results from a Beaker
+    """A Query subclass which optionally loads full results from a dogpile
     cache region.
 
-    The CachingQuery stores additional state that allows it to consult
-    a Beaker cache before accessing the database:
-
-    * A "region", which is a cache region argument passed to a
-      Beaker CacheManager, specifies a particular cache configuration
-      (including backend implementation, expiration times, etc.)
-    * A "namespace", which is a qualifying name that identifies a
-      group of keys within the cache.  A query that filters on a name
-      might use the name "by_name", a query that filters on a date range
-      to a joined table might use the name "related_date_range".
-
-    When the above state is present, a Beaker cache is retrieved.
-
-    The "namespace" name is first concatenated with
-    a string composed of the individual entities and columns the Query
-    requests, i.e. such as ``Query(User.id, User.name)``.
-
-    The Beaker cache is then loaded from the cache manager based
-    on the region and composed namespace.  The key within the cache
-    itself is then constructed against the bind parameters specified
-    by this query, which are usually literals defined in the
-    WHERE clause.
+    The CachingQuery optionally stores additional state that allows it to consult
+    a dogpile.cache cache before accessing the database, in the form
+    of a FromCache or RelationshipCache object.   Each of these objects
+    refer to the name of a :class:`dogpile.cache.Region` that's been configured
+    and stored in a lookup dictionary.  When such an object has associated
+    itself with the CachingQuery, the corresponding :class:`dogpile.cache.Region`
+    is used to locate a cached result.  If none is present, then the
+    Query is invoked normally, the results being cached.
 
     The FromCache and RelationshipCache mapper options below represent
     the "public" method of configuring this state upon the CachingQuery.
 
     """
+    def _get_region(self):
+        from rhodecode.lib.rc_cache import region_meta
+        return region_meta.dogpile_cache_regions
 
-    def __init__(self, manager, *args, **kw):
-        self.cache_manager = manager
+    def __init__(self, regions, *args, **kw):
+        self.cache_regions = regions or self._get_region()
         Query.__init__(self, *args, **kw)
 
     def __iter__(self):
-        """override __iter__ to pull results from Beaker
+        """override __iter__ to pull results from dogpile
            if particular attributes have been configured.
 
            Note that this approach does *not* detach the loaded objects from
@@ -98,109 +85,121 @@ class CachingQuery(Query):
            in the cache are not the same ones in the current Session.
 
         """
-        if hasattr(self, '_cache_parameters'):
+        super_ = super(CachingQuery, self)
+
+        if hasattr(self, '_cache_region'):
+            return self.get_value(createfunc=lambda: list(super_.__iter__()))
+        else:
+            return super_.__iter__()
+
+    def _execute_and_instances(self, context):
+        """override _execute_and_instances to pull results from dogpile
+            if the query is invoked directly from an external context.
+
+           This method is necessary in order to maintain compatibility
+           with the "baked query" system now used by default in some
+           relationship loader scenarios.   Note also the
+           RelationshipCache._generate_cache_key method which enables
+           the baked query to be used within lazy loads.
 
-            def caching_query():
-                return list(Query.__iter__(self))
+           .. versionadded:: 1.2.7
+        """
+        super_ = super(CachingQuery, self)
 
-            return self.get_value(createfunc=caching_query)
+        if context.query is not self and hasattr(self, '_cache_region'):
+            # special logic called when the Query._execute_and_instances()
+            # method is called directly from the baked query
+            return self.get_value(
+                createfunc=lambda: list(
+                    super_._execute_and_instances(context)
+                )
+            )
         else:
-            return Query.__iter__(self)
+            return super_._execute_and_instances(context)
+
+    def _get_cache_plus_key(self):
+        """Return a cache region plus key."""
+        dogpile_region = self.cache_regions[self._cache_region.region]
+        if self._cache_region.cache_key:
+            key = self._cache_region.cache_key
+        else:
+            key = _key_from_query(self)
+        return dogpile_region, key
 
     def invalidate(self):
-        """Invalidate the value represented by this Query."""
+        """Invalidate the cache value represented by this Query."""
 
-        cache, cache_key = _get_cache_parameters(self)
-        cache.remove(cache_key)
+        dogpile_region, cache_key = self._get_cache_plus_key()
+        dogpile_region.delete(cache_key)
 
-    def get_value(self, merge=True, createfunc=None):
+    def get_value(self, merge=True, createfunc=None,
+                  expiration_time=None, ignore_expiration=False):
         """Return the value from the cache for this query.
 
         Raise KeyError if no value present and no
         createfunc specified.
 
         """
-        cache, cache_key = _get_cache_parameters(self)
-        ret = cache.get_value(cache_key, createfunc=createfunc)
+        dogpile_region, cache_key = self._get_cache_plus_key()
+
+        # ignore_expiration means, if the value is in the cache
+        # but is expired, return it anyway.   This doesn't make sense
+        # with createfunc, which says, if the value is expired, generate
+        # a new value.
+        assert not ignore_expiration or not createfunc, \
+                "Can't ignore expiration and also provide createfunc"
+
+        if ignore_expiration or not createfunc:
+            cached_value = dogpile_region.get(cache_key,
+                                expiration_time=expiration_time,
+                                ignore_expiration=ignore_expiration)
+        else:
+            cached_value = dogpile_region.get_or_create(
+                                    cache_key,
+                                    createfunc,
+                                    expiration_time=expiration_time
+                                )
+        if cached_value is NO_VALUE:
+            raise KeyError(cache_key)
         if merge:
-            ret = self.merge_result(ret, load=False)
-        return ret
+            cached_value = self.merge_result(cached_value, load=False)
+        return cached_value
 
     def set_value(self, value):
         """Set the value in the cache for this query."""
 
-        cache, cache_key = _get_cache_parameters(self)
-        cache.put(cache_key, value)
+        dogpile_region, cache_key = self._get_cache_plus_key()
+        dogpile_region.set(cache_key, value)
 
 
-def query_callable(manager, query_cls=CachingQuery):
+def query_callable(regions=None, query_cls=CachingQuery):
     def query(*arg, **kw):
-        return query_cls(manager, *arg, **kw)
+        return query_cls(regions, *arg, **kw)
     return query
 
 
-def get_cache_region(name, region):
-    if region not in beaker.cache.cache_regions:
-        raise BeakerException('Cache region `%s` not configured '
-            'Check if proper cache settings are in the .ini files' % region)
-    kw = beaker.cache.cache_regions[region]
-    return beaker.cache.Cache._get_cache(name, kw)
+def _key_from_query(query, qualifier=None):
+    """Given a Query, create a cache key.
 
-
-def _get_cache_parameters(query):
-    """For a query with cache_region and cache_namespace configured,
-    return the correspoinding Cache instance and cache key, based
-    on this query's current criterion and parameter values.
+    There are many approaches to this; here we use the simplest,
+    which is to create an md5 hash of the text of the SQL statement,
+    combined with stringified versions of all the bound parameters
+    within it.     There's a bit of a performance hit with
+    compiling out "query.statement" here; other approaches include
+    setting up an explicit cache key with a particular Query,
+    then combining that with the bound parameter values.
 
     """
-    if not hasattr(query, '_cache_parameters'):
-        raise ValueError("This Query does not have caching "
-                         "parameters configured.")
 
-    region, namespace, cache_key = query._cache_parameters
-
-    namespace = _namespace_from_query(namespace, query)
-
-    if cache_key is None:
-        # cache key - the value arguments from this query's parameters.
-        args = [safe_str(x) for x in _params_from_query(query)]
-        args.extend(filter(lambda k: k not in ['None', None, u'None'],
-                           [str(query._limit), str(query._offset)]))
-
-        cache_key = " ".join(args)
-
-    if cache_key is None:
-        raise Exception('Cache key cannot be None')
+    stmt = query.with_labels().statement
+    compiled = stmt.compile()
+    params = compiled.params
 
-    # get cache
-    #cache = query.cache_manager.get_cache_region(namespace, region)
-    cache = get_cache_region(namespace, region)
-    # optional - hash the cache_key too for consistent length
-    # import uuid
-    # cache_key= str(uuid.uuid5(uuid.NAMESPACE_DNS, cache_key))
-
-    return cache, cache_key
-
-
-def _namespace_from_query(namespace, query):
-    # cache namespace - the token handed in by the
-    # option + class we're querying against
-    namespace = " ".join([namespace] + [str(x) for x in query._entities])
-
-    # memcached wants this
-    namespace = namespace.replace(' ', '_')
-
-    return namespace
-
-
-def _set_cache_parameters(query, region, namespace, cache_key):
-
-    if hasattr(query, '_cache_parameters'):
-        region, namespace, cache_key = query._cache_parameters
-        raise ValueError("This query is already configured "
-                         "for region %r namespace %r" %
-                         (region, namespace))
-    query._cache_parameters = region, namespace, cache_key
+    # here we return the key as a long string.  our "key mangler"
+    # set up with the region will boil it down to an md5.
+    return " ".join(
+                    [safe_str(compiled)] +
+                    [safe_str(params[k]) for k in sorted(params)])
 
 
 class FromCache(MapperOption):
@@ -208,15 +207,12 @@ class FromCache(MapperOption):
 
     propagate_to_loaders = False
 
-    def __init__(self, region, namespace, cache_key=None):
+    def __init__(self, region="sql_cache_short", cache_key=None):
         """Construct a new FromCache.
 
         :param region: the cache region.  Should be a
-        region configured in the Beaker CacheManager.
-
-        :param namespace: the cache namespace.  Should
-        be a name uniquely describing the target Query's
-        lexical structure.
+        region configured in the dictionary of dogpile
+        regions.
 
         :param cache_key: optional.  A string cache key
         that will serve as the key to the query.   Use this
@@ -226,14 +222,11 @@ class FromCache(MapperOption):
 
         """
         self.region = region
-        self.namespace = namespace
         self.cache_key = cache_key
 
     def process_query(self, query):
         """Process a Query during normal loading operation."""
-
-        _set_cache_parameters(query, self.region, self.namespace,
-                              self.cache_key)
+        query._cache_region = self
 
 
 class RelationshipCache(MapperOption):
@@ -242,27 +235,39 @@ class RelationshipCache(MapperOption):
 
     propagate_to_loaders = True
 
-    def __init__(self, region, namespace, attribute):
+    def __init__(self, attribute, region="sql_cache_short", cache_key=None):
         """Construct a new RelationshipCache.
 
-        :param region: the cache region.  Should be a
-        region configured in the Beaker CacheManager.
-
-        :param namespace: the cache namespace.  Should
-        be a name uniquely describing the target Query's
-        lexical structure.
-
         :param attribute: A Class.attribute which
         indicates a particular class relationship() whose
         lazy loader should be pulled from the cache.
 
+        :param region: name of the cache region.
+
+        :param cache_key: optional.  A string cache key
+        that will serve as the key to the query, bypassing
+        the usual means of forming a key from the Query itself.
+
         """
         self.region = region
-        self.namespace = namespace
+        self.cache_key = cache_key
         self._relationship_options = {
             (attribute.property.parent.class_, attribute.property.key): self
         }
 
+    def _generate_cache_key(self, path):
+        """Indicate to the lazy-loader strategy that a "baked" query
+        may be used by returning ``None``.
+
+        If this method is omitted, the default implementation of
+        :class:`.MapperOption._generate_cache_key` takes place, which
+        returns ``False`` to disable the "baked" query from being used.
+
+        .. versionadded:: 1.2.7
+
+        """
+        return None
+
     def process_query_conditionally(self, query):
         """Process a Query that is used within a lazy loader.
 
@@ -271,17 +276,14 @@ class RelationshipCache(MapperOption):
 
         """
         if query._current_path:
-            mapper, key = query._current_path[-2:]
+            mapper, prop = query._current_path[-2:]
+            key = prop.key
 
             for cls in mapper.class_.__mro__:
                 if (cls, key) in self._relationship_options:
-                    relationship_option = \
-                        self._relationship_options[(cls, key)]
-                    _set_cache_parameters(
-                            query,
-                            relationship_option.region,
-                            relationship_option.namespace,
-                            None)
+                    relationship_option = self._relationship_options[(cls, key)]
+                    query._cache_region = relationship_option
+                    break
 
     def and_(self, option):
         """Chain another RelationshipCache option to this one.
@@ -294,32 +296,3 @@ class RelationshipCache(MapperOption):
         self._relationship_options.update(option._relationship_options)
         return self
 
-
-def _params_from_query(query):
-    """Pull the bind parameter values from a query.
-
-    This takes into account any scalar attribute bindparam set up.
-
-    E.g. params_from_query(query.filter(Cls.foo==5).filter(Cls.bar==7)))
-    would return [5, 7].
-
-    """
-    v = []
-    def visit_bindparam(bind):
-
-        if bind.key in query._params:
-            value = query._params[bind.key]
-        elif bind.callable:
-            # lazyloader may dig a callable in here, intended
-            # to late-evaluate params after autoflush is called.
-            # convert to a scalar value.
-            value = bind.callable()
-        else:
-            value = bind.value
-
-        v.append(value)
-    if query._criterion is not None:
-        visitors.traverse(query._criterion, {}, {'bindparam':visit_bindparam})
-    for f in query._from_obj:
-        visitors.traverse(f, {}, {'bindparam':visit_bindparam})
-    return v
diff --git a/rhodecode/lib/celerylib/tasks.py b/rhodecode/lib/celerylib/tasks.py
--- a/rhodecode/lib/celerylib/tasks.py
+++ b/rhodecode/lib/celerylib/tasks.py
@@ -32,7 +32,7 @@ from rhodecode.lib.celerylib import get_
 from rhodecode.lib.hooks_base import log_create_repository
 from rhodecode.lib.rcmail.smtp_mailer import SmtpMailer
 from rhodecode.lib.utils2 import safe_int, str2bool
-from rhodecode.model.db import Session, IntegrityError, Repository, User
+from rhodecode.model.db import Session, IntegrityError, Repository, User, true
 
 
 @async_task(ignore_result=True, base=RequestContextTask)
@@ -52,9 +52,15 @@ def send_email(recipients, subject, body
     subject = "%s %s" % (email_config.get('email_prefix', ''), subject)
     if not recipients:
         # if recipients are not defined we send to email_config + all admins
-        admins = [
-            u.email for u in User.query().filter(User.admin == True).all()]
-        recipients = [email_config.get('email_to')] + admins
+        admins = []
+        for u in User.query().filter(User.admin == true()).all():
+            if u.email:
+                admins.append(u.email)
+        recipients = []
+        config_email = email_config.get('email_to')
+        if config_email:
+            recipients += [config_email]
+        recipients += admins
 
     mail_server = email_config.get('smtp_server') or None
     if mail_server is None:
diff --git a/rhodecode/lib/db_manage.py b/rhodecode/lib/db_manage.py
--- a/rhodecode/lib/db_manage.py
+++ b/rhodecode/lib/db_manage.py
@@ -573,17 +573,18 @@ class DbManage(object):
 
     def create_user(self, username, password, email='', admin=False,
                     strict_creation_check=True, api_key=None):
-        log.info('creating user %s' % username)
+        log.info('creating user `%s`' % username)
         user = UserModel().create_or_update(
             username, password, email, firstname=u'RhodeCode', lastname=u'Admin',
             active=True, admin=admin, extern_type="rhodecode",
             strict_creation_check=strict_creation_check)
 
         if api_key:
-            log.info('setting a provided api key for the user %s', username)
-            from rhodecode.model.auth_token import AuthTokenModel
-            AuthTokenModel().create(
-                user=user, description=u'BUILTIN TOKEN')
+            log.info('setting a new default auth token for user `%s`', username)
+            UserModel().add_auth_token(
+                user=user, lifetime_minutes=-1,
+                role=UserModel.auth_token_role.ROLE_ALL,
+                description=u'BUILTIN TOKEN')
 
     def create_default_user(self):
         log.info('creating default user')
@@ -594,7 +595,7 @@ class DbManage(object):
                                             firstname=u'Anonymous',
                                             lastname=u'User',
                                             strict_creation_check=False)
-        # based on configuration options activate/deactive this user which
+        # based on configuration options activate/de-activate this user which
         # controlls anonymous access
         if self.cli_args.get('public_access') is False:
             log.info('Public access disabled')
diff --git a/rhodecode/lib/dbmigrate/schema/db_1_2_0.py b/rhodecode/lib/dbmigrate/schema/db_1_2_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_1_2_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_1_2_0.py
@@ -648,17 +648,7 @@ class Repository(Base, BaseModel):
 
     @property
     def scm_instance_cached(self):
-        @cache_region('long_term')
-        def _c(repo_name):
-            return self.__get_instance()
-        rn = self.repo_name
-
-        inv = self.invalidate
-        if inv is not None:
-            region_invalidate(_c, None, rn)
-            # update our cache
-            CacheInvalidation.set_valid(inv.cache_key)
-        return _c(rn)
+        return self.__get_instance()
 
     def __get_instance(self):
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_1_3_0.py b/rhodecode/lib/dbmigrate/schema/db_1_3_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_1_3_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_1_3_0.py
@@ -670,17 +670,7 @@ class Repository(Base, BaseModel):
 
     @property
     def scm_instance_cached(self):
-        @cache_region('long_term')
-        def _c(repo_name):
-            return self.__get_instance()
-        rn = self.repo_name
-        log.debug('Getting cached instance of repo')
-        inv = self.invalidate
-        if inv is not None:
-            region_invalidate(_c, None, rn)
-            # update our cache
-            CacheInvalidation.set_valid(inv.cache_key)
-        return _c(rn)
+        return self.__get_instance()
 
     def __get_instance(self):
         repo_full_path = self.repo_full_path
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py
@@ -2262,18 +2262,7 @@ class Repository(Base, BaseModel):
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
-        @cache_region('long_term')
-        def _get_repo(cache_key):
-            return self._get_instance()
-
-        invalidator_context = CacheKey.repo_context_cache(
-            _get_repo, self.repo_name, None, thread_scoped=True)
-
-        with invalidator_context as context:
-            context.invalidate()
-            repo = context.compute()
-
-        return repo
+        self._get_instance()
 
     def _get_instance(self, cache=True, config=None):
         config = config or self._config
@@ -3165,27 +3154,6 @@ class CacheKey(Base, BaseModel):
             return inv_obj
         return None
 
-    @classmethod
-    def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                           thread_scoped=False):
-        """
-        @cache_region('long_term')
-        def _heavy_calculation(cache_key):
-            return 'result'
-
-        cache_context = CacheKey.repo_context_cache(
-            _heavy_calculation, repo_name, cache_type)
-
-        with cache_context as context:
-            context.invalidate()
-            computed = context.compute()
-
-        assert computed == 'result'
-        """
-        from rhodecode.lib import caches
-        return caches.InvalidationContext(
-            compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
-
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py
@@ -0,0 +1,4587 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+"""
+Database Models for RhodeCode Enterprise
+"""
+
+import re
+import os
+import time
+import hashlib
+import logging
+import datetime
+import warnings
+import ipaddress
+import functools
+import traceback
+import collections
+
+from sqlalchemy import (
+    or_, and_, not_, func, TypeDecorator, event,
+    Index, Sequence, UniqueConstraint, ForeignKey, CheckConstraint, Column,
+    Boolean, String, Unicode, UnicodeText, DateTime, Integer, LargeBinary,
+    Text, Float, PickleType)
+from sqlalchemy.sql.expression import true, false
+from sqlalchemy.sql.functions import coalesce, count  # noqa
+from sqlalchemy.orm import (
+    relationship, joinedload, class_mapper, validates, aliased)
+from sqlalchemy.ext.declarative import declared_attr
+from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy.exc import IntegrityError  # noqa
+from sqlalchemy.dialects.mysql import LONGTEXT
+from beaker.cache import cache_region
+from zope.cachedescriptors.property import Lazy as LazyProperty
+
+from pyramid.threadlocal import get_current_request
+
+from rhodecode.translation import _
+from rhodecode.lib.vcs import get_vcs_instance
+from rhodecode.lib.vcs.backends.base import EmptyCommit, Reference
+from rhodecode.lib.utils2 import (
+    str2bool, safe_str, get_commit_safe, safe_unicode, md5_safe,
+    time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
+    glob2re, StrictAttributeDict, cleaned_uri)
+from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
+    JsonRaw
+from rhodecode.lib.ext_json import json
+from rhodecode.lib.caching_query import FromCache
+from rhodecode.lib.encrypt import AESCipher
+
+from rhodecode.model.meta import Base, Session
+
+URL_SEP = '/'
+log = logging.getLogger(__name__)
+
+# =============================================================================
+# BASE CLASSES
+# =============================================================================
+
+# this is propagated from .ini file rhodecode.encrypted_values.secret or
+# beaker.session.secret if first is not set.
+# and initialized at environment.py
+ENCRYPTION_KEY = None
+
+# used to sort permissions by types, '#' used here is not allowed to be in
+# usernames, and it's very early in sorted string.printable table.
+PERMISSION_TYPE_SORT = {
+    'admin': '####',
+    'write': '###',
+    'read':  '##',
+    'none':  '#',
+}
+
+
+def display_user_sort(obj):
+    """
+    Sort function used to sort permissions in .permissions() function of
+    Repository, RepoGroup, UserGroup. Also it put the default user in front
+    of all other resources
+    """
+
+    if obj.username == User.DEFAULT_USER:
+        return '#####'
+    prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
+    return prefix + obj.username
+
+
+def display_user_group_sort(obj):
+    """
+    Sort function used to sort permissions in .permissions() function of
+    Repository, RepoGroup, UserGroup. Also it put the default user in front
+    of all other resources
+    """
+
+    prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
+    return prefix + obj.users_group_name
+
+
+def _hash_key(k):
+    return md5_safe(k)
+
+
+def in_filter_generator(qry, items, limit=500):
+    """
+    Splits IN() into multiple with OR
+    e.g.::
+    cnt = Repository.query().filter(
+        or_(
+            *in_filter_generator(Repository.repo_id, range(100000))
+        )).count()
+    """
+    if not items:
+        # empty list will cause empty query which might cause security issues
+        # this can lead to hidden unpleasant results
+        items = [-1]
+
+    parts = []
+    for chunk in xrange(0, len(items), limit):
+        parts.append(
+            qry.in_(items[chunk: chunk + limit])
+        )
+
+    return parts
+
+
+class EncryptedTextValue(TypeDecorator):
+    """
+    Special column for encrypted long text data, use like::
+
+        value = Column("encrypted_value", EncryptedValue(), nullable=False)
+
+    This column is intelligent so if value is in unencrypted form it return
+    unencrypted form, but on save it always encrypts
+    """
+    impl = Text
+
+    def process_bind_param(self, value, dialect):
+        if not value:
+            return value
+        if value.startswith('enc$aes$') or value.startswith('enc$aes_hmac$'):
+            # protect against double encrypting if someone manually starts
+            # doing
+            raise ValueError('value needs to be in unencrypted format, ie. '
+                             'not starting with enc$aes')
+        return 'enc$aes_hmac$%s' % AESCipher(
+            ENCRYPTION_KEY, hmac=True).encrypt(value)
+
+    def process_result_value(self, value, dialect):
+        import rhodecode
+
+        if not value:
+            return value
+
+        parts = value.split('$', 3)
+        if not len(parts) == 3:
+            # probably not encrypted values
+            return value
+        else:
+            if parts[0] != 'enc':
+                # parts ok but without our header ?
+                return value
+            enc_strict_mode = str2bool(rhodecode.CONFIG.get(
+                'rhodecode.encrypted_values.strict') or True)
+            # at that stage we know it's our encryption
+            if parts[1] == 'aes':
+                decrypted_data = AESCipher(ENCRYPTION_KEY).decrypt(parts[2])
+            elif parts[1] == 'aes_hmac':
+                decrypted_data = AESCipher(
+                    ENCRYPTION_KEY, hmac=True,
+                    strict_verification=enc_strict_mode).decrypt(parts[2])
+            else:
+                raise ValueError(
+                    'Encryption type part is wrong, must be `aes` '
+                    'or `aes_hmac`, got `%s` instead' % (parts[1]))
+            return decrypted_data
+
+
+class BaseModel(object):
+    """
+    Base Model for all classes
+    """
+
+    @classmethod
+    def _get_keys(cls):
+        """return column names for this model """
+        return class_mapper(cls).c.keys()
+
+    def get_dict(self):
+        """
+        return dict with keys and values corresponding
+        to this model data """
+
+        d = {}
+        for k in self._get_keys():
+            d[k] = getattr(self, k)
+
+        # also use __json__() if present to get additional fields
+        _json_attr = getattr(self, '__json__', None)
+        if _json_attr:
+            # update with attributes from __json__
+            if callable(_json_attr):
+                _json_attr = _json_attr()
+            for k, val in _json_attr.iteritems():
+                d[k] = val
+        return d
+
+    def get_appstruct(self):
+        """return list with keys and values tuples corresponding
+        to this model data """
+
+        lst = []
+        for k in self._get_keys():
+            lst.append((k, getattr(self, k),))
+        return lst
+
+    def populate_obj(self, populate_dict):
+        """populate model with data from given populate_dict"""
+
+        for k in self._get_keys():
+            if k in populate_dict:
+                setattr(self, k, populate_dict[k])
+
+    @classmethod
+    def query(cls):
+        return Session().query(cls)
+
+    @classmethod
+    def get(cls, id_):
+        if id_:
+            return cls.query().get(id_)
+
+    @classmethod
+    def get_or_404(cls, id_):
+        from pyramid.httpexceptions import HTTPNotFound
+
+        try:
+            id_ = int(id_)
+        except (TypeError, ValueError):
+            raise HTTPNotFound()
+
+        res = cls.query().get(id_)
+        if not res:
+            raise HTTPNotFound()
+        return res
+
+    @classmethod
+    def getAll(cls):
+        # deprecated and left for backward compatibility
+        return cls.get_all()
+
+    @classmethod
+    def get_all(cls):
+        return cls.query().all()
+
+    @classmethod
+    def delete(cls, id_):
+        obj = cls.query().get(id_)
+        Session().delete(obj)
+
+    @classmethod
+    def identity_cache(cls, session, attr_name, value):
+        exist_in_session = []
+        for (item_cls, pkey), instance in session.identity_map.items():
+            if cls == item_cls and getattr(instance, attr_name) == value:
+                exist_in_session.append(instance)
+        if exist_in_session:
+            if len(exist_in_session) == 1:
+                return exist_in_session[0]
+            log.exception(
+                'multiple objects with attr %s and '
+                'value %s found with same name: %r',
+                attr_name, value, exist_in_session)
+
+    def __repr__(self):
+        if hasattr(self, '__unicode__'):
+            # python repr needs to return str
+            try:
+                return safe_str(self.__unicode__())
+            except UnicodeDecodeError:
+                pass
+        return '<DB:%s>' % (self.__class__.__name__)
+
+
+class RhodeCodeSetting(Base, BaseModel):
+    __tablename__ = 'rhodecode_settings'
+    __table_args__ = (
+        UniqueConstraint('app_settings_name'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    SETTINGS_TYPES = {
+        'str': safe_str,
+        'int': safe_int,
+        'unicode': safe_unicode,
+        'bool': str2bool,
+        'list': functools.partial(aslist, sep=',')
+    }
+    DEFAULT_UPDATE_URL = 'https://rhodecode.com/api/v1/info/versions'
+    GLOBAL_CONF_KEY = 'app_settings'
+
+    app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    app_settings_name = Column("app_settings_name", String(255), nullable=True, unique=None, default=None)
+    _app_settings_value = Column("app_settings_value", String(4096), nullable=True, unique=None, default=None)
+    _app_settings_type = Column("app_settings_type", String(255), nullable=True, unique=None, default=None)
+
+    def __init__(self, key='', val='', type='unicode'):
+        self.app_settings_name = key
+        self.app_settings_type = type
+        self.app_settings_value = val
+
+    @validates('_app_settings_value')
+    def validate_settings_value(self, key, val):
+        assert type(val) == unicode
+        return val
+
+    @hybrid_property
+    def app_settings_value(self):
+        v = self._app_settings_value
+        _type = self.app_settings_type
+        if _type:
+            _type = self.app_settings_type.split('.')[0]
+            # decode the encrypted value
+            if 'encrypted' in self.app_settings_type:
+                cipher = EncryptedTextValue()
+                v = safe_unicode(cipher.process_result_value(v, None))
+
+        converter = self.SETTINGS_TYPES.get(_type) or \
+            self.SETTINGS_TYPES['unicode']
+        return converter(v)
+
+    @app_settings_value.setter
+    def app_settings_value(self, val):
+        """
+        Setter that will always make sure we use unicode in app_settings_value
+
+        :param val:
+        """
+        val = safe_unicode(val)
+        # encode the encrypted value
+        if 'encrypted' in self.app_settings_type:
+            cipher = EncryptedTextValue()
+            val = safe_unicode(cipher.process_bind_param(val, None))
+        self._app_settings_value = val
+
+    @hybrid_property
+    def app_settings_type(self):
+        return self._app_settings_type
+
+    @app_settings_type.setter
+    def app_settings_type(self, val):
+        if val.split('.')[0] not in self.SETTINGS_TYPES:
+            raise Exception('type must be one of %s got %s'
+                            % (self.SETTINGS_TYPES.keys(), val))
+        self._app_settings_type = val
+
+    def __unicode__(self):
+        return u"<%s('%s:%s[%s]')>" % (
+            self.__class__.__name__,
+            self.app_settings_name, self.app_settings_value,
+            self.app_settings_type
+        )
+
+
+class RhodeCodeUi(Base, BaseModel):
+    __tablename__ = 'rhodecode_ui'
+    __table_args__ = (
+        UniqueConstraint('ui_key'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    HOOK_REPO_SIZE = 'changegroup.repo_size'
+    # HG
+    HOOK_PRE_PULL = 'preoutgoing.pre_pull'
+    HOOK_PULL = 'outgoing.pull_logger'
+    HOOK_PRE_PUSH = 'prechangegroup.pre_push'
+    HOOK_PRETX_PUSH = 'pretxnchangegroup.pre_push'
+    HOOK_PUSH = 'changegroup.push_logger'
+    HOOK_PUSH_KEY = 'pushkey.key_push'
+
+    # TODO: johbo: Unify way how hooks are configured for git and hg,
+    # git part is currently hardcoded.
+
+    # SVN PATTERNS
+    SVN_BRANCH_ID = 'vcs_svn_branch'
+    SVN_TAG_ID = 'vcs_svn_tag'
+
+    ui_id = Column(
+        "ui_id", Integer(), nullable=False, unique=True, default=None,
+        primary_key=True)
+    ui_section = Column(
+        "ui_section", String(255), nullable=True, unique=None, default=None)
+    ui_key = Column(
+        "ui_key", String(255), nullable=True, unique=None, default=None)
+    ui_value = Column(
+        "ui_value", String(255), nullable=True, unique=None, default=None)
+    ui_active = Column(
+        "ui_active", Boolean(), nullable=True, unique=None, default=True)
+
+    def __repr__(self):
+        return '<%s[%s]%s=>%s]>' % (self.__class__.__name__, self.ui_section,
+                                    self.ui_key, self.ui_value)
+
+
+class RepoRhodeCodeSetting(Base, BaseModel):
+    __tablename__ = 'repo_rhodecode_settings'
+    __table_args__ = (
+        UniqueConstraint(
+            'app_settings_name', 'repository_id',
+            name='uq_repo_rhodecode_setting_name_repo_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    repository_id = Column(
+        "repository_id", Integer(), ForeignKey('repositories.repo_id'),
+        nullable=False)
+    app_settings_id = Column(
+        "app_settings_id", Integer(), nullable=False, unique=True,
+        default=None, primary_key=True)
+    app_settings_name = Column(
+        "app_settings_name", String(255), nullable=True, unique=None,
+        default=None)
+    _app_settings_value = Column(
+        "app_settings_value", String(4096), nullable=True, unique=None,
+        default=None)
+    _app_settings_type = Column(
+        "app_settings_type", String(255), nullable=True, unique=None,
+        default=None)
+
+    repository = relationship('Repository')
+
+    def __init__(self, repository_id, key='', val='', type='unicode'):
+        self.repository_id = repository_id
+        self.app_settings_name = key
+        self.app_settings_type = type
+        self.app_settings_value = val
+
+    @validates('_app_settings_value')
+    def validate_settings_value(self, key, val):
+        assert type(val) == unicode
+        return val
+
+    @hybrid_property
+    def app_settings_value(self):
+        v = self._app_settings_value
+        type_ = self.app_settings_type
+        SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
+        converter = SETTINGS_TYPES.get(type_) or SETTINGS_TYPES['unicode']
+        return converter(v)
+
+    @app_settings_value.setter
+    def app_settings_value(self, val):
+        """
+        Setter that will always make sure we use unicode in app_settings_value
+
+        :param val:
+        """
+        self._app_settings_value = safe_unicode(val)
+
+    @hybrid_property
+    def app_settings_type(self):
+        return self._app_settings_type
+
+    @app_settings_type.setter
+    def app_settings_type(self, val):
+        SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
+        if val not in SETTINGS_TYPES:
+            raise Exception('type must be one of %s got %s'
+                            % (SETTINGS_TYPES.keys(), val))
+        self._app_settings_type = val
+
+    def __unicode__(self):
+        return u"<%s('%s:%s:%s[%s]')>" % (
+            self.__class__.__name__, self.repository.repo_name,
+            self.app_settings_name, self.app_settings_value,
+            self.app_settings_type
+        )
+
+
+class RepoRhodeCodeUi(Base, BaseModel):
+    __tablename__ = 'repo_rhodecode_ui'
+    __table_args__ = (
+        UniqueConstraint(
+            'repository_id', 'ui_section', 'ui_key',
+            name='uq_repo_rhodecode_ui_repository_id_section_key'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    repository_id = Column(
+        "repository_id", Integer(), ForeignKey('repositories.repo_id'),
+        nullable=False)
+    ui_id = Column(
+        "ui_id", Integer(), nullable=False, unique=True, default=None,
+        primary_key=True)
+    ui_section = Column(
+        "ui_section", String(255), nullable=True, unique=None, default=None)
+    ui_key = Column(
+        "ui_key", String(255), nullable=True, unique=None, default=None)
+    ui_value = Column(
+        "ui_value", String(255), nullable=True, unique=None, default=None)
+    ui_active = Column(
+        "ui_active", Boolean(), nullable=True, unique=None, default=True)
+
+    repository = relationship('Repository')
+
+    def __repr__(self):
+        return '<%s[%s:%s]%s=>%s]>' % (
+            self.__class__.__name__, self.repository.repo_name,
+            self.ui_section, self.ui_key, self.ui_value)
+
+
+class User(Base, BaseModel):
+    __tablename__ = 'users'
+    __table_args__ = (
+        UniqueConstraint('username'), UniqueConstraint('email'),
+        Index('u_username_idx', 'username'),
+        Index('u_email_idx', 'email'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    DEFAULT_USER = 'default'
+    DEFAULT_USER_EMAIL = 'anonymous@rhodecode.org'
+    DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}'
+
+    user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    username = Column("username", String(255), nullable=True, unique=None, default=None)
+    password = Column("password", String(255), nullable=True, unique=None, default=None)
+    active = Column("active", Boolean(), nullable=True, unique=None, default=True)
+    admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)
+    name = Column("firstname", String(255), nullable=True, unique=None, default=None)
+    lastname = Column("lastname", String(255), nullable=True, unique=None, default=None)
+    _email = Column("email", String(255), nullable=True, unique=None, default=None)
+    last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
+    last_activity = Column('last_activity', DateTime(timezone=False), nullable=True, unique=None, default=None)
+
+    extern_type = Column("extern_type", String(255), nullable=True, unique=None, default=None)
+    extern_name = Column("extern_name", String(255), nullable=True, unique=None, default=None)
+    _api_key = Column("api_key", String(255), nullable=True, unique=None, default=None)
+    inherit_default_permissions = Column("inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    _user_data = Column("user_data", LargeBinary(), nullable=True)  # JSON data
+
+    user_log = relationship('UserLog')
+    user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all')
+
+    repositories = relationship('Repository')
+    repository_groups = relationship('RepoGroup')
+    user_groups = relationship('UserGroup')
+
+    user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
+    followings = relationship('UserFollowing', primaryjoin='UserFollowing.user_id==User.user_id', cascade='all')
+
+    repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all')
+    repo_group_to_perm = relationship('UserRepoGroupToPerm', primaryjoin='UserRepoGroupToPerm.user_id==User.user_id', cascade='all')
+    user_group_to_perm = relationship('UserUserGroupToPerm', primaryjoin='UserUserGroupToPerm.user_id==User.user_id', cascade='all')
+
+    group_member = relationship('UserGroupMember', cascade='all')
+
+    notifications = relationship('UserNotification', cascade='all')
+    # notifications assigned to this user
+    user_created_notifications = relationship('Notification', cascade='all')
+    # comments created by this user
+    user_comments = relationship('ChangesetComment', cascade='all')
+    # user profile extra info
+    user_emails = relationship('UserEmailMap', cascade='all')
+    user_ip_map = relationship('UserIpMap', cascade='all')
+    user_auth_tokens = relationship('UserApiKeys', cascade='all')
+    user_ssh_keys = relationship('UserSshKeys', cascade='all')
+
+    # gists
+    user_gists = relationship('Gist', cascade='all')
+    # user pull requests
+    user_pull_requests = relationship('PullRequest', cascade='all')
+    # external identities
+    extenal_identities = relationship(
+        'ExternalIdentity',
+        primaryjoin="User.user_id==ExternalIdentity.local_user_id",
+        cascade='all')
+    # review rules
+    user_review_rules = relationship('RepoReviewRuleUser', cascade='all')
+
+    def __unicode__(self):
+        return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
+                                      self.user_id, self.username)
+
+    @hybrid_property
+    def email(self):
+        return self._email
+
+    @email.setter
+    def email(self, val):
+        self._email = val.lower() if val else None
+
+    @hybrid_property
+    def first_name(self):
+        from rhodecode.lib import helpers as h
+        if self.name:
+            return h.escape(self.name)
+        return self.name
+
+    @hybrid_property
+    def last_name(self):
+        from rhodecode.lib import helpers as h
+        if self.lastname:
+            return h.escape(self.lastname)
+        return self.lastname
+
+    @hybrid_property
+    def api_key(self):
+        """
+        Fetch if exist an auth-token with role ALL connected to this user
+        """
+        user_auth_token = UserApiKeys.query()\
+            .filter(UserApiKeys.user_id == self.user_id)\
+            .filter(or_(UserApiKeys.expires == -1,
+                            UserApiKeys.expires >= time.time()))\
+            .filter(UserApiKeys.role == UserApiKeys.ROLE_ALL).first()
+        if user_auth_token:
+            user_auth_token = user_auth_token.api_key
+
+        return user_auth_token
+
+    @api_key.setter
+    def api_key(self, val):
+        # don't allow to set API key this is deprecated for now
+        self._api_key = None
+
+    @property
+    def reviewer_pull_requests(self):
+        return PullRequestReviewers.query() \
+            .options(joinedload(PullRequestReviewers.pull_request)) \
+            .filter(PullRequestReviewers.user_id == self.user_id) \
+            .all()
+
+    @property
+    def firstname(self):
+        # alias for future
+        return self.name
+
+    @property
+    def emails(self):
+        other = UserEmailMap.query()\
+            .filter(UserEmailMap.user == self) \
+            .order_by(UserEmailMap.email_id.asc()) \
+            .all()
+        return [self.email] + [x.email for x in other]
+
+    @property
+    def auth_tokens(self):
+        auth_tokens = self.get_auth_tokens()
+        return [x.api_key for x in auth_tokens]
+
+    def get_auth_tokens(self):
+        return UserApiKeys.query()\
+            .filter(UserApiKeys.user == self)\
+            .order_by(UserApiKeys.user_api_key_id.asc())\
+            .all()
+
+    @LazyProperty
+    def feed_token(self):
+        return self.get_feed_token()
+
+    def get_feed_token(self, cache=True):
+        feed_tokens = UserApiKeys.query()\
+            .filter(UserApiKeys.user == self)\
+            .filter(UserApiKeys.role == UserApiKeys.ROLE_FEED)
+        if cache:
+            feed_tokens = feed_tokens.options(
+                FromCache("long_term", "get_user_feed_token_%s" % self.user_id))
+
+        feed_tokens = feed_tokens.all()
+        if feed_tokens:
+            return feed_tokens[0].api_key
+        return 'NO_FEED_TOKEN_AVAILABLE'
+
+    @classmethod
+    def get(cls, user_id, cache=False):
+        if not user_id:
+            return
+
+        user = cls.query()
+        if cache:
+            user = user.options(
+                FromCache("sql_cache_short", "get_users_%s" % user_id))
+        return user.get(user_id)
+
+    @classmethod
+    def extra_valid_auth_tokens(cls, user, role=None):
+        tokens = UserApiKeys.query().filter(UserApiKeys.user == user)\
+                .filter(or_(UserApiKeys.expires == -1,
+                            UserApiKeys.expires >= time.time()))
+        if role:
+            tokens = tokens.filter(or_(UserApiKeys.role == role,
+                                       UserApiKeys.role == UserApiKeys.ROLE_ALL))
+        return tokens.all()
+
+    def authenticate_by_token(self, auth_token, roles=None, scope_repo_id=None):
+        from rhodecode.lib import auth
+
+        log.debug('Trying to authenticate user: %s via auth-token, '
+                  'and roles: %s', self, roles)
+
+        if not auth_token:
+            return False
+
+        crypto_backend = auth.crypto_backend()
+
+        roles = (roles or []) + [UserApiKeys.ROLE_ALL]
+        tokens_q = UserApiKeys.query()\
+            .filter(UserApiKeys.user_id == self.user_id)\
+            .filter(or_(UserApiKeys.expires == -1,
+                        UserApiKeys.expires >= time.time()))
+
+        tokens_q = tokens_q.filter(UserApiKeys.role.in_(roles))
+
+        plain_tokens = []
+        hash_tokens = []
+
+        for token in tokens_q.all():
+            # verify scope first
+            if token.repo_id:
+                # token has a scope, we need to verify it
+                if scope_repo_id != token.repo_id:
+                    log.debug(
+                        'Scope mismatch: token has a set repo scope: %s, '
+                        'and calling scope is:%s, skipping further checks',
+                         token.repo, scope_repo_id)
+                    # token has a scope, and it doesn't match, skip token
+                    continue
+
+            if token.api_key.startswith(crypto_backend.ENC_PREF):
+                hash_tokens.append(token.api_key)
+            else:
+                plain_tokens.append(token.api_key)
+
+        is_plain_match = auth_token in plain_tokens
+        if is_plain_match:
+            return True
+
+        for hashed in hash_tokens:
+            # TODO(marcink): this is expensive to calculate, but most secure
+            match = crypto_backend.hash_check(auth_token, hashed)
+            if match:
+                return True
+
+        return False
+
+    @property
+    def ip_addresses(self):
+        ret = UserIpMap.query().filter(UserIpMap.user == self).all()
+        return [x.ip_addr for x in ret]
+
+    @property
+    def username_and_name(self):
+        return '%s (%s %s)' % (self.username, self.first_name, self.last_name)
+
+    @property
+    def username_or_name_or_email(self):
+        full_name = self.full_name if self.full_name is not ' ' else None
+        return self.username or full_name or self.email
+
+    @property
+    def full_name(self):
+        return '%s %s' % (self.first_name, self.last_name)
+
+    @property
+    def full_name_or_username(self):
+        return ('%s %s' % (self.first_name, self.last_name)
+                if (self.first_name and self.last_name) else self.username)
+
+    @property
+    def full_contact(self):
+        return '%s %s <%s>' % (self.first_name, self.last_name, self.email)
+
+    @property
+    def short_contact(self):
+        return '%s %s' % (self.first_name, self.last_name)
+
+    @property
+    def is_admin(self):
+        return self.admin
+
+    def AuthUser(self, **kwargs):
+        """
+        Returns instance of AuthUser for this user
+        """
+        from rhodecode.lib.auth import AuthUser
+        return AuthUser(user_id=self.user_id, username=self.username, **kwargs)
+
+    @hybrid_property
+    def user_data(self):
+        if not self._user_data:
+            return {}
+
+        try:
+            return json.loads(self._user_data)
+        except TypeError:
+            return {}
+
+    @user_data.setter
+    def user_data(self, val):
+        if not isinstance(val, dict):
+            raise Exception('user_data must be dict, got %s' % type(val))
+        try:
+            self._user_data = json.dumps(val)
+        except Exception:
+            log.error(traceback.format_exc())
+
+    @classmethod
+    def get_by_username(cls, username, case_insensitive=False,
+                        cache=False, identity_cache=False):
+        session = Session()
+
+        if case_insensitive:
+            q = cls.query().filter(
+                func.lower(cls.username) == func.lower(username))
+        else:
+            q = cls.query().filter(cls.username == username)
+
+        if cache:
+            if identity_cache:
+                val = cls.identity_cache(session, 'username', username)
+                if val:
+                    return val
+            else:
+                cache_key = "get_user_by_name_%s" % _hash_key(username)
+                q = q.options(
+                    FromCache("sql_cache_short", cache_key))
+
+        return q.scalar()
+
+    @classmethod
+    def get_by_auth_token(cls, auth_token, cache=False):
+        q = UserApiKeys.query()\
+            .filter(UserApiKeys.api_key == auth_token)\
+            .filter(or_(UserApiKeys.expires == -1,
+                        UserApiKeys.expires >= time.time()))
+        if cache:
+            q = q.options(
+                FromCache("sql_cache_short", "get_auth_token_%s" % auth_token))
+
+        match = q.first()
+        if match:
+            return match.user
+
+    @classmethod
+    def get_by_email(cls, email, case_insensitive=False, cache=False):
+
+        if case_insensitive:
+            q = cls.query().filter(func.lower(cls.email) == func.lower(email))
+
+        else:
+            q = cls.query().filter(cls.email == email)
+
+        email_key = _hash_key(email)
+        if cache:
+            q = q.options(
+                FromCache("sql_cache_short", "get_email_key_%s" % email_key))
+
+        ret = q.scalar()
+        if ret is None:
+            q = UserEmailMap.query()
+            # try fetching in alternate email map
+            if case_insensitive:
+                q = q.filter(func.lower(UserEmailMap.email) == func.lower(email))
+            else:
+                q = q.filter(UserEmailMap.email == email)
+            q = q.options(joinedload(UserEmailMap.user))
+            if cache:
+                q = q.options(
+                    FromCache("sql_cache_short", "get_email_map_key_%s" % email_key))
+            ret = getattr(q.scalar(), 'user', None)
+
+        return ret
+
+    @classmethod
+    def get_from_cs_author(cls, author):
+        """
+        Tries to get User objects out of commit author string
+
+        :param author:
+        """
+        from rhodecode.lib.helpers import email, author_name
+        # Valid email in the attribute passed, see if they're in the system
+        _email = email(author)
+        if _email:
+            user = cls.get_by_email(_email, case_insensitive=True)
+            if user:
+                return user
+        # Maybe we can match by username?
+        _author = author_name(author)
+        user = cls.get_by_username(_author, case_insensitive=True)
+        if user:
+            return user
+
+    def update_userdata(self, **kwargs):
+        usr = self
+        old = usr.user_data
+        old.update(**kwargs)
+        usr.user_data = old
+        Session().add(usr)
+        log.debug('updated userdata with ', kwargs)
+
+    def update_lastlogin(self):
+        """Update user lastlogin"""
+        self.last_login = datetime.datetime.now()
+        Session().add(self)
+        log.debug('updated user %s lastlogin', self.username)
+
+    def update_lastactivity(self):
+        """Update user lastactivity"""
+        self.last_activity = datetime.datetime.now()
+        Session().add(self)
+        log.debug('updated user `%s` last activity', self.username)
+
+    def update_password(self, new_password):
+        from rhodecode.lib.auth import get_crypt_password
+
+        self.password = get_crypt_password(new_password)
+        Session().add(self)
+
+    @classmethod
+    def get_first_super_admin(cls):
+        user = User.query().filter(User.admin == true()).first()
+        if user is None:
+            raise Exception('FATAL: Missing administrative account!')
+        return user
+
+    @classmethod
+    def get_all_super_admins(cls):
+        """
+        Returns all admin accounts sorted by username
+        """
+        return User.query().filter(User.admin == true())\
+            .order_by(User.username.asc()).all()
+
+    @classmethod
+    def get_default_user(cls, cache=False, refresh=False):
+        user = User.get_by_username(User.DEFAULT_USER, cache=cache)
+        if user is None:
+            raise Exception('FATAL: Missing default account!')
+        if refresh:
+            # The default user might be based on outdated state which
+            # has been loaded from the cache.
+            # A call to refresh() ensures that the
+            # latest state from the database is used.
+            Session().refresh(user)
+        return user
+
+    def _get_default_perms(self, user, suffix=''):
+        from rhodecode.model.permission import PermissionModel
+        return PermissionModel().get_default_perms(user.user_perms, suffix)
+
+    def get_default_perms(self, suffix=''):
+        return self._get_default_perms(self, suffix)
+
+    def get_api_data(self, include_secrets=False, details='full'):
+        """
+        Common function for generating user related data for API
+
+        :param include_secrets: By default secrets in the API data will be replaced
+           by a placeholder value to prevent exposing this data by accident. In case
+           this data shall be exposed, set this flag to ``True``.
+
+        :param details: details can be 'basic|full' basic gives only a subset of
+           the available user information that includes user_id, name and emails.
+        """
+        user = self
+        user_data = self.user_data
+        data = {
+            'user_id': user.user_id,
+            'username': user.username,
+            'firstname': user.name,
+            'lastname': user.lastname,
+            'email': user.email,
+            'emails': user.emails,
+        }
+        if details == 'basic':
+            return data
+
+        auth_token_length = 40
+        auth_token_replacement = '*' * auth_token_length
+
+        extras = {
+            'auth_tokens': [auth_token_replacement],
+            'active': user.active,
+            'admin': user.admin,
+            'extern_type': user.extern_type,
+            'extern_name': user.extern_name,
+            'last_login': user.last_login,
+            'last_activity': user.last_activity,
+            'ip_addresses': user.ip_addresses,
+            'language': user_data.get('language')
+        }
+        data.update(extras)
+
+        if include_secrets:
+            data['auth_tokens'] = user.auth_tokens
+        return data
+
+    def __json__(self):
+        data = {
+            'full_name': self.full_name,
+            'full_name_or_username': self.full_name_or_username,
+            'short_contact': self.short_contact,
+            'full_contact': self.full_contact,
+        }
+        data.update(self.get_api_data())
+        return data
+
+
+class UserApiKeys(Base, BaseModel):
+    __tablename__ = 'user_api_keys'
+    __table_args__ = (
+        Index('uak_api_key_idx', 'api_key', unique=True),
+        Index('uak_api_key_expires_idx', 'api_key', 'expires'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    __mapper_args__ = {}
+
+    # ApiKey role
+    ROLE_ALL = 'token_role_all'
+    ROLE_HTTP = 'token_role_http'
+    ROLE_VCS = 'token_role_vcs'
+    ROLE_API = 'token_role_api'
+    ROLE_FEED = 'token_role_feed'
+    ROLE_PASSWORD_RESET = 'token_password_reset'
+
+    ROLES = [ROLE_ALL, ROLE_HTTP, ROLE_VCS, ROLE_API, ROLE_FEED]
+
+    user_api_key_id = Column("user_api_key_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
+    api_key = Column("api_key", String(255), nullable=False, unique=True)
+    description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
+    expires = Column('expires', Float(53), nullable=False)
+    role = Column('role', String(255), nullable=True)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+
+    # scope columns
+    repo_id = Column(
+        'repo_id', Integer(), ForeignKey('repositories.repo_id'),
+        nullable=True, unique=None, default=None)
+    repo = relationship('Repository', lazy='joined')
+
+    repo_group_id = Column(
+        'repo_group_id', Integer(), ForeignKey('groups.group_id'),
+        nullable=True, unique=None, default=None)
+    repo_group = relationship('RepoGroup', lazy='joined')
+
+    user = relationship('User', lazy='joined')
+
+    def __unicode__(self):
+        return u"<%s('%s')>" % (self.__class__.__name__, self.role)
+
+    def __json__(self):
+        data = {
+            'auth_token': self.api_key,
+            'role': self.role,
+            'scope': self.scope_humanized,
+            'expired': self.expired
+        }
+        return data
+
+    def get_api_data(self, include_secrets=False):
+        data = self.__json__()
+        if include_secrets:
+            return data
+        else:
+            data['auth_token'] = self.token_obfuscated
+            return data
+
+    @hybrid_property
+    def description_safe(self):
+        from rhodecode.lib import helpers as h
+        return h.escape(self.description)
+
+    @property
+    def expired(self):
+        if self.expires == -1:
+            return False
+        return time.time() > self.expires
+
+    @classmethod
+    def _get_role_name(cls, role):
+        return {
+            cls.ROLE_ALL: _('all'),
+            cls.ROLE_HTTP: _('http/web interface'),
+            cls.ROLE_VCS: _('vcs (git/hg/svn protocol)'),
+            cls.ROLE_API: _('api calls'),
+            cls.ROLE_FEED: _('feed access'),
+        }.get(role, role)
+
+    @property
+    def role_humanized(self):
+        return self._get_role_name(self.role)
+
+    def _get_scope(self):
+        if self.repo:
+            return repr(self.repo)
+        if self.repo_group:
+            return repr(self.repo_group) + ' (recursive)'
+        return 'global'
+
+    @property
+    def scope_humanized(self):
+        return self._get_scope()
+
+    @property
+    def token_obfuscated(self):
+        if self.api_key:
+            return self.api_key[:4] + "****"
+
+
+class UserEmailMap(Base, BaseModel):
+    __tablename__ = 'user_email_map'
+    __table_args__ = (
+        Index('uem_email_idx', 'email'),
+        UniqueConstraint('email'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    __mapper_args__ = {}
+
+    email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
+    _email = Column("email", String(255), nullable=True, unique=False, default=None)
+    user = relationship('User', lazy='joined')
+
+    @validates('_email')
+    def validate_email(self, key, email):
+        # check if this email is not main one
+        main_email = Session().query(User).filter(User.email == email).scalar()
+        if main_email is not None:
+            raise AttributeError('email %s is present is user table' % email)
+        return email
+
+    @hybrid_property
+    def email(self):
+        return self._email
+
+    @email.setter
+    def email(self, val):
+        self._email = val.lower() if val else None
+
+
+class UserIpMap(Base, BaseModel):
+    __tablename__ = 'user_ip_map'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'ip_addr'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    __mapper_args__ = {}
+
+    ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
+    ip_addr = Column("ip_addr", String(255), nullable=True, unique=False, default=None)
+    active = Column("active", Boolean(), nullable=True, unique=None, default=True)
+    description = Column("description", String(10000), nullable=True, unique=None, default=None)
+    user = relationship('User', lazy='joined')
+
+    @hybrid_property
+    def description_safe(self):
+        from rhodecode.lib import helpers as h
+        return h.escape(self.description)
+
+    @classmethod
+    def _get_ip_range(cls, ip_addr):
+        net = ipaddress.ip_network(safe_unicode(ip_addr), strict=False)
+        return [str(net.network_address), str(net.broadcast_address)]
+
+    def __json__(self):
+        return {
+          'ip_addr': self.ip_addr,
+          'ip_range': self._get_ip_range(self.ip_addr),
+        }
+
+    def __unicode__(self):
+        return u"<%s('user_id:%s=>%s')>" % (self.__class__.__name__,
+                                            self.user_id, self.ip_addr)
+
+
+class UserSshKeys(Base, BaseModel):
+    __tablename__ = 'user_ssh_keys'
+    __table_args__ = (
+        Index('usk_ssh_key_fingerprint_idx', 'ssh_key_fingerprint'),
+
+        UniqueConstraint('ssh_key_fingerprint'),
+
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    __mapper_args__ = {}
+
+    ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
+    ssh_key_fingerprint = Column('ssh_key_fingerprint', String(255), nullable=False, unique=None, default=None)
+
+    description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
+
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    accessed_on = Column('accessed_on', DateTime(timezone=False), nullable=True, default=None)
+    user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
+
+    user = relationship('User', lazy='joined')
+
+    def __json__(self):
+        data = {
+            'ssh_fingerprint': self.ssh_key_fingerprint,
+            'description': self.description,
+            'created_on': self.created_on
+        }
+        return data
+
+    def get_api_data(self):
+        data = self.__json__()
+        return data
+
+
+class UserLog(Base, BaseModel):
+    __tablename__ = 'user_logs'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    VERSION_1 = 'v1'
+    VERSION_2 = 'v2'
+    VERSIONS = [VERSION_1, VERSION_2]
+
+    user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id',ondelete='SET NULL'), nullable=True, unique=None, default=None)
+    username = Column("username", String(255), nullable=True, unique=None, default=None)
+    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id', ondelete='SET NULL'), nullable=True, unique=None, default=None)
+    repository_name = Column("repository_name", String(255), nullable=True, unique=None, default=None)
+    user_ip = Column("user_ip", String(255), nullable=True, unique=None, default=None)
+    action = Column("action", Text().with_variant(Text(1200000), 'mysql'), nullable=True, unique=None, default=None)
+    action_date = Column("action_date", DateTime(timezone=False), nullable=True, unique=None, default=None)
+
+    version = Column("version", String(255), nullable=True, default=VERSION_1)
+    user_data = Column('user_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=LONGTEXT()))))
+    action_data = Column('action_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=LONGTEXT()))))
+
+    def __unicode__(self):
+        return u"<%s('id:%s:%s')>" % (
+            self.__class__.__name__, self.repository_name, self.action)
+
+    def __json__(self):
+        return {
+            'user_id': self.user_id,
+            'username': self.username,
+            'repository_id': self.repository_id,
+            'repository_name': self.repository_name,
+            'user_ip': self.user_ip,
+            'action_date': self.action_date,
+            'action': self.action,
+        }
+
+    @hybrid_property
+    def entry_id(self):
+        return self.user_log_id
+
+    @property
+    def action_as_day(self):
+        return datetime.date(*self.action_date.timetuple()[:3])
+
+    user = relationship('User')
+    repository = relationship('Repository', cascade='')
+
+
+class UserGroup(Base, BaseModel):
+    __tablename__ = 'users_groups'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    users_group_name = Column("users_group_name", String(255), nullable=False, unique=True, default=None)
+    user_group_description = Column("user_group_description", String(10000), nullable=True, unique=None, default=None)
+    users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)
+    inherit_default_permissions = Column("users_group_inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    _group_data = Column("group_data", LargeBinary(), nullable=True)  # JSON data
+
+    members = relationship('UserGroupMember', cascade="all, delete, delete-orphan", lazy="joined")
+    users_group_to_perm = relationship('UserGroupToPerm', cascade='all')
+    users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
+    users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
+    user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
+    user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
+
+    user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
+    user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")
+
+    @classmethod
+    def _load_group_data(cls, column):
+        if not column:
+            return {}
+
+        try:
+            return json.loads(column) or {}
+        except TypeError:
+            return {}
+
+    @hybrid_property
+    def description_safe(self):
+        from rhodecode.lib import helpers as h
+        return h.escape(self.user_group_description)
+
+    @hybrid_property
+    def group_data(self):
+        return self._load_group_data(self._group_data)
+
+    @group_data.expression
+    def group_data(self, **kwargs):
+        return self._group_data
+
+    @group_data.setter
+    def group_data(self, val):
+        try:
+            self._group_data = json.dumps(val)
+        except Exception:
+            log.error(traceback.format_exc())
+
+    @classmethod
+    def _load_sync(cls, group_data):
+        if group_data:
+            return group_data.get('extern_type')
+
+    @property
+    def sync(self):
+        return self._load_sync(self.group_data)
+
+    def __unicode__(self):
+        return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
+                                      self.users_group_id,
+                                      self.users_group_name)
+
+    @classmethod
+    def get_by_group_name(cls, group_name, cache=False,
+                          case_insensitive=False):
+        if case_insensitive:
+            q = cls.query().filter(func.lower(cls.users_group_name) ==
+                                   func.lower(group_name))
+
+        else:
+            q = cls.query().filter(cls.users_group_name == group_name)
+        if cache:
+            q = q.options(
+                FromCache("sql_cache_short", "get_group_%s" % _hash_key(group_name)))
+        return q.scalar()
+
+    @classmethod
+    def get(cls, user_group_id, cache=False):
+        if not user_group_id:
+            return
+
+        user_group = cls.query()
+        if cache:
+            user_group = user_group.options(
+                FromCache("sql_cache_short", "get_users_group_%s" % user_group_id))
+        return user_group.get(user_group_id)
+
+    def permissions(self, with_admins=True, with_owner=True):
+        q = UserUserGroupToPerm.query().filter(UserUserGroupToPerm.user_group == self)
+        q = q.options(joinedload(UserUserGroupToPerm.user_group),
+                      joinedload(UserUserGroupToPerm.user),
+                      joinedload(UserUserGroupToPerm.permission),)
+
+        # get owners and admins and permissions. We do a trick of re-writing
+        # objects from sqlalchemy to named-tuples due to sqlalchemy session
+        # has a global reference and changing one object propagates to all
+        # others. This means if admin is also an owner admin_row that change
+        # would propagate to both objects
+        perm_rows = []
+        for _usr in q.all():
+            usr = AttributeDict(_usr.user.get_dict())
+            usr.permission = _usr.permission.permission_name
+            perm_rows.append(usr)
+
+        # filter the perm rows by 'default' first and then sort them by
+        # admin,write,read,none permissions sorted again alphabetically in
+        # each group
+        perm_rows = sorted(perm_rows, key=display_user_sort)
+
+        _admin_perm = 'usergroup.admin'
+        owner_row = []
+        if with_owner:
+            usr = AttributeDict(self.user.get_dict())
+            usr.owner_row = True
+            usr.permission = _admin_perm
+            owner_row.append(usr)
+
+        super_admin_rows = []
+        if with_admins:
+            for usr in User.get_all_super_admins():
+                # if this admin is also owner, don't double the record
+                if usr.user_id == owner_row[0].user_id:
+                    owner_row[0].admin_row = True
+                else:
+                    usr = AttributeDict(usr.get_dict())
+                    usr.admin_row = True
+                    usr.permission = _admin_perm
+                    super_admin_rows.append(usr)
+
+        return super_admin_rows + owner_row + perm_rows
+
+    def permission_user_groups(self):
+        q = UserGroupUserGroupToPerm.query().filter(UserGroupUserGroupToPerm.target_user_group == self)
+        q = q.options(joinedload(UserGroupUserGroupToPerm.user_group),
+                      joinedload(UserGroupUserGroupToPerm.target_user_group),
+                      joinedload(UserGroupUserGroupToPerm.permission),)
+
+        perm_rows = []
+        for _user_group in q.all():
+            usr = AttributeDict(_user_group.user_group.get_dict())
+            usr.permission = _user_group.permission.permission_name
+            perm_rows.append(usr)
+
+        perm_rows = sorted(perm_rows, key=display_user_group_sort)
+        return perm_rows
+
+    def _get_default_perms(self, user_group, suffix=''):
+        from rhodecode.model.permission import PermissionModel
+        return PermissionModel().get_default_perms(user_group.users_group_to_perm, suffix)
+
+    def get_default_perms(self, suffix=''):
+        return self._get_default_perms(self, suffix)
+
+    def get_api_data(self, with_group_members=True, include_secrets=False):
+        """
+        :param include_secrets: See :meth:`User.get_api_data`, this parameter is
+           basically forwarded.
+
+        """
+        user_group = self
+        data = {
+            'users_group_id': user_group.users_group_id,
+            'group_name': user_group.users_group_name,
+            'group_description': user_group.user_group_description,
+            'active': user_group.users_group_active,
+            'owner': user_group.user.username,
+            'sync': user_group.sync,
+            'owner_email': user_group.user.email,
+        }
+
+        if with_group_members:
+            users = []
+            for user in user_group.members:
+                user = user.user
+                users.append(user.get_api_data(include_secrets=include_secrets))
+            data['users'] = users
+
+        return data
+
+
+class UserGroupMember(Base, BaseModel):
+    __tablename__ = 'users_groups_members'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+
+    user = relationship('User', lazy='joined')
+    users_group = relationship('UserGroup')
+
+    def __init__(self, gr_id='', u_id=''):
+        self.users_group_id = gr_id
+        self.user_id = u_id
+
+
+class RepositoryField(Base, BaseModel):
+    __tablename__ = 'repositories_fields'
+    __table_args__ = (
+        UniqueConstraint('repository_id', 'field_key'),  # no-multi field
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    PREFIX = 'ex_'  # prefix used in form to not conflict with already existing fields
+
+    repo_field_id = Column("repo_field_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+    field_key = Column("field_key", String(250))
+    field_label = Column("field_label", String(1024), nullable=False)
+    field_value = Column("field_value", String(10000), nullable=False)
+    field_desc = Column("field_desc", String(1024), nullable=False)
+    field_type = Column("field_type", String(255), nullable=False, unique=None)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+
+    repository = relationship('Repository')
+
+    @property
+    def field_key_prefixed(self):
+        return 'ex_%s' % self.field_key
+
+    @classmethod
+    def un_prefix_key(cls, key):
+        if key.startswith(cls.PREFIX):
+            return key[len(cls.PREFIX):]
+        return key
+
+    @classmethod
+    def get_by_key_name(cls, key, repo):
+        row = cls.query()\
+                .filter(cls.repository == repo)\
+                .filter(cls.field_key == key).scalar()
+        return row
+
+
+class Repository(Base, BaseModel):
+    __tablename__ = 'repositories'
+    __table_args__ = (
+        Index('r_repo_name_idx', 'repo_name', mysql_length=255),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
+    DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}'
+    DEFAULT_CLONE_URI_SSH = 'ssh://{sys_user}@{hostname}/{repo}'
+
+    STATE_CREATED = 'repo_state_created'
+    STATE_PENDING = 'repo_state_pending'
+    STATE_ERROR = 'repo_state_error'
+
+    LOCK_AUTOMATIC = 'lock_auto'
+    LOCK_API = 'lock_api'
+    LOCK_WEB = 'lock_web'
+    LOCK_PULL = 'lock_pull'
+
+    NAME_SEP = URL_SEP
+
+    repo_id = Column(
+        "repo_id", Integer(), nullable=False, unique=True, default=None,
+        primary_key=True)
+    _repo_name = Column(
+        "repo_name", Text(), nullable=False, default=None)
+    _repo_name_hash = Column(
+        "repo_name_hash", String(255), nullable=False, unique=True)
+    repo_state = Column("repo_state", String(255), nullable=True)
+
+    clone_uri = Column(
+        "clone_uri", EncryptedTextValue(), nullable=True, unique=False,
+        default=None)
+    push_uri = Column(
+        "push_uri", EncryptedTextValue(), nullable=True, unique=False,
+        default=None)
+    repo_type = Column(
+        "repo_type", String(255), nullable=False, unique=False, default=None)
+    user_id = Column(
+        "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
+        unique=False, default=None)
+    private = Column(
+        "private", Boolean(), nullable=True, unique=None, default=None)
+    enable_statistics = Column(
+        "statistics", Boolean(), nullable=True, unique=None, default=True)
+    enable_downloads = Column(
+        "downloads", Boolean(), nullable=True, unique=None, default=True)
+    description = Column(
+        "description", String(10000), nullable=True, unique=None, default=None)
+    created_on = Column(
+        'created_on', DateTime(timezone=False), nullable=True, unique=None,
+        default=datetime.datetime.now)
+    updated_on = Column(
+        'updated_on', DateTime(timezone=False), nullable=True, unique=None,
+        default=datetime.datetime.now)
+    _landing_revision = Column(
+        "landing_revision", String(255), nullable=False, unique=False,
+        default=None)
+    enable_locking = Column(
+        "enable_locking", Boolean(), nullable=False, unique=None,
+        default=False)
+    _locked = Column(
+        "locked", String(255), nullable=True, unique=False, default=None)
+    _changeset_cache = Column(
+        "changeset_cache", LargeBinary(), nullable=True)  # JSON data
+
+    fork_id = Column(
+        "fork_id", Integer(), ForeignKey('repositories.repo_id'),
+        nullable=True, unique=False, default=None)
+    group_id = Column(
+        "group_id", Integer(), ForeignKey('groups.group_id'), nullable=True,
+        unique=False, default=None)
+
+    user = relationship('User', lazy='joined')
+    fork = relationship('Repository', remote_side=repo_id, lazy='joined')
+    group = relationship('RepoGroup', lazy='joined')
+    repo_to_perm = relationship(
+        'UserRepoToPerm', cascade='all',
+        order_by='UserRepoToPerm.repo_to_perm_id')
+    users_group_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
+    stats = relationship('Statistics', cascade='all', uselist=False)
+
+    followers = relationship(
+        'UserFollowing',
+        primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id',
+        cascade='all')
+    extra_fields = relationship(
+        'RepositoryField', cascade="all, delete, delete-orphan")
+    logs = relationship('UserLog')
+    comments = relationship(
+        'ChangesetComment', cascade="all, delete, delete-orphan")
+    pull_requests_source = relationship(
+        'PullRequest',
+        primaryjoin='PullRequest.source_repo_id==Repository.repo_id',
+        cascade="all, delete, delete-orphan")
+    pull_requests_target = relationship(
+        'PullRequest',
+        primaryjoin='PullRequest.target_repo_id==Repository.repo_id',
+        cascade="all, delete, delete-orphan")
+    ui = relationship('RepoRhodeCodeUi', cascade="all")
+    settings = relationship('RepoRhodeCodeSetting', cascade="all")
+    integrations = relationship('Integration',
+                                cascade="all, delete, delete-orphan")
+
+    scoped_tokens = relationship('UserApiKeys', cascade="all")
+
+    def __unicode__(self):
+        return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,
+                                   safe_unicode(self.repo_name))
+
+    @hybrid_property
+    def description_safe(self):
+        from rhodecode.lib import helpers as h
+        return h.escape(self.description)
+
+    @hybrid_property
+    def landing_rev(self):
+        # always should return [rev_type, rev]
+        if self._landing_revision:
+            _rev_info = self._landing_revision.split(':')
+            if len(_rev_info) < 2:
+                _rev_info.insert(0, 'rev')
+            return [_rev_info[0], _rev_info[1]]
+        return [None, None]
+
+    @landing_rev.setter
+    def landing_rev(self, val):
+        if ':' not in val:
+            raise ValueError('value must be delimited with `:` and consist '
+                             'of <rev_type>:<rev>, got %s instead' % val)
+        self._landing_revision = val
+
+    @hybrid_property
+    def locked(self):
+        if self._locked:
+            user_id, timelocked, reason = self._locked.split(':')
+            lock_values = int(user_id), timelocked, reason
+        else:
+            lock_values = [None, None, None]
+        return lock_values
+
+    @locked.setter
+    def locked(self, val):
+        if val and isinstance(val, (list, tuple)):
+            self._locked = ':'.join(map(str, val))
+        else:
+            self._locked = None
+
+    @hybrid_property
+    def changeset_cache(self):
+        from rhodecode.lib.vcs.backends.base import EmptyCommit
+        dummy = EmptyCommit().__json__()
+        if not self._changeset_cache:
+            return dummy
+        try:
+            return json.loads(self._changeset_cache)
+        except TypeError:
+            return dummy
+        except Exception:
+            log.error(traceback.format_exc())
+            return dummy
+
+    @changeset_cache.setter
+    def changeset_cache(self, val):
+        try:
+            self._changeset_cache = json.dumps(val)
+        except Exception:
+            log.error(traceback.format_exc())
+
+    @hybrid_property
+    def repo_name(self):
+        return self._repo_name
+
+    @repo_name.setter
+    def repo_name(self, value):
+        self._repo_name = value
+        self._repo_name_hash = hashlib.sha1(safe_str(value)).hexdigest()
+
+    @classmethod
+    def normalize_repo_name(cls, repo_name):
+        """
+        Normalizes os specific repo_name to the format internally stored inside
+        database using URL_SEP
+
+        :param cls:
+        :param repo_name:
+        """
+        return cls.NAME_SEP.join(repo_name.split(os.sep))
+
+    @classmethod
+    def get_by_repo_name(cls, repo_name, cache=False, identity_cache=False):
+        session = Session()
+        q = session.query(cls).filter(cls.repo_name == repo_name)
+
+        if cache:
+            if identity_cache:
+                val = cls.identity_cache(session, 'repo_name', repo_name)
+                if val:
+                    return val
+            else:
+                cache_key = "get_repo_by_name_%s" % _hash_key(repo_name)
+                q = q.options(
+                    FromCache("sql_cache_short", cache_key))
+
+        return q.scalar()
+
+    @classmethod
+    def get_by_id_or_repo_name(cls, repoid):
+        if isinstance(repoid, (int, long)):
+            try:
+                repo = cls.get(repoid)
+            except ValueError:
+                repo = None
+        else:
+            repo = cls.get_by_repo_name(repoid)
+        return repo
+
+    @classmethod
+    def get_by_full_path(cls, repo_full_path):
+        repo_name = repo_full_path.split(cls.base_path(), 1)[-1]
+        repo_name = cls.normalize_repo_name(repo_name)
+        return cls.get_by_repo_name(repo_name.strip(URL_SEP))
+
+    @classmethod
+    def get_repo_forks(cls, repo_id):
+        return cls.query().filter(Repository.fork_id == repo_id)
+
+    @classmethod
+    def base_path(cls):
+        """
+        Returns base path when all repos are stored
+
+        :param cls:
+        """
+        q = Session().query(RhodeCodeUi)\
+            .filter(RhodeCodeUi.ui_key == cls.NAME_SEP)
+        q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
+        return q.one().ui_value
+
+    @classmethod
+    def get_all_repos(cls, user_id=Optional(None), group_id=Optional(None),
+                      case_insensitive=True):
+        q = Repository.query()
+
+        if not isinstance(user_id, Optional):
+            q = q.filter(Repository.user_id == user_id)
+
+        if not isinstance(group_id, Optional):
+            q = q.filter(Repository.group_id == group_id)
+
+        if case_insensitive:
+            q = q.order_by(func.lower(Repository.repo_name))
+        else:
+            q = q.order_by(Repository.repo_name)
+        return q.all()
+
+    @property
+    def forks(self):
+        """
+        Return forks of this repo
+        """
+        return Repository.get_repo_forks(self.repo_id)
+
+    @property
+    def parent(self):
+        """
+        Returns fork parent
+        """
+        return self.fork
+
+    @property
+    def just_name(self):
+        return self.repo_name.split(self.NAME_SEP)[-1]
+
+    @property
+    def groups_with_parents(self):
+        groups = []
+        if self.group is None:
+            return groups
+
+        cur_gr = self.group
+        groups.insert(0, cur_gr)
+        while 1:
+            gr = getattr(cur_gr, 'parent_group', None)
+            cur_gr = cur_gr.parent_group
+            if gr is None:
+                break
+            groups.insert(0, gr)
+
+        return groups
+
+    @property
+    def groups_and_repo(self):
+        return self.groups_with_parents, self
+
+    @LazyProperty
+    def repo_path(self):
+        """
+        Returns base full path for that repository means where it actually
+        exists on a filesystem
+        """
+        q = Session().query(RhodeCodeUi).filter(
+            RhodeCodeUi.ui_key == self.NAME_SEP)
+        q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
+        return q.one().ui_value
+
+    @property
+    def repo_full_path(self):
+        p = [self.repo_path]
+        # we need to split the name by / since this is how we store the
+        # names in the database, but that eventually needs to be converted
+        # into a valid system path
+        p += self.repo_name.split(self.NAME_SEP)
+        return os.path.join(*map(safe_unicode, p))
+
+    @property
+    def cache_keys(self):
+        """
+        Returns associated cache keys for that repo
+        """
+        return CacheKey.query()\
+            .filter(CacheKey.cache_args == self.repo_name)\
+            .order_by(CacheKey.cache_key)\
+            .all()
+
+    @property
+    def cached_diffs_relative_dir(self):
+        """
+        Return a relative to the repository store path of cached diffs
+        used for safe display for users, who shouldn't know the absolute store
+        path
+        """
+        return os.path.join(
+            os.path.dirname(self.repo_name),
+            self.cached_diffs_dir.split(os.path.sep)[-1])
+
+    @property
+    def cached_diffs_dir(self):
+        path = self.repo_full_path
+        return os.path.join(
+            os.path.dirname(path),
+            '.__shadow_diff_cache_repo_{}'.format(self.repo_id))
+
+    def cached_diffs(self):
+        diff_cache_dir = self.cached_diffs_dir
+        if os.path.isdir(diff_cache_dir):
+            return os.listdir(diff_cache_dir)
+        return []
+
+    def get_new_name(self, repo_name):
+        """
+        returns new full repository name based on assigned group and new new
+
+        :param group_name:
+        """
+        path_prefix = self.group.full_path_splitted if self.group else []
+        return self.NAME_SEP.join(path_prefix + [repo_name])
+
+    @property
+    def _config(self):
+        """
+        Returns db based config object.
+        """
+        from rhodecode.lib.utils import make_db_config
+        return make_db_config(clear_session=False, repo=self)
+
+    def permissions(self, with_admins=True, with_owner=True):
+        q = UserRepoToPerm.query().filter(UserRepoToPerm.repository == self)
+        q = q.options(joinedload(UserRepoToPerm.repository),
+                      joinedload(UserRepoToPerm.user),
+                      joinedload(UserRepoToPerm.permission),)
+
+        # get owners and admins and permissions. We do a trick of re-writing
+        # objects from sqlalchemy to named-tuples due to sqlalchemy session
+        # has a global reference and changing one object propagates to all
+        # others. This means if admin is also an owner admin_row that change
+        # would propagate to both objects
+        perm_rows = []
+        for _usr in q.all():
+            usr = AttributeDict(_usr.user.get_dict())
+            usr.permission = _usr.permission.permission_name
+            usr.permission_id = _usr.repo_to_perm_id
+            perm_rows.append(usr)
+
+        # filter the perm rows by 'default' first and then sort them by
+        # admin,write,read,none permissions sorted again alphabetically in
+        # each group
+        perm_rows = sorted(perm_rows, key=display_user_sort)
+
+        _admin_perm = 'repository.admin'
+        owner_row = []
+        if with_owner:
+            usr = AttributeDict(self.user.get_dict())
+            usr.owner_row = True
+            usr.permission = _admin_perm
+            usr.permission_id = None
+            owner_row.append(usr)
+
+        super_admin_rows = []
+        if with_admins:
+            for usr in User.get_all_super_admins():
+                # if this admin is also owner, don't double the record
+                if usr.user_id == owner_row[0].user_id:
+                    owner_row[0].admin_row = True
+                else:
+                    usr = AttributeDict(usr.get_dict())
+                    usr.admin_row = True
+                    usr.permission = _admin_perm
+                    usr.permission_id = None
+                    super_admin_rows.append(usr)
+
+        return super_admin_rows + owner_row + perm_rows
+
+    def permission_user_groups(self):
+        q = UserGroupRepoToPerm.query().filter(
+            UserGroupRepoToPerm.repository == self)
+        q = q.options(joinedload(UserGroupRepoToPerm.repository),
+                      joinedload(UserGroupRepoToPerm.users_group),
+                      joinedload(UserGroupRepoToPerm.permission),)
+
+        perm_rows = []
+        for _user_group in q.all():
+            usr = AttributeDict(_user_group.users_group.get_dict())
+            usr.permission = _user_group.permission.permission_name
+            perm_rows.append(usr)
+
+        perm_rows = sorted(perm_rows, key=display_user_group_sort)
+        return perm_rows
+
+    def get_api_data(self, include_secrets=False):
+        """
+        Common function for generating repo api data
+
+        :param include_secrets: See :meth:`User.get_api_data`.
+
+        """
+        # TODO: mikhail: Here there is an anti-pattern, we probably need to
+        # move this methods on models level.
+        from rhodecode.model.settings import SettingsModel
+        from rhodecode.model.repo import RepoModel
+
+        repo = self
+        _user_id, _time, _reason = self.locked
+
+        data = {
+            'repo_id': repo.repo_id,
+            'repo_name': repo.repo_name,
+            'repo_type': repo.repo_type,
+            'clone_uri': repo.clone_uri or '',
+            'push_uri': repo.push_uri or '',
+            'url': RepoModel().get_url(self),
+            'private': repo.private,
+            'created_on': repo.created_on,
+            'description': repo.description_safe,
+            'landing_rev': repo.landing_rev,
+            'owner': repo.user.username,
+            'fork_of': repo.fork.repo_name if repo.fork else None,
+            'fork_of_id': repo.fork.repo_id if repo.fork else None,
+            'enable_statistics': repo.enable_statistics,
+            'enable_locking': repo.enable_locking,
+            'enable_downloads': repo.enable_downloads,
+            'last_changeset': repo.changeset_cache,
+            'locked_by': User.get(_user_id).get_api_data(
+                include_secrets=include_secrets) if _user_id else None,
+            'locked_date': time_to_datetime(_time) if _time else None,
+            'lock_reason': _reason if _reason else None,
+        }
+
+        # TODO: mikhail: should be per-repo settings here
+        rc_config = SettingsModel().get_all_settings()
+        repository_fields = str2bool(
+            rc_config.get('rhodecode_repository_fields'))
+        if repository_fields:
+            for f in self.extra_fields:
+                data[f.field_key_prefixed] = f.field_value
+
+        return data
+
+    @classmethod
+    def lock(cls, repo, user_id, lock_time=None, lock_reason=None):
+        if not lock_time:
+            lock_time = time.time()
+        if not lock_reason:
+            lock_reason = cls.LOCK_AUTOMATIC
+        repo.locked = [user_id, lock_time, lock_reason]
+        Session().add(repo)
+        Session().commit()
+
+    @classmethod
+    def unlock(cls, repo):
+        repo.locked = None
+        Session().add(repo)
+        Session().commit()
+
+    @classmethod
+    def getlock(cls, repo):
+        return repo.locked
+
+    def is_user_lock(self, user_id):
+        if self.lock[0]:
+            lock_user_id = safe_int(self.lock[0])
+            user_id = safe_int(user_id)
+            # both are ints, and they are equal
+            return all([lock_user_id, user_id]) and lock_user_id == user_id
+
+        return False
+
+    def get_locking_state(self, action, user_id, only_when_enabled=True):
+        """
+        Checks locking on this repository, if locking is enabled and lock is
+        present returns a tuple of make_lock, locked, locked_by.
+        make_lock can have 3 states None (do nothing) True, make lock
+        False release lock, This value is later propagated to hooks, which
+        do the locking. Think about this as signals passed to hooks what to do.
+
+        """
+        # TODO: johbo: This is part of the business logic and should be moved
+        # into the RepositoryModel.
+
+        if action not in ('push', 'pull'):
+            raise ValueError("Invalid action value: %s" % repr(action))
+
+        # defines if locked error should be thrown to user
+        currently_locked = False
+        # defines if new lock should be made, tri-state
+        make_lock = None
+        repo = self
+        user = User.get(user_id)
+
+        lock_info = repo.locked
+
+        if repo and (repo.enable_locking or not only_when_enabled):
+            if action == 'push':
+                # check if it's already locked !, if it is compare users
+                locked_by_user_id = lock_info[0]
+                if user.user_id == locked_by_user_id:
+                    log.debug(
+                        'Got `push` action from user %s, now unlocking', user)
+                    # unlock if we have push from user who locked
+                    make_lock = False
+                else:
+                    # we're not the same user who locked, ban with
+                    # code defined in settings (default is 423 HTTP Locked) !
+                    log.debug('Repo %s is currently locked by %s', repo, user)
+                    currently_locked = True
+            elif action == 'pull':
+                # [0] user [1] date
+                if lock_info[0] and lock_info[1]:
+                    log.debug('Repo %s is currently locked by %s', repo, user)
+                    currently_locked = True
+                else:
+                    log.debug('Setting lock on repo %s by %s', repo, user)
+                    make_lock = True
+
+        else:
+            log.debug('Repository %s do not have locking enabled', repo)
+
+        log.debug('FINAL locking values make_lock:%s,locked:%s,locked_by:%s',
+                  make_lock, currently_locked, lock_info)
+
+        from rhodecode.lib.auth import HasRepoPermissionAny
+        perm_check = HasRepoPermissionAny('repository.write', 'repository.admin')
+        if make_lock and not perm_check(repo_name=repo.repo_name, user=user):
+            # if we don't have at least write permission we cannot make a lock
+            log.debug('lock state reset back to FALSE due to lack '
+                      'of at least read permission')
+            make_lock = False
+
+        return make_lock, currently_locked, lock_info
+
+    @property
+    def last_db_change(self):
+        return self.updated_on
+
+    @property
+    def clone_uri_hidden(self):
+        clone_uri = self.clone_uri
+        if clone_uri:
+            import urlobject
+            url_obj = urlobject.URLObject(cleaned_uri(clone_uri))
+            if url_obj.password:
+                clone_uri = url_obj.with_password('*****')
+        return clone_uri
+
+    @property
+    def push_uri_hidden(self):
+        push_uri = self.push_uri
+        if push_uri:
+            import urlobject
+            url_obj = urlobject.URLObject(cleaned_uri(push_uri))
+            if url_obj.password:
+                push_uri = url_obj.with_password('*****')
+        return push_uri
+
+    def clone_url(self, **override):
+        from rhodecode.model.settings import SettingsModel
+
+        uri_tmpl = None
+        if 'with_id' in override:
+            uri_tmpl = self.DEFAULT_CLONE_URI_ID
+            del override['with_id']
+
+        if 'uri_tmpl' in override:
+            uri_tmpl = override['uri_tmpl']
+            del override['uri_tmpl']
+
+        ssh = False
+        if 'ssh' in override:
+            ssh = True
+            del override['ssh']
+
+        # we didn't override our tmpl from **overrides
+        if not uri_tmpl:
+            rc_config = SettingsModel().get_all_settings(cache=True)
+            if ssh:
+                uri_tmpl = rc_config.get(
+                    'rhodecode_clone_uri_ssh_tmpl') or self.DEFAULT_CLONE_URI_SSH
+            else:
+                uri_tmpl = rc_config.get(
+                    'rhodecode_clone_uri_tmpl') or self.DEFAULT_CLONE_URI
+
+        request = get_current_request()
+        return get_clone_url(request=request,
+                             uri_tmpl=uri_tmpl,
+                             repo_name=self.repo_name,
+                             repo_id=self.repo_id, **override)
+
+    def set_state(self, state):
+        self.repo_state = state
+        Session().add(self)
+    #==========================================================================
+    # SCM PROPERTIES
+    #==========================================================================
+
+    def get_commit(self, commit_id=None, commit_idx=None, pre_load=None):
+        return get_commit_safe(
+            self.scm_instance(), commit_id, commit_idx, pre_load=pre_load)
+
+    def get_changeset(self, rev=None, pre_load=None):
+        warnings.warn("Use get_commit", DeprecationWarning)
+        commit_id = None
+        commit_idx = None
+        if isinstance(rev, basestring):
+            commit_id = rev
+        else:
+            commit_idx = rev
+        return self.get_commit(commit_id=commit_id, commit_idx=commit_idx,
+                               pre_load=pre_load)
+
+    def get_landing_commit(self):
+        """
+        Returns landing commit, or if that doesn't exist returns the tip
+        """
+        _rev_type, _rev = self.landing_rev
+        commit = self.get_commit(_rev)
+        if isinstance(commit, EmptyCommit):
+            return self.get_commit()
+        return commit
+
+    def update_commit_cache(self, cs_cache=None, config=None):
+        """
+        Update cache of last changeset for repository, keys should be::
+
+            short_id
+            raw_id
+            revision
+            parents
+            message
+            date
+            author
+
+        :param cs_cache:
+        """
+        from rhodecode.lib.vcs.backends.base import BaseChangeset
+        if cs_cache is None:
+            # use no-cache version here
+            scm_repo = self.scm_instance(cache=False, config=config)
+            if scm_repo:
+                cs_cache = scm_repo.get_commit(
+                    pre_load=["author", "date", "message", "parents"])
+            else:
+                cs_cache = EmptyCommit()
+
+        if isinstance(cs_cache, BaseChangeset):
+            cs_cache = cs_cache.__json__()
+
+        def is_outdated(new_cs_cache):
+            if (new_cs_cache['raw_id'] != self.changeset_cache['raw_id'] or
+                new_cs_cache['revision'] != self.changeset_cache['revision']):
+                return True
+            return False
+
+        # check if we have maybe already latest cached revision
+        if is_outdated(cs_cache) or not self.changeset_cache:
+            _default = datetime.datetime.fromtimestamp(0)
+            last_change = cs_cache.get('date') or _default
+            log.debug('updated repo %s with new cs cache %s',
+                      self.repo_name, cs_cache)
+            self.updated_on = last_change
+            self.changeset_cache = cs_cache
+            Session().add(self)
+            Session().commit()
+        else:
+            log.debug('Skipping update_commit_cache for repo:`%s` '
+                      'commit already with latest changes', self.repo_name)
+
+    @property
+    def tip(self):
+        return self.get_commit('tip')
+
+    @property
+    def author(self):
+        return self.tip.author
+
+    @property
+    def last_change(self):
+        return self.scm_instance().last_change
+
+    def get_comments(self, revisions=None):
+        """
+        Returns comments for this repository grouped by revisions
+
+        :param revisions: filter query by revisions only
+        """
+        cmts = ChangesetComment.query()\
+            .filter(ChangesetComment.repo == self)
+        if revisions:
+            cmts = cmts.filter(ChangesetComment.revision.in_(revisions))
+        grouped = collections.defaultdict(list)
+        for cmt in cmts.all():
+            grouped[cmt.revision].append(cmt)
+        return grouped
+
+    def statuses(self, revisions=None):
+        """
+        Returns statuses for this repository
+
+        :param revisions: list of revisions to get statuses for
+        """
+        statuses = ChangesetStatus.query()\
+            .filter(ChangesetStatus.repo == self)\
+            .filter(ChangesetStatus.version == 0)
+
+        if revisions:
+            # Try doing the filtering in chunks to avoid hitting limits
+            size = 500
+            status_results = []
+            for chunk in xrange(0, len(revisions), size):
+                status_results += statuses.filter(
+                    ChangesetStatus.revision.in_(
+                        revisions[chunk: chunk+size])
+                ).all()
+        else:
+            status_results = statuses.all()
+
+        grouped = {}
+
+        # maybe we have open new pullrequest without a status?
+        stat = ChangesetStatus.STATUS_UNDER_REVIEW
+        status_lbl = ChangesetStatus.get_status_lbl(stat)
+        for pr in PullRequest.query().filter(PullRequest.source_repo == self).all():
+            for rev in pr.revisions:
+                pr_id = pr.pull_request_id
+                pr_repo = pr.target_repo.repo_name
+                grouped[rev] = [stat, status_lbl, pr_id, pr_repo]
+
+        for stat in status_results:
+            pr_id = pr_repo = None
+            if stat.pull_request:
+                pr_id = stat.pull_request.pull_request_id
+                pr_repo = stat.pull_request.target_repo.repo_name
+            grouped[stat.revision] = [str(stat.status), stat.status_lbl,
+                                      pr_id, pr_repo]
+        return grouped
+
+    # ==========================================================================
+    # SCM CACHE INSTANCE
+    # ==========================================================================
+
+    def scm_instance(self, **kwargs):
+        import rhodecode
+
+        # Passing a config will not hit the cache currently only used
+        # for repo2dbmapper
+        config = kwargs.pop('config', None)
+        cache = kwargs.pop('cache', None)
+        full_cache = str2bool(rhodecode.CONFIG.get('vcs_full_cache'))
+        # if cache is NOT defined use default global, else we have a full
+        # control over cache behaviour
+        if cache is None and full_cache and not config:
+            return self._get_instance_cached()
+        return self._get_instance(cache=bool(cache), config=config)
+
+    def _get_instance_cached(self):
+        return self._get_instance()
+
+    def _get_instance(self, cache=True, config=None):
+        config = config or self._config
+        custom_wire = {
+            'cache': cache  # controls the vcs.remote cache
+        }
+        repo = get_vcs_instance(
+            repo_path=safe_str(self.repo_full_path),
+            config=config,
+            with_wire=custom_wire,
+            create=False,
+            _vcs_alias=self.repo_type)
+
+        return repo
+
+    def __json__(self):
+        return {'landing_rev': self.landing_rev}
+
+    def get_dict(self):
+
+        # Since we transformed `repo_name` to a hybrid property, we need to
+        # keep compatibility with the code which uses `repo_name` field.
+
+        result = super(Repository, self).get_dict()
+        result['repo_name'] = result.pop('_repo_name', None)
+        return result
+
+
+class RepoGroup(Base, BaseModel):
+    __tablename__ = 'groups'
+    __table_args__ = (
+        UniqueConstraint('group_name', 'group_parent_id'),
+        CheckConstraint('group_id != group_parent_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    __mapper_args__ = {'order_by': 'group_name'}
+
+    CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
+
+    group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
+    group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
+    group_description = Column("group_description", String(10000), nullable=True, unique=None, default=None)
+    enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    updated_on = Column('updated_on', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
+    personal = Column('personal', Boolean(), nullable=True, unique=None, default=None)
+
+    repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
+    users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
+    parent_group = relationship('RepoGroup', remote_side=group_id)
+    user = relationship('User')
+    integrations = relationship('Integration',
+                                cascade="all, delete, delete-orphan")
+
+    def __init__(self, group_name='', parent_group=None):
+        self.group_name = group_name
+        self.parent_group = parent_group
+
+    def __unicode__(self):
+        return u"<%s('id:%s:%s')>" % (
+            self.__class__.__name__, self.group_id, self.group_name)
+
+    @hybrid_property
+    def description_safe(self):
+        from rhodecode.lib import helpers as h
+        return h.escape(self.group_description)
+
+    @classmethod
+    def _generate_choice(cls, repo_group):
+        from webhelpers.html import literal as _literal
+        _name = lambda k: _literal(cls.CHOICES_SEPARATOR.join(k))
+        return repo_group.group_id, _name(repo_group.full_path_splitted)
+
+    @classmethod
+    def groups_choices(cls, groups=None, show_empty_group=True):
+        if not groups:
+            groups = cls.query().all()
+
+        repo_groups = []
+        if show_empty_group:
+            repo_groups = [(-1, u'-- %s --' % _('No parent'))]
+
+        repo_groups.extend([cls._generate_choice(x) for x in groups])
+
+        repo_groups = sorted(
+            repo_groups, key=lambda t: t[1].split(cls.CHOICES_SEPARATOR)[0])
+        return repo_groups
+
+    @classmethod
+    def url_sep(cls):
+        return URL_SEP
+
+    @classmethod
+    def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
+        if case_insensitive:
+            gr = cls.query().filter(func.lower(cls.group_name)
+                                    == func.lower(group_name))
+        else:
+            gr = cls.query().filter(cls.group_name == group_name)
+        if cache:
+            name_key = _hash_key(group_name)
+            gr = gr.options(
+                FromCache("sql_cache_short", "get_group_%s" % name_key))
+        return gr.scalar()
+
+    @classmethod
+    def get_user_personal_repo_group(cls, user_id):
+        user = User.get(user_id)
+        if user.username == User.DEFAULT_USER:
+            return None
+
+        return cls.query()\
+            .filter(cls.personal == true()) \
+            .filter(cls.user == user).scalar()
+
+    @classmethod
+    def get_all_repo_groups(cls, user_id=Optional(None), group_id=Optional(None),
+                            case_insensitive=True):
+        q = RepoGroup.query()
+
+        if not isinstance(user_id, Optional):
+            q = q.filter(RepoGroup.user_id == user_id)
+
+        if not isinstance(group_id, Optional):
+            q = q.filter(RepoGroup.group_parent_id == group_id)
+
+        if case_insensitive:
+            q = q.order_by(func.lower(RepoGroup.group_name))
+        else:
+            q = q.order_by(RepoGroup.group_name)
+        return q.all()
+
+    @property
+    def parents(self):
+        parents_recursion_limit = 10
+        groups = []
+        if self.parent_group is None:
+            return groups
+        cur_gr = self.parent_group
+        groups.insert(0, cur_gr)
+        cnt = 0
+        while 1:
+            cnt += 1
+            gr = getattr(cur_gr, 'parent_group', None)
+            cur_gr = cur_gr.parent_group
+            if gr is None:
+                break
+            if cnt == parents_recursion_limit:
+                # this will prevent accidental infinit loops
+                log.error(('more than %s parents found for group %s, stopping '
+                           'recursive parent fetching' % (parents_recursion_limit, self)))
+                break
+
+            groups.insert(0, gr)
+        return groups
+
+    @property
+    def last_db_change(self):
+        return self.updated_on
+
+    @property
+    def children(self):
+        return RepoGroup.query().filter(RepoGroup.parent_group == self)
+
+    @property
+    def name(self):
+        return self.group_name.split(RepoGroup.url_sep())[-1]
+
+    @property
+    def full_path(self):
+        return self.group_name
+
+    @property
+    def full_path_splitted(self):
+        return self.group_name.split(RepoGroup.url_sep())
+
+    @property
+    def repositories(self):
+        return Repository.query()\
+                .filter(Repository.group == self)\
+                .order_by(Repository.repo_name)
+
+    @property
+    def repositories_recursive_count(self):
+        cnt = self.repositories.count()
+
+        def children_count(group):
+            cnt = 0
+            for child in group.children:
+                cnt += child.repositories.count()
+                cnt += children_count(child)
+            return cnt
+
+        return cnt + children_count(self)
+
+    def _recursive_objects(self, include_repos=True):
+        all_ = []
+
+        def _get_members(root_gr):
+            if include_repos:
+                for r in root_gr.repositories:
+                    all_.append(r)
+            childs = root_gr.children.all()
+            if childs:
+                for gr in childs:
+                    all_.append(gr)
+                    _get_members(gr)
+
+        _get_members(self)
+        return [self] + all_
+
+    def recursive_groups_and_repos(self):
+        """
+        Recursive return all groups, with repositories in those groups
+        """
+        return self._recursive_objects()
+
+    def recursive_groups(self):
+        """
+        Returns all children groups for this group including children of children
+        """
+        return self._recursive_objects(include_repos=False)
+
+    def get_new_name(self, group_name):
+        """
+        returns new full group name based on parent and new name
+
+        :param group_name:
+        """
+        path_prefix = (self.parent_group.full_path_splitted if
+                       self.parent_group else [])
+        return RepoGroup.url_sep().join(path_prefix + [group_name])
+
+    def permissions(self, with_admins=True, with_owner=True):
+        q = UserRepoGroupToPerm.query().filter(UserRepoGroupToPerm.group == self)
+        q = q.options(joinedload(UserRepoGroupToPerm.group),
+                      joinedload(UserRepoGroupToPerm.user),
+                      joinedload(UserRepoGroupToPerm.permission),)
+
+        # get owners and admins and permissions. We do a trick of re-writing
+        # objects from sqlalchemy to named-tuples due to sqlalchemy session
+        # has a global reference and changing one object propagates to all
+        # others. This means if admin is also an owner admin_row that change
+        # would propagate to both objects
+        perm_rows = []
+        for _usr in q.all():
+            usr = AttributeDict(_usr.user.get_dict())
+            usr.permission = _usr.permission.permission_name
+            perm_rows.append(usr)
+
+        # filter the perm rows by 'default' first and then sort them by
+        # admin,write,read,none permissions sorted again alphabetically in
+        # each group
+        perm_rows = sorted(perm_rows, key=display_user_sort)
+
+        _admin_perm = 'group.admin'
+        owner_row = []
+        if with_owner:
+            usr = AttributeDict(self.user.get_dict())
+            usr.owner_row = True
+            usr.permission = _admin_perm
+            owner_row.append(usr)
+
+        super_admin_rows = []
+        if with_admins:
+            for usr in User.get_all_super_admins():
+                # if this admin is also owner, don't double the record
+                if usr.user_id == owner_row[0].user_id:
+                    owner_row[0].admin_row = True
+                else:
+                    usr = AttributeDict(usr.get_dict())
+                    usr.admin_row = True
+                    usr.permission = _admin_perm
+                    super_admin_rows.append(usr)
+
+        return super_admin_rows + owner_row + perm_rows
+
+    def permission_user_groups(self):
+        q = UserGroupRepoGroupToPerm.query().filter(UserGroupRepoGroupToPerm.group == self)
+        q = q.options(joinedload(UserGroupRepoGroupToPerm.group),
+                      joinedload(UserGroupRepoGroupToPerm.users_group),
+                      joinedload(UserGroupRepoGroupToPerm.permission),)
+
+        perm_rows = []
+        for _user_group in q.all():
+            usr = AttributeDict(_user_group.users_group.get_dict())
+            usr.permission = _user_group.permission.permission_name
+            perm_rows.append(usr)
+
+        perm_rows = sorted(perm_rows, key=display_user_group_sort)
+        return perm_rows
+
+    def get_api_data(self):
+        """
+        Common function for generating api data
+
+        """
+        group = self
+        data = {
+            'group_id': group.group_id,
+            'group_name': group.group_name,
+            'group_description': group.description_safe,
+            'parent_group': group.parent_group.group_name if group.parent_group else None,
+            'repositories': [x.repo_name for x in group.repositories],
+            'owner': group.user.username,
+        }
+        return data
+
+
+class Permission(Base, BaseModel):
+    __tablename__ = 'permissions'
+    __table_args__ = (
+        Index('p_perm_name_idx', 'permission_name'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    PERMS = [
+        ('hg.admin', _('RhodeCode Super Administrator')),
+
+        ('repository.none', _('Repository no access')),
+        ('repository.read', _('Repository read access')),
+        ('repository.write', _('Repository write access')),
+        ('repository.admin', _('Repository admin access')),
+
+        ('group.none', _('Repository group no access')),
+        ('group.read', _('Repository group read access')),
+        ('group.write', _('Repository group write access')),
+        ('group.admin', _('Repository group admin access')),
+
+        ('usergroup.none', _('User group no access')),
+        ('usergroup.read', _('User group read access')),
+        ('usergroup.write', _('User group write access')),
+        ('usergroup.admin', _('User group admin access')),
+
+        ('branch.none', _('Branch no permissions')),
+        ('branch.merge', _('Branch access by web merge')),
+        ('branch.push', _('Branch access by push')),
+        ('branch.push_force', _('Branch access by push with force')),
+
+        ('hg.repogroup.create.false', _('Repository Group creation disabled')),
+        ('hg.repogroup.create.true', _('Repository Group creation enabled')),
+
+        ('hg.usergroup.create.false', _('User Group creation disabled')),
+        ('hg.usergroup.create.true', _('User Group creation enabled')),
+
+        ('hg.create.none', _('Repository creation disabled')),
+        ('hg.create.repository', _('Repository creation enabled')),
+        ('hg.create.write_on_repogroup.true', _('Repository creation enabled with write permission to a repository group')),
+        ('hg.create.write_on_repogroup.false', _('Repository creation disabled with write permission to a repository group')),
+
+        ('hg.fork.none', _('Repository forking disabled')),
+        ('hg.fork.repository', _('Repository forking enabled')),
+
+        ('hg.register.none', _('Registration disabled')),
+        ('hg.register.manual_activate', _('User Registration with manual account activation')),
+        ('hg.register.auto_activate', _('User Registration with automatic account activation')),
+
+        ('hg.password_reset.enabled', _('Password reset enabled')),
+        ('hg.password_reset.hidden', _('Password reset hidden')),
+        ('hg.password_reset.disabled', _('Password reset disabled')),
+
+        ('hg.extern_activate.manual', _('Manual activation of external account')),
+        ('hg.extern_activate.auto', _('Automatic activation of external account')),
+
+        ('hg.inherit_default_perms.false', _('Inherit object permissions from default user disabled')),
+        ('hg.inherit_default_perms.true', _('Inherit object permissions from default user enabled')),
+    ]
+
+    # definition of system default permissions for DEFAULT user, created on
+    # system setup
+    DEFAULT_USER_PERMISSIONS = [
+        # object perms
+        'repository.read',
+        'group.read',
+        'usergroup.read',
+        # branch
+        'branch.push',
+        # global
+        'hg.create.repository',
+        'hg.repogroup.create.false',
+        'hg.usergroup.create.false',
+        'hg.create.write_on_repogroup.true',
+        'hg.fork.repository',
+        'hg.register.manual_activate',
+        'hg.password_reset.enabled',
+        'hg.extern_activate.auto',
+        'hg.inherit_default_perms.true',
+    ]
+
+    # defines which permissions are more important higher the more important
+    # Weight defines which permissions are more important.
+    # The higher number the more important.
+    PERM_WEIGHTS = {
+        'repository.none': 0,
+        'repository.read': 1,
+        'repository.write': 3,
+        'repository.admin': 4,
+
+        'group.none': 0,
+        'group.read': 1,
+        'group.write': 3,
+        'group.admin': 4,
+
+        'usergroup.none': 0,
+        'usergroup.read': 1,
+        'usergroup.write': 3,
+        'usergroup.admin': 4,
+
+        'branch.none': 0,
+        'branch.merge': 1,
+        'branch.push': 3,
+        'branch.push_force': 4,
+
+        'hg.repogroup.create.false': 0,
+        'hg.repogroup.create.true': 1,
+
+        'hg.usergroup.create.false': 0,
+        'hg.usergroup.create.true': 1,
+
+        'hg.fork.none': 0,
+        'hg.fork.repository': 1,
+        'hg.create.none': 0,
+        'hg.create.repository': 1
+    }
+
+    permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    permission_name = Column("permission_name", String(255), nullable=True, unique=None, default=None)
+    permission_longname = Column("permission_longname", String(255), nullable=True, unique=None, default=None)
+
+    def __unicode__(self):
+        return u"<%s('%s:%s')>" % (
+            self.__class__.__name__, self.permission_id, self.permission_name
+        )
+
+    @classmethod
+    def get_by_key(cls, key):
+        return cls.query().filter(cls.permission_name == key).scalar()
+
+    @classmethod
+    def get_default_repo_perms(cls, user_id, repo_id=None):
+        q = Session().query(UserRepoToPerm, Repository, Permission)\
+            .join((Permission, UserRepoToPerm.permission_id == Permission.permission_id))\
+            .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\
+            .filter(UserRepoToPerm.user_id == user_id)
+        if repo_id:
+            q = q.filter(UserRepoToPerm.repository_id == repo_id)
+        return q.all()
+
+    @classmethod
+    def get_default_repo_perms_from_user_group(cls, user_id, repo_id=None):
+        q = Session().query(UserGroupRepoToPerm, Repository, Permission)\
+            .join(
+                Permission,
+                UserGroupRepoToPerm.permission_id == Permission.permission_id)\
+            .join(
+                Repository,
+                UserGroupRepoToPerm.repository_id == Repository.repo_id)\
+            .join(
+                UserGroup,
+                UserGroupRepoToPerm.users_group_id ==
+                UserGroup.users_group_id)\
+            .join(
+                UserGroupMember,
+                UserGroupRepoToPerm.users_group_id ==
+                UserGroupMember.users_group_id)\
+            .filter(
+                UserGroupMember.user_id == user_id,
+                UserGroup.users_group_active == true())
+        if repo_id:
+            q = q.filter(UserGroupRepoToPerm.repository_id == repo_id)
+        return q.all()
+
+    @classmethod
+    def get_default_group_perms(cls, user_id, repo_group_id=None):
+        q = Session().query(UserRepoGroupToPerm, RepoGroup, Permission)\
+            .join((Permission, UserRepoGroupToPerm.permission_id == Permission.permission_id))\
+            .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\
+            .filter(UserRepoGroupToPerm.user_id == user_id)
+        if repo_group_id:
+            q = q.filter(UserRepoGroupToPerm.group_id == repo_group_id)
+        return q.all()
+
+    @classmethod
+    def get_default_group_perms_from_user_group(
+            cls, user_id, repo_group_id=None):
+        q = Session().query(UserGroupRepoGroupToPerm, RepoGroup, Permission)\
+            .join(
+                Permission,
+                UserGroupRepoGroupToPerm.permission_id ==
+                Permission.permission_id)\
+            .join(
+                RepoGroup,
+                UserGroupRepoGroupToPerm.group_id == RepoGroup.group_id)\
+            .join(
+                UserGroup,
+                UserGroupRepoGroupToPerm.users_group_id ==
+                UserGroup.users_group_id)\
+            .join(
+                UserGroupMember,
+                UserGroupRepoGroupToPerm.users_group_id ==
+                UserGroupMember.users_group_id)\
+            .filter(
+                UserGroupMember.user_id == user_id,
+                UserGroup.users_group_active == true())
+        if repo_group_id:
+            q = q.filter(UserGroupRepoGroupToPerm.group_id == repo_group_id)
+        return q.all()
+
+    @classmethod
+    def get_default_user_group_perms(cls, user_id, user_group_id=None):
+        q = Session().query(UserUserGroupToPerm, UserGroup, Permission)\
+            .join((Permission, UserUserGroupToPerm.permission_id == Permission.permission_id))\
+            .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\
+            .filter(UserUserGroupToPerm.user_id == user_id)
+        if user_group_id:
+            q = q.filter(UserUserGroupToPerm.user_group_id == user_group_id)
+        return q.all()
+
+    @classmethod
+    def get_default_user_group_perms_from_user_group(
+            cls, user_id, user_group_id=None):
+        TargetUserGroup = aliased(UserGroup, name='target_user_group')
+        q = Session().query(UserGroupUserGroupToPerm, UserGroup, Permission)\
+            .join(
+                Permission,
+                UserGroupUserGroupToPerm.permission_id ==
+                Permission.permission_id)\
+            .join(
+                TargetUserGroup,
+                UserGroupUserGroupToPerm.target_user_group_id ==
+                TargetUserGroup.users_group_id)\
+            .join(
+                UserGroup,
+                UserGroupUserGroupToPerm.user_group_id ==
+                UserGroup.users_group_id)\
+            .join(
+                UserGroupMember,
+                UserGroupUserGroupToPerm.user_group_id ==
+                UserGroupMember.users_group_id)\
+            .filter(
+                UserGroupMember.user_id == user_id,
+                UserGroup.users_group_active == true())
+        if user_group_id:
+            q = q.filter(
+                UserGroupUserGroupToPerm.user_group_id == user_group_id)
+
+        return q.all()
+
+
+class UserRepoToPerm(Base, BaseModel):
+    __tablename__ = 'repo_to_perm'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'repository_id', 'permission_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+
+    user = relationship('User')
+    repository = relationship('Repository')
+    permission = relationship('Permission')
+
+    branch_perm_entry =  relationship('UserToRepoBranchPermission', cascade="all, delete, delete-orphan", lazy='joined')
+
+    @classmethod
+    def create(cls, user, repository, permission):
+        n = cls()
+        n.user = user
+        n.repository = repository
+        n.permission = permission
+        Session().add(n)
+        return n
+
+    def __unicode__(self):
+        return u'<%s => %s >' % (self.user, self.repository)
+
+
+class UserUserGroupToPerm(Base, BaseModel):
+    __tablename__ = 'user_user_group_to_perm'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'user_group_id', 'permission_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    user_user_group_to_perm_id = Column("user_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+    user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+
+    user = relationship('User')
+    user_group = relationship('UserGroup')
+    permission = relationship('Permission')
+
+    @classmethod
+    def create(cls, user, user_group, permission):
+        n = cls()
+        n.user = user
+        n.user_group = user_group
+        n.permission = permission
+        Session().add(n)
+        return n
+
+    def __unicode__(self):
+        return u'<%s => %s >' % (self.user, self.user_group)
+
+
+class UserToPerm(Base, BaseModel):
+    __tablename__ = 'user_to_perm'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'permission_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+
+    user = relationship('User')
+    permission = relationship('Permission', lazy='joined')
+
+    def __unicode__(self):
+        return u'<%s => %s >' % (self.user, self.permission)
+
+
+class UserGroupRepoToPerm(Base, BaseModel):
+    __tablename__ = 'users_group_repo_to_perm'
+    __table_args__ = (
+        UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+
+    users_group = relationship('UserGroup')
+    permission = relationship('Permission')
+    repository = relationship('Repository')
+
+    @classmethod
+    def create(cls, users_group, repository, permission):
+        n = cls()
+        n.users_group = users_group
+        n.repository = repository
+        n.permission = permission
+        Session().add(n)
+        return n
+
+    def __unicode__(self):
+        return u'<UserGroupRepoToPerm:%s => %s >' % (self.users_group, self.repository)
+
+
+class UserGroupUserGroupToPerm(Base, BaseModel):
+    __tablename__ = 'user_group_user_group_to_perm'
+    __table_args__ = (
+        UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
+        CheckConstraint('target_user_group_id != user_group_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    user_group_user_group_to_perm_id = Column("user_group_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    target_user_group_id = Column("target_user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+    user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+
+    target_user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id')
+    user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.user_group_id==UserGroup.users_group_id')
+    permission = relationship('Permission')
+
+    @classmethod
+    def create(cls, target_user_group, user_group, permission):
+        n = cls()
+        n.target_user_group = target_user_group
+        n.user_group = user_group
+        n.permission = permission
+        Session().add(n)
+        return n
+
+    def __unicode__(self):
+        return u'<UserGroupUserGroup:%s => %s >' % (self.target_user_group, self.user_group)
+
+
+class UserGroupToPerm(Base, BaseModel):
+    __tablename__ = 'users_group_to_perm'
+    __table_args__ = (
+        UniqueConstraint('users_group_id', 'permission_id',),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+
+    users_group = relationship('UserGroup')
+    permission = relationship('Permission')
+
+
+class UserRepoGroupToPerm(Base, BaseModel):
+    __tablename__ = 'user_repo_group_to_perm'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'group_id', 'permission_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+    group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+
+    user = relationship('User')
+    group = relationship('RepoGroup')
+    permission = relationship('Permission')
+
+    @classmethod
+    def create(cls, user, repository_group, permission):
+        n = cls()
+        n.user = user
+        n.group = repository_group
+        n.permission = permission
+        Session().add(n)
+        return n
+
+
+class UserGroupRepoGroupToPerm(Base, BaseModel):
+    __tablename__ = 'users_group_repo_group_to_perm'
+    __table_args__ = (
+        UniqueConstraint('users_group_id', 'group_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+    group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+
+    users_group = relationship('UserGroup')
+    permission = relationship('Permission')
+    group = relationship('RepoGroup')
+
+    @classmethod
+    def create(cls, user_group, repository_group, permission):
+        n = cls()
+        n.users_group = user_group
+        n.group = repository_group
+        n.permission = permission
+        Session().add(n)
+        return n
+
+    def __unicode__(self):
+        return u'<UserGroupRepoGroupToPerm:%s => %s >' % (self.users_group, self.group)
+
+
+class Statistics(Base, BaseModel):
+    __tablename__ = 'statistics'
+    __table_args__ = (
+         {'extend_existing': True, 'mysql_engine': 'InnoDB',
+          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
+    stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
+    commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data
+    commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data
+    languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data
+
+    repository = relationship('Repository', single_parent=True)
+
+
+class UserFollowing(Base, BaseModel):
+    __tablename__ = 'user_followings'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'follows_repository_id'),
+        UniqueConstraint('user_id', 'follows_user_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+    follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)
+    follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
+    follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
+
+    user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id')
+
+    follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
+    follows_repository = relationship('Repository', order_by='Repository.repo_name')
+
+    @classmethod
+    def get_repo_followers(cls, repo_id):
+        return cls.query().filter(cls.follows_repo_id == repo_id)
+
+
+class CacheKey(Base, BaseModel):
+    __tablename__ = 'cache_invalidation'
+    __table_args__ = (
+        UniqueConstraint('cache_key'),
+        Index('key_idx', 'cache_key'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    CACHE_TYPE_ATOM = 'ATOM'
+    CACHE_TYPE_RSS = 'RSS'
+    CACHE_TYPE_README = 'README'
+
+    cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    cache_key = Column("cache_key", String(255), nullable=True, unique=None, default=None)
+    cache_args = Column("cache_args", String(255), nullable=True, unique=None, default=None)
+    cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)
+
+    def __init__(self, cache_key, cache_args=''):
+        self.cache_key = cache_key
+        self.cache_args = cache_args
+        self.cache_active = False
+
+    def __unicode__(self):
+        return u"<%s('%s:%s[%s]')>" % (
+            self.__class__.__name__,
+            self.cache_id, self.cache_key, self.cache_active)
+
+    def _cache_key_partition(self):
+        prefix, repo_name, suffix = self.cache_key.partition(self.cache_args)
+        return prefix, repo_name, suffix
+
+    def get_prefix(self):
+        """
+        Try to extract prefix from existing cache key. The key could consist
+        of prefix, repo_name, suffix
+        """
+        # this returns prefix, repo_name, suffix
+        return self._cache_key_partition()[0]
+
+    def get_suffix(self):
+        """
+        get suffix that might have been used in _get_cache_key to
+        generate self.cache_key. Only used for informational purposes
+        in repo_edit.mako.
+        """
+        # prefix, repo_name, suffix
+        return self._cache_key_partition()[2]
+
+    @classmethod
+    def delete_all_cache(cls):
+        """
+        Delete all cache keys from database.
+        Should only be run when all instances are down and all entries
+        thus stale.
+        """
+        cls.query().delete()
+        Session().commit()
+
+    @classmethod
+    def get_cache_key(cls, repo_name, cache_type):
+        """
+
+        Generate a cache key for this process of RhodeCode instance.
+        Prefix most likely will be process id or maybe explicitly set
+        instance_id from .ini file.
+        """
+        import rhodecode
+        prefix = safe_unicode(rhodecode.CONFIG.get('instance_id') or '')
+
+        repo_as_unicode = safe_unicode(repo_name)
+        key = u'{}_{}'.format(repo_as_unicode, cache_type) \
+            if cache_type else repo_as_unicode
+
+        return u'{}{}'.format(prefix, key)
+
+    @classmethod
+    def set_invalidate(cls, repo_name, delete=False):
+        """
+        Mark all caches of a repo as invalid in the database.
+        """
+
+        try:
+            qry = Session().query(cls).filter(cls.cache_args == repo_name)
+            if delete:
+                log.debug('cache objects deleted for repo %s',
+                          safe_str(repo_name))
+                qry.delete()
+            else:
+                log.debug('cache objects marked as invalid for repo %s',
+                          safe_str(repo_name))
+                qry.update({"cache_active": False})
+
+            Session().commit()
+        except Exception:
+            log.exception(
+                'Cache key invalidation failed for repository %s',
+                safe_str(repo_name))
+            Session().rollback()
+
+    @classmethod
+    def get_active_cache(cls, cache_key):
+        inv_obj = cls.query().filter(cls.cache_key == cache_key).scalar()
+        if inv_obj:
+            return inv_obj
+        return None
+
+
+class ChangesetComment(Base, BaseModel):
+    __tablename__ = 'changeset_comments'
+    __table_args__ = (
+        Index('cc_revision_idx', 'revision'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    COMMENT_OUTDATED = u'comment_outdated'
+    COMMENT_TYPE_NOTE = u'note'
+    COMMENT_TYPE_TODO = u'todo'
+    COMMENT_TYPES = [COMMENT_TYPE_NOTE, COMMENT_TYPE_TODO]
+
+    comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True)
+    repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
+    revision = Column('revision', String(40), nullable=True)
+    pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
+    pull_request_version_id = Column("pull_request_version_id", Integer(), ForeignKey('pull_request_versions.pull_request_version_id'), nullable=True)
+    line_no = Column('line_no', Unicode(10), nullable=True)
+    hl_lines = Column('hl_lines', Unicode(512), nullable=True)
+    f_path = Column('f_path', Unicode(1000), nullable=True)
+    user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
+    text = Column('text', UnicodeText().with_variant(UnicodeText(25000), 'mysql'), nullable=False)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    renderer = Column('renderer', Unicode(64), nullable=True)
+    display_state = Column('display_state',  Unicode(128), nullable=True)
+
+    comment_type = Column('comment_type',  Unicode(128), nullable=True, default=COMMENT_TYPE_NOTE)
+    resolved_comment_id = Column('resolved_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'), nullable=True)
+    resolved_comment = relationship('ChangesetComment', remote_side=comment_id, backref='resolved_by')
+    author = relationship('User', lazy='joined')
+    repo = relationship('Repository')
+    status_change = relationship('ChangesetStatus', cascade="all, delete, delete-orphan", lazy='joined')
+    pull_request = relationship('PullRequest', lazy='joined')
+    pull_request_version = relationship('PullRequestVersion')
+
+    @classmethod
+    def get_users(cls, revision=None, pull_request_id=None):
+        """
+        Returns user associated with this ChangesetComment. ie those
+        who actually commented
+
+        :param cls:
+        :param revision:
+        """
+        q = Session().query(User)\
+                .join(ChangesetComment.author)
+        if revision:
+            q = q.filter(cls.revision == revision)
+        elif pull_request_id:
+            q = q.filter(cls.pull_request_id == pull_request_id)
+        return q.all()
+
+    @classmethod
+    def get_index_from_version(cls, pr_version, versions):
+        num_versions = [x.pull_request_version_id for x in versions]
+        try:
+            return num_versions.index(pr_version) +1
+        except (IndexError, ValueError):
+            return
+
+    @property
+    def outdated(self):
+        return self.display_state == self.COMMENT_OUTDATED
+
+    def outdated_at_version(self, version):
+        """
+        Checks if comment is outdated for given pull request version
+        """
+        return self.outdated and self.pull_request_version_id != version
+
+    def older_than_version(self, version):
+        """
+        Checks if comment is made from previous version than given
+        """
+        if version is None:
+            return self.pull_request_version_id is not None
+
+        return self.pull_request_version_id < version
+
+    @property
+    def resolved(self):
+        return self.resolved_by[0] if self.resolved_by else None
+
+    @property
+    def is_todo(self):
+        return self.comment_type == self.COMMENT_TYPE_TODO
+
+    @property
+    def is_inline(self):
+        return self.line_no and self.f_path
+
+    def get_index_version(self, versions):
+        return self.get_index_from_version(
+            self.pull_request_version_id, versions)
+
+    def __repr__(self):
+        if self.comment_id:
+            return '<DB:Comment #%s>' % self.comment_id
+        else:
+            return '<DB:Comment at %#x>' % id(self)
+
+    def get_api_data(self):
+        comment = self
+        data = {
+            'comment_id': comment.comment_id,
+            'comment_type': comment.comment_type,
+            'comment_text': comment.text,
+            'comment_status': comment.status_change,
+            'comment_f_path': comment.f_path,
+            'comment_lineno': comment.line_no,
+            'comment_author': comment.author,
+            'comment_created_on': comment.created_on
+        }
+        return data
+
+    def __json__(self):
+        data = dict()
+        data.update(self.get_api_data())
+        return data
+
+
+class ChangesetStatus(Base, BaseModel):
+    __tablename__ = 'changeset_statuses'
+    __table_args__ = (
+        Index('cs_revision_idx', 'revision'),
+        Index('cs_version_idx', 'version'),
+        UniqueConstraint('repo_id', 'revision', 'version'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'
+    STATUS_APPROVED = 'approved'
+    STATUS_REJECTED = 'rejected'
+    STATUS_UNDER_REVIEW = 'under_review'
+
+    STATUSES = [
+        (STATUS_NOT_REVIEWED, _("Not Reviewed")),  # (no icon) and default
+        (STATUS_APPROVED, _("Approved")),
+        (STATUS_REJECTED, _("Rejected")),
+        (STATUS_UNDER_REVIEW, _("Under Review")),
+    ]
+
+    changeset_status_id = Column('changeset_status_id', Integer(), nullable=False, primary_key=True)
+    repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
+    revision = Column('revision', String(40), nullable=False)
+    status = Column('status', String(128), nullable=False, default=DEFAULT)
+    changeset_comment_id = Column('changeset_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'))
+    modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
+    version = Column('version', Integer(), nullable=False, default=0)
+    pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
+
+    author = relationship('User', lazy='joined')
+    repo = relationship('Repository')
+    comment = relationship('ChangesetComment', lazy='joined')
+    pull_request = relationship('PullRequest', lazy='joined')
+
+    def __unicode__(self):
+        return u"<%s('%s[v%s]:%s')>" % (
+            self.__class__.__name__,
+            self.status, self.version, self.author
+        )
+
+    @classmethod
+    def get_status_lbl(cls, value):
+        return dict(cls.STATUSES).get(value)
+
+    @property
+    def status_lbl(self):
+        return ChangesetStatus.get_status_lbl(self.status)
+
+    def get_api_data(self):
+        status = self
+        data = {
+            'status_id': status.changeset_status_id,
+            'status': status.status,
+        }
+        return data
+
+    def __json__(self):
+        data = dict()
+        data.update(self.get_api_data())
+        return data
+
+
+class _PullRequestBase(BaseModel):
+    """
+    Common attributes of pull request and version entries.
+    """
+
+    # .status values
+    STATUS_NEW = u'new'
+    STATUS_OPEN = u'open'
+    STATUS_CLOSED = u'closed'
+
+    title = Column('title', Unicode(255), nullable=True)
+    description = Column(
+        'description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'),
+        nullable=True)
+    # new/open/closed status of pull request (not approve/reject/etc)
+    status = Column('status', Unicode(255), nullable=False, default=STATUS_NEW)
+    created_on = Column(
+        'created_on', DateTime(timezone=False), nullable=False,
+        default=datetime.datetime.now)
+    updated_on = Column(
+        'updated_on', DateTime(timezone=False), nullable=False,
+        default=datetime.datetime.now)
+
+    @declared_attr
+    def user_id(cls):
+        return Column(
+            "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
+            unique=None)
+
+    # 500 revisions max
+    _revisions = Column(
+        'revisions', UnicodeText().with_variant(UnicodeText(20500), 'mysql'))
+
+    @declared_attr
+    def source_repo_id(cls):
+        # TODO: dan: rename column to source_repo_id
+        return Column(
+            'org_repo_id', Integer(), ForeignKey('repositories.repo_id'),
+            nullable=False)
+
+    source_ref = Column('org_ref', Unicode(255), nullable=False)
+
+    @declared_attr
+    def target_repo_id(cls):
+        # TODO: dan: rename column to target_repo_id
+        return Column(
+            'other_repo_id', Integer(), ForeignKey('repositories.repo_id'),
+            nullable=False)
+
+    target_ref = Column('other_ref', Unicode(255), nullable=False)
+    _shadow_merge_ref = Column('shadow_merge_ref', Unicode(255), nullable=True)
+
+    # TODO: dan: rename column to last_merge_source_rev
+    _last_merge_source_rev = Column(
+        'last_merge_org_rev', String(40), nullable=True)
+    # TODO: dan: rename column to last_merge_target_rev
+    _last_merge_target_rev = Column(
+        'last_merge_other_rev', String(40), nullable=True)
+    _last_merge_status = Column('merge_status', Integer(), nullable=True)
+    merge_rev = Column('merge_rev', String(40), nullable=True)
+
+    reviewer_data = Column(
+        'reviewer_data_json', MutationObj.as_mutable(
+            JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
+
+    @property
+    def reviewer_data_json(self):
+        return json.dumps(self.reviewer_data)
+
+    @hybrid_property
+    def description_safe(self):
+        from rhodecode.lib import helpers as h
+        return h.escape(self.description)
+
+    @hybrid_property
+    def revisions(self):
+        return self._revisions.split(':') if self._revisions else []
+
+    @revisions.setter
+    def revisions(self, val):
+        self._revisions = ':'.join(val)
+
+    @hybrid_property
+    def last_merge_status(self):
+        return safe_int(self._last_merge_status)
+
+    @last_merge_status.setter
+    def last_merge_status(self, val):
+        self._last_merge_status = val
+
+    @declared_attr
+    def author(cls):
+        return relationship('User', lazy='joined')
+
+    @declared_attr
+    def source_repo(cls):
+        return relationship(
+            'Repository',
+            primaryjoin='%s.source_repo_id==Repository.repo_id' % cls.__name__)
+
+    @property
+    def source_ref_parts(self):
+        return self.unicode_to_reference(self.source_ref)
+
+    @declared_attr
+    def target_repo(cls):
+        return relationship(
+            'Repository',
+            primaryjoin='%s.target_repo_id==Repository.repo_id' % cls.__name__)
+
+    @property
+    def target_ref_parts(self):
+        return self.unicode_to_reference(self.target_ref)
+
+    @property
+    def shadow_merge_ref(self):
+        return self.unicode_to_reference(self._shadow_merge_ref)
+
+    @shadow_merge_ref.setter
+    def shadow_merge_ref(self, ref):
+        self._shadow_merge_ref = self.reference_to_unicode(ref)
+
+    def unicode_to_reference(self, raw):
+        """
+        Convert a unicode (or string) to a reference object.
+        If unicode evaluates to False it returns None.
+        """
+        if raw:
+            refs = raw.split(':')
+            return Reference(*refs)
+        else:
+            return None
+
+    def reference_to_unicode(self, ref):
+        """
+        Convert a reference object to unicode.
+        If reference is None it returns None.
+        """
+        if ref:
+            return u':'.join(ref)
+        else:
+            return None
+
+    def get_api_data(self, with_merge_state=True):
+        from rhodecode.model.pull_request import PullRequestModel
+
+        pull_request = self
+        if with_merge_state:
+            merge_status = PullRequestModel().merge_status(pull_request)
+            merge_state = {
+                'status': merge_status[0],
+                'message': safe_unicode(merge_status[1]),
+            }
+        else:
+            merge_state = {'status': 'not_available',
+                           'message': 'not_available'}
+
+        merge_data = {
+            'clone_url': PullRequestModel().get_shadow_clone_url(pull_request),
+            'reference': (
+                pull_request.shadow_merge_ref._asdict()
+                if pull_request.shadow_merge_ref else None),
+        }
+
+        data = {
+            'pull_request_id': pull_request.pull_request_id,
+            'url': PullRequestModel().get_url(pull_request),
+            'title': pull_request.title,
+            'description': pull_request.description,
+            'status': pull_request.status,
+            'created_on': pull_request.created_on,
+            'updated_on': pull_request.updated_on,
+            'commit_ids': pull_request.revisions,
+            'review_status': pull_request.calculated_review_status(),
+            'mergeable': merge_state,
+            'source': {
+                'clone_url': pull_request.source_repo.clone_url(),
+                'repository': pull_request.source_repo.repo_name,
+                'reference': {
+                    'name': pull_request.source_ref_parts.name,
+                    'type': pull_request.source_ref_parts.type,
+                    'commit_id': pull_request.source_ref_parts.commit_id,
+                },
+            },
+            'target': {
+                'clone_url': pull_request.target_repo.clone_url(),
+                'repository': pull_request.target_repo.repo_name,
+                'reference': {
+                    'name': pull_request.target_ref_parts.name,
+                    'type': pull_request.target_ref_parts.type,
+                    'commit_id': pull_request.target_ref_parts.commit_id,
+                },
+            },
+            'merge': merge_data,
+            'author': pull_request.author.get_api_data(include_secrets=False,
+                                                       details='basic'),
+            'reviewers': [
+                {
+                    'user': reviewer.get_api_data(include_secrets=False,
+                                                  details='basic'),
+                    'reasons': reasons,
+                    'review_status': st[0][1].status if st else 'not_reviewed',
+                }
+                for obj, reviewer, reasons, mandatory, st in
+                pull_request.reviewers_statuses()
+            ]
+        }
+
+        return data
+
+
+class PullRequest(Base, _PullRequestBase):
+    __tablename__ = 'pull_requests'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    pull_request_id = Column(
+        'pull_request_id', Integer(), nullable=False, primary_key=True)
+
+    def __repr__(self):
+        if self.pull_request_id:
+            return '<DB:PullRequest #%s>' % self.pull_request_id
+        else:
+            return '<DB:PullRequest at %#x>' % id(self)
+
+    reviewers = relationship('PullRequestReviewers',
+                             cascade="all, delete, delete-orphan")
+    statuses = relationship('ChangesetStatus',
+                            cascade="all, delete, delete-orphan")
+    comments = relationship('ChangesetComment',
+                            cascade="all, delete, delete-orphan")
+    versions = relationship('PullRequestVersion',
+                            cascade="all, delete, delete-orphan",
+                            lazy='dynamic')
+
+    @classmethod
+    def get_pr_display_object(cls, pull_request_obj, org_pull_request_obj,
+                              internal_methods=None):
+
+        class PullRequestDisplay(object):
+            """
+            Special object wrapper for showing PullRequest data via Versions
+            It mimics PR object as close as possible. This is read only object
+            just for display
+            """
+
+            def __init__(self, attrs, internal=None):
+                self.attrs = attrs
+                # internal have priority over the given ones via attrs
+                self.internal = internal or ['versions']
+
+            def __getattr__(self, item):
+                if item in self.internal:
+                    return getattr(self, item)
+                try:
+                    return self.attrs[item]
+                except KeyError:
+                    raise AttributeError(
+                        '%s object has no attribute %s' % (self, item))
+
+            def __repr__(self):
+                return '<DB:PullRequestDisplay #%s>' % self.attrs.get('pull_request_id')
+
+            def versions(self):
+                return pull_request_obj.versions.order_by(
+                    PullRequestVersion.pull_request_version_id).all()
+
+            def is_closed(self):
+                return pull_request_obj.is_closed()
+
+            @property
+            def pull_request_version_id(self):
+                return getattr(pull_request_obj, 'pull_request_version_id', None)
+
+        attrs = StrictAttributeDict(pull_request_obj.get_api_data())
+
+        attrs.author = StrictAttributeDict(
+            pull_request_obj.author.get_api_data())
+        if pull_request_obj.target_repo:
+            attrs.target_repo = StrictAttributeDict(
+                pull_request_obj.target_repo.get_api_data())
+            attrs.target_repo.clone_url = pull_request_obj.target_repo.clone_url
+
+        if pull_request_obj.source_repo:
+            attrs.source_repo = StrictAttributeDict(
+                pull_request_obj.source_repo.get_api_data())
+            attrs.source_repo.clone_url = pull_request_obj.source_repo.clone_url
+
+        attrs.source_ref_parts = pull_request_obj.source_ref_parts
+        attrs.target_ref_parts = pull_request_obj.target_ref_parts
+        attrs.revisions = pull_request_obj.revisions
+
+        attrs.shadow_merge_ref = org_pull_request_obj.shadow_merge_ref
+        attrs.reviewer_data = org_pull_request_obj.reviewer_data
+        attrs.reviewer_data_json = org_pull_request_obj.reviewer_data_json
+
+        return PullRequestDisplay(attrs, internal=internal_methods)
+
+    def is_closed(self):
+        return self.status == self.STATUS_CLOSED
+
+    def __json__(self):
+        return {
+            'revisions': self.revisions,
+        }
+
+    def calculated_review_status(self):
+        from rhodecode.model.changeset_status import ChangesetStatusModel
+        return ChangesetStatusModel().calculated_review_status(self)
+
+    def reviewers_statuses(self):
+        from rhodecode.model.changeset_status import ChangesetStatusModel
+        return ChangesetStatusModel().reviewers_statuses(self)
+
+    @property
+    def workspace_id(self):
+        from rhodecode.model.pull_request import PullRequestModel
+        return PullRequestModel()._workspace_id(self)
+
+    def get_shadow_repo(self):
+        workspace_id = self.workspace_id
+        vcs_obj = self.target_repo.scm_instance()
+        shadow_repository_path = vcs_obj._get_shadow_repository_path(
+            workspace_id)
+        return vcs_obj._get_shadow_instance(shadow_repository_path)
+
+
+class PullRequestVersion(Base, _PullRequestBase):
+    __tablename__ = 'pull_request_versions'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    pull_request_version_id = Column(
+        'pull_request_version_id', Integer(), nullable=False, primary_key=True)
+    pull_request_id = Column(
+        'pull_request_id', Integer(),
+        ForeignKey('pull_requests.pull_request_id'), nullable=False)
+    pull_request = relationship('PullRequest')
+
+    def __repr__(self):
+        if self.pull_request_version_id:
+            return '<DB:PullRequestVersion #%s>' % self.pull_request_version_id
+        else:
+            return '<DB:PullRequestVersion at %#x>' % id(self)
+
+    @property
+    def reviewers(self):
+        return self.pull_request.reviewers
+
+    @property
+    def versions(self):
+        return self.pull_request.versions
+
+    def is_closed(self):
+        # calculate from original
+        return self.pull_request.status == self.STATUS_CLOSED
+
+    def calculated_review_status(self):
+        return self.pull_request.calculated_review_status()
+
+    def reviewers_statuses(self):
+        return self.pull_request.reviewers_statuses()
+
+
+class PullRequestReviewers(Base, BaseModel):
+    __tablename__ = 'pull_request_reviewers'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    @hybrid_property
+    def reasons(self):
+        if not self._reasons:
+            return []
+        return self._reasons
+
+    @reasons.setter
+    def reasons(self, val):
+        val = val or []
+        if any(not isinstance(x, basestring) for x in val):
+            raise Exception('invalid reasons type, must be list of strings')
+        self._reasons = val
+
+    pull_requests_reviewers_id = Column(
+        'pull_requests_reviewers_id', Integer(), nullable=False,
+        primary_key=True)
+    pull_request_id = Column(
+        "pull_request_id", Integer(),
+        ForeignKey('pull_requests.pull_request_id'), nullable=False)
+    user_id = Column(
+        "user_id", Integer(), ForeignKey('users.user_id'), nullable=True)
+    _reasons = Column(
+        'reason', MutationList.as_mutable(
+            JsonType('list', dialect_map=dict(mysql=UnicodeText(16384)))))
+
+    mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
+    user = relationship('User')
+    pull_request = relationship('PullRequest')
+
+    rule_data = Column(
+        'rule_data_json',
+        JsonType(dialect_map=dict(mysql=UnicodeText(16384))))
+
+    def rule_user_group_data(self):
+        """
+        Returns the voting user group rule data for this reviewer
+        """
+
+        if self.rule_data and 'vote_rule' in self.rule_data:
+            user_group_data = {}
+            if 'rule_user_group_entry_id' in self.rule_data:
+                # means a group with voting rules !
+                user_group_data['id'] = self.rule_data['rule_user_group_entry_id']
+                user_group_data['name'] = self.rule_data['rule_name']
+                user_group_data['vote_rule'] = self.rule_data['vote_rule']
+
+            return user_group_data
+
+    def __unicode__(self):
+        return u"<%s('id:%s')>" % (self.__class__.__name__,
+                                   self.pull_requests_reviewers_id)
+
+
+class Notification(Base, BaseModel):
+    __tablename__ = 'notifications'
+    __table_args__ = (
+        Index('notification_type_idx', 'type'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    TYPE_CHANGESET_COMMENT = u'cs_comment'
+    TYPE_MESSAGE = u'message'
+    TYPE_MENTION = u'mention'
+    TYPE_REGISTRATION = u'registration'
+    TYPE_PULL_REQUEST = u'pull_request'
+    TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment'
+
+    notification_id = Column('notification_id', Integer(), nullable=False, primary_key=True)
+    subject = Column('subject', Unicode(512), nullable=True)
+    body = Column('body', UnicodeText().with_variant(UnicodeText(50000), 'mysql'), nullable=True)
+    created_by = Column("created_by", Integer(), ForeignKey('users.user_id'), nullable=True)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    type_ = Column('type', Unicode(255))
+
+    created_by_user = relationship('User')
+    notifications_to_users = relationship('UserNotification', lazy='joined',
+                                          cascade="all, delete, delete-orphan")
+
+    @property
+    def recipients(self):
+        return [x.user for x in UserNotification.query()\
+                .filter(UserNotification.notification == self)\
+                .order_by(UserNotification.user_id.asc()).all()]
+
+    @classmethod
+    def create(cls, created_by, subject, body, recipients, type_=None):
+        if type_ is None:
+            type_ = Notification.TYPE_MESSAGE
+
+        notification = cls()
+        notification.created_by_user = created_by
+        notification.subject = subject
+        notification.body = body
+        notification.type_ = type_
+        notification.created_on = datetime.datetime.now()
+
+        for u in recipients:
+            assoc = UserNotification()
+            assoc.notification = notification
+
+            # if created_by is inside recipients mark his notification
+            # as read
+            if u.user_id == created_by.user_id:
+                assoc.read = True
+
+            u.notifications.append(assoc)
+        Session().add(notification)
+
+        return notification
+
+
+class UserNotification(Base, BaseModel):
+    __tablename__ = 'user_to_notification'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'notification_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
+    notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), primary_key=True)
+    read = Column('read', Boolean, default=False)
+    sent_on = Column('sent_on', DateTime(timezone=False), nullable=True, unique=None)
+
+    user = relationship('User', lazy="joined")
+    notification = relationship('Notification', lazy="joined",
+                                order_by=lambda: Notification.created_on.desc(),)
+
+    def mark_as_read(self):
+        self.read = True
+        Session().add(self)
+
+
+class Gist(Base, BaseModel):
+    __tablename__ = 'gists'
+    __table_args__ = (
+        Index('g_gist_access_id_idx', 'gist_access_id'),
+        Index('g_created_on_idx', 'created_on'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    GIST_PUBLIC = u'public'
+    GIST_PRIVATE = u'private'
+    DEFAULT_FILENAME = u'gistfile1.txt'
+
+    ACL_LEVEL_PUBLIC = u'acl_public'
+    ACL_LEVEL_PRIVATE = u'acl_private'
+
+    gist_id = Column('gist_id', Integer(), primary_key=True)
+    gist_access_id = Column('gist_access_id', Unicode(250))
+    gist_description = Column('gist_description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
+    gist_owner = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True)
+    gist_expires = Column('gist_expires', Float(53), nullable=False)
+    gist_type = Column('gist_type', Unicode(128), nullable=False)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    acl_level = Column('acl_level', Unicode(128), nullable=True)
+
+    owner = relationship('User')
+
+    def __repr__(self):
+        return '<Gist:[%s]%s>' % (self.gist_type, self.gist_access_id)
+
+    @hybrid_property
+    def description_safe(self):
+        from rhodecode.lib import helpers as h
+        return h.escape(self.gist_description)
+
+    @classmethod
+    def get_or_404(cls, id_):
+        from pyramid.httpexceptions import HTTPNotFound
+
+        res = cls.query().filter(cls.gist_access_id == id_).scalar()
+        if not res:
+            raise HTTPNotFound()
+        return res
+
+    @classmethod
+    def get_by_access_id(cls, gist_access_id):
+        return cls.query().filter(cls.gist_access_id == gist_access_id).scalar()
+
+    def gist_url(self):
+        from rhodecode.model.gist import GistModel
+        return GistModel().get_url(self)
+
+    @classmethod
+    def base_path(cls):
+        """
+        Returns base path when all gists are stored
+
+        :param cls:
+        """
+        from rhodecode.model.gist import GIST_STORE_LOC
+        q = Session().query(RhodeCodeUi)\
+            .filter(RhodeCodeUi.ui_key == URL_SEP)
+        q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
+        return os.path.join(q.one().ui_value, GIST_STORE_LOC)
+
+    def get_api_data(self):
+        """
+        Common function for generating gist related data for API
+        """
+        gist = self
+        data = {
+            'gist_id': gist.gist_id,
+            'type': gist.gist_type,
+            'access_id': gist.gist_access_id,
+            'description': gist.gist_description,
+            'url': gist.gist_url(),
+            'expires': gist.gist_expires,
+            'created_on': gist.created_on,
+            'modified_at': gist.modified_at,
+            'content': None,
+            'acl_level': gist.acl_level,
+        }
+        return data
+
+    def __json__(self):
+        data = dict(
+        )
+        data.update(self.get_api_data())
+        return data
+    # SCM functions
+
+    def scm_instance(self, **kwargs):
+        full_repo_path = os.path.join(self.base_path(), self.gist_access_id)
+        return get_vcs_instance(
+            repo_path=safe_str(full_repo_path), create=False)
+
+
+class ExternalIdentity(Base, BaseModel):
+    __tablename__ = 'external_identities'
+    __table_args__ = (
+        Index('local_user_id_idx', 'local_user_id'),
+        Index('external_id_idx', 'external_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8'})
+
+    external_id = Column('external_id', Unicode(255), default=u'',
+                         primary_key=True)
+    external_username = Column('external_username', Unicode(1024), default=u'')
+    local_user_id = Column('local_user_id', Integer(),
+                           ForeignKey('users.user_id'), primary_key=True)
+    provider_name = Column('provider_name', Unicode(255), default=u'',
+                           primary_key=True)
+    access_token = Column('access_token', String(1024), default=u'')
+    alt_token = Column('alt_token', String(1024), default=u'')
+    token_secret = Column('token_secret', String(1024), default=u'')
+
+    @classmethod
+    def by_external_id_and_provider(cls, external_id, provider_name,
+                                    local_user_id=None):
+        """
+        Returns ExternalIdentity instance based on search params
+
+        :param external_id:
+        :param provider_name:
+        :return: ExternalIdentity
+        """
+        query = cls.query()
+        query = query.filter(cls.external_id == external_id)
+        query = query.filter(cls.provider_name == provider_name)
+        if local_user_id:
+            query = query.filter(cls.local_user_id == local_user_id)
+        return query.first()
+
+    @classmethod
+    def user_by_external_id_and_provider(cls, external_id, provider_name):
+        """
+        Returns User instance based on search params
+
+        :param external_id:
+        :param provider_name:
+        :return: User
+        """
+        query = User.query()
+        query = query.filter(cls.external_id == external_id)
+        query = query.filter(cls.provider_name == provider_name)
+        query = query.filter(User.user_id == cls.local_user_id)
+        return query.first()
+
+    @classmethod
+    def by_local_user_id(cls, local_user_id):
+        """
+        Returns all tokens for user
+
+        :param local_user_id:
+        :return: ExternalIdentity
+        """
+        query = cls.query()
+        query = query.filter(cls.local_user_id == local_user_id)
+        return query
+
+
+class Integration(Base, BaseModel):
+    __tablename__ = 'integrations'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    integration_id = Column('integration_id', Integer(), primary_key=True)
+    integration_type = Column('integration_type', String(255))
+    enabled = Column('enabled', Boolean(), nullable=False)
+    name = Column('name', String(255), nullable=False)
+    child_repos_only = Column('child_repos_only', Boolean(), nullable=False,
+        default=False)
+
+    settings = Column(
+        'settings_json', MutationObj.as_mutable(
+            JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
+    repo_id = Column(
+        'repo_id', Integer(), ForeignKey('repositories.repo_id'),
+        nullable=True, unique=None, default=None)
+    repo = relationship('Repository', lazy='joined')
+
+    repo_group_id = Column(
+        'repo_group_id', Integer(), ForeignKey('groups.group_id'),
+        nullable=True, unique=None, default=None)
+    repo_group = relationship('RepoGroup', lazy='joined')
+
+    @property
+    def scope(self):
+        if self.repo:
+            return repr(self.repo)
+        if self.repo_group:
+            if self.child_repos_only:
+                return repr(self.repo_group) + ' (child repos only)'
+            else:
+                return repr(self.repo_group) + ' (recursive)'
+        if self.child_repos_only:
+            return 'root_repos'
+        return 'global'
+
+    def __repr__(self):
+        return '<Integration(%r, %r)>' % (self.integration_type, self.scope)
+
+
+class RepoReviewRuleUser(Base, BaseModel):
+    __tablename__ = 'repo_review_rules_users'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+    )
+
+    repo_review_rule_user_id = Column('repo_review_rule_user_id', Integer(), primary_key=True)
+    repo_review_rule_id = Column("repo_review_rule_id", Integer(), ForeignKey('repo_review_rules.repo_review_rule_id'))
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False)
+    mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
+    user = relationship('User')
+
+    def rule_data(self):
+        return {
+            'mandatory': self.mandatory
+        }
+
+
+class RepoReviewRuleUserGroup(Base, BaseModel):
+    __tablename__ = 'repo_review_rules_users_groups'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+    )
+    VOTE_RULE_ALL = -1
+
+    repo_review_rule_users_group_id = Column('repo_review_rule_users_group_id', Integer(), primary_key=True)
+    repo_review_rule_id = Column("repo_review_rule_id", Integer(), ForeignKey('repo_review_rules.repo_review_rule_id'))
+    users_group_id = Column("users_group_id", Integer(),ForeignKey('users_groups.users_group_id'), nullable=False)
+    mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
+    vote_rule = Column("vote_rule", Integer(), nullable=True, default=VOTE_RULE_ALL)
+    users_group = relationship('UserGroup')
+
+    def rule_data(self):
+        return {
+            'mandatory': self.mandatory,
+            'vote_rule': self.vote_rule
+        }
+
+    @property
+    def vote_rule_label(self):
+        if not self.vote_rule or self.vote_rule == self.VOTE_RULE_ALL:
+            return 'all must vote'
+        else:
+            return 'min. vote {}'.format(self.vote_rule)
+
+
+class RepoReviewRule(Base, BaseModel):
+    __tablename__ = 'repo_review_rules'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+    )
+
+    repo_review_rule_id = Column(
+        'repo_review_rule_id', Integer(), primary_key=True)
+    repo_id = Column(
+        "repo_id", Integer(), ForeignKey('repositories.repo_id'))
+    repo = relationship('Repository', backref='review_rules')
+
+    review_rule_name = Column('review_rule_name', String(255))
+    _branch_pattern = Column("branch_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'), default=u'*')  # glob
+    _target_branch_pattern = Column("target_branch_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'), default=u'*')  # glob
+    _file_pattern = Column("file_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'), default=u'*')  # glob
+
+    use_authors_for_review = Column("use_authors_for_review", Boolean(), nullable=False, default=False)
+    forbid_author_to_review = Column("forbid_author_to_review", Boolean(), nullable=False, default=False)
+    forbid_commit_author_to_review = Column("forbid_commit_author_to_review", Boolean(), nullable=False, default=False)
+    forbid_adding_reviewers = Column("forbid_adding_reviewers", Boolean(), nullable=False, default=False)
+
+    rule_users = relationship('RepoReviewRuleUser')
+    rule_user_groups = relationship('RepoReviewRuleUserGroup')
+
+    def _validate_glob(self, value):
+        re.compile('^' + glob2re(value) + '$')
+
+    @hybrid_property
+    def source_branch_pattern(self):
+        return self._branch_pattern or '*'
+
+    @source_branch_pattern.setter
+    def source_branch_pattern(self, value):
+        self._validate_glob(value)
+        self._branch_pattern = value or '*'
+
+    @hybrid_property
+    def target_branch_pattern(self):
+        return self._target_branch_pattern or '*'
+
+    @target_branch_pattern.setter
+    def target_branch_pattern(self, value):
+        self._validate_glob(value)
+        self._target_branch_pattern = value or '*'
+
+    @hybrid_property
+    def file_pattern(self):
+        return self._file_pattern or '*'
+
+    @file_pattern.setter
+    def file_pattern(self, value):
+        self._validate_glob(value)
+        self._file_pattern = value or '*'
+
+    def matches(self, source_branch, target_branch, files_changed):
+        """
+        Check if this review rule matches a branch/files in a pull request
+
+        :param source_branch: source branch name for the commit
+        :param target_branch: target branch name for the commit
+        :param files_changed: list of file paths changed in the pull request
+        """
+
+        source_branch = source_branch or ''
+        target_branch = target_branch or ''
+        files_changed = files_changed or []
+
+        branch_matches = True
+        if source_branch or target_branch:
+            if self.source_branch_pattern == '*':
+                source_branch_match = True
+            else:
+                source_branch_regex = re.compile(
+                    '^' + glob2re(self.source_branch_pattern) + '$')
+                source_branch_match = bool(source_branch_regex.search(source_branch))
+            if self.target_branch_pattern == '*':
+                target_branch_match = True
+            else:
+                target_branch_regex = re.compile(
+                    '^' + glob2re(self.target_branch_pattern) + '$')
+                target_branch_match = bool(target_branch_regex.search(target_branch))
+
+            branch_matches = source_branch_match and target_branch_match
+
+        files_matches = True
+        if self.file_pattern != '*':
+            files_matches = False
+            file_regex = re.compile(glob2re(self.file_pattern))
+            for filename in files_changed:
+                if file_regex.search(filename):
+                    files_matches = True
+                    break
+
+        return branch_matches and files_matches
+
+    @property
+    def review_users(self):
+        """ Returns the users which this rule applies to """
+
+        users = collections.OrderedDict()
+
+        for rule_user in self.rule_users:
+            if rule_user.user.active:
+                if rule_user.user not in users:
+                    users[rule_user.user.username] = {
+                        'user': rule_user.user,
+                        'source': 'user',
+                        'source_data': {},
+                        'data': rule_user.rule_data()
+                    }
+
+        for rule_user_group in self.rule_user_groups:
+            source_data = {
+                'user_group_id': rule_user_group.users_group.users_group_id,
+                'name': rule_user_group.users_group.users_group_name,
+                'members': len(rule_user_group.users_group.members)
+            }
+            for member in rule_user_group.users_group.members:
+                if member.user.active:
+                    key = member.user.username
+                    if key in users:
+                        # skip this member as we have him already
+                        # this prevents from override the "first" matched
+                        # users with duplicates in multiple groups
+                        continue
+
+                    users[key] = {
+                        'user': member.user,
+                        'source': 'user_group',
+                        'source_data': source_data,
+                        'data': rule_user_group.rule_data()
+                    }
+
+        return users
+
+    def user_group_vote_rule(self):
+        rules = []
+        if self.rule_user_groups:
+            for user_group in self.rule_user_groups:
+                rules.append(user_group)
+        return rules
+
+    def __repr__(self):
+        return '<RepoReviewerRule(id=%r, repo=%r)>' % (
+            self.repo_review_rule_id, self.repo)
+
+
+class ScheduleEntry(Base, BaseModel):
+    __tablename__ = 'schedule_entries'
+    __table_args__ = (
+        UniqueConstraint('schedule_name', name='s_schedule_name_idx'),
+        UniqueConstraint('task_uid', name='s_task_uid_idx'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    schedule_types = ['crontab', 'timedelta', 'integer']
+    schedule_entry_id = Column('schedule_entry_id', Integer(), primary_key=True)
+
+    schedule_name = Column("schedule_name", String(255), nullable=False, unique=None, default=None)
+    schedule_description = Column("schedule_description", String(10000), nullable=True, unique=None, default=None)
+    schedule_enabled = Column("schedule_enabled", Boolean(), nullable=False, unique=None, default=True)
+
+    _schedule_type = Column("schedule_type", String(255), nullable=False, unique=None, default=None)
+    schedule_definition = Column('schedule_definition_json', MutationObj.as_mutable(JsonType(default=lambda: "", dialect_map=dict(mysql=LONGTEXT()))))
+
+    schedule_last_run = Column('schedule_last_run', DateTime(timezone=False), nullable=True, unique=None, default=None)
+    schedule_total_run_count = Column('schedule_total_run_count', Integer(), nullable=True, unique=None, default=0)
+
+    # task
+    task_uid = Column("task_uid", String(255), nullable=False, unique=None, default=None)
+    task_dot_notation = Column("task_dot_notation", String(4096), nullable=False, unique=None, default=None)
+    task_args = Column('task_args_json', MutationObj.as_mutable(JsonType(default=list, dialect_map=dict(mysql=LONGTEXT()))))
+    task_kwargs = Column('task_kwargs_json', MutationObj.as_mutable(JsonType(default=dict, dialect_map=dict(mysql=LONGTEXT()))))
+
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    updated_on = Column('updated_on', DateTime(timezone=False), nullable=True, unique=None, default=None)
+
+    @hybrid_property
+    def schedule_type(self):
+        return self._schedule_type
+
+    @schedule_type.setter
+    def schedule_type(self, val):
+        if val not in self.schedule_types:
+            raise ValueError('Value must be on of `{}` and got `{}`'.format(
+                val, self.schedule_type))
+
+        self._schedule_type = val
+
+    @classmethod
+    def get_uid(cls, obj):
+        args = obj.task_args
+        kwargs = obj.task_kwargs
+        if isinstance(args, JsonRaw):
+            try:
+                args = json.loads(args)
+            except ValueError:
+                args = tuple()
+
+        if isinstance(kwargs, JsonRaw):
+            try:
+                kwargs = json.loads(kwargs)
+            except ValueError:
+                kwargs = dict()
+
+        dot_notation = obj.task_dot_notation
+        val = '.'.join(map(safe_str, [
+            sorted(dot_notation), args, sorted(kwargs.items())]))
+        return hashlib.sha1(val).hexdigest()
+
+    @classmethod
+    def get_by_schedule_name(cls, schedule_name):
+        return cls.query().filter(cls.schedule_name == schedule_name).scalar()
+
+    @classmethod
+    def get_by_schedule_id(cls, schedule_id):
+        return cls.query().filter(cls.schedule_entry_id == schedule_id).scalar()
+
+    @property
+    def task(self):
+        return self.task_dot_notation
+
+    @property
+    def schedule(self):
+        from rhodecode.lib.celerylib.utils import raw_2_schedule
+        schedule = raw_2_schedule(self.schedule_definition, self.schedule_type)
+        return schedule
+
+    @property
+    def args(self):
+        try:
+            return list(self.task_args or [])
+        except ValueError:
+            return list()
+
+    @property
+    def kwargs(self):
+        try:
+            return dict(self.task_kwargs or {})
+        except ValueError:
+            return dict()
+
+    def _as_raw(self, val):
+        if hasattr(val, 'de_coerce'):
+            val = val.de_coerce()
+            if val:
+                val = json.dumps(val)
+
+        return val
+
+    @property
+    def schedule_definition_raw(self):
+        return self._as_raw(self.schedule_definition)
+
+    @property
+    def args_raw(self):
+        return self._as_raw(self.task_args)
+
+    @property
+    def kwargs_raw(self):
+        return self._as_raw(self.task_kwargs)
+
+    def __repr__(self):
+        return '<DB:ScheduleEntry({}:{})>'.format(
+            self.schedule_entry_id, self.schedule_name)
+
+
+@event.listens_for(ScheduleEntry, 'before_update')
+def update_task_uid(mapper, connection, target):
+    target.task_uid = ScheduleEntry.get_uid(target)
+
+
+@event.listens_for(ScheduleEntry, 'before_insert')
+def set_task_uid(mapper, connection, target):
+    target.task_uid = ScheduleEntry.get_uid(target)
+
+
+class _BaseBranchPerms(BaseModel):
+    @classmethod
+    def compute_hash(cls, value):
+        return md5_safe(value)
+
+    @hybrid_property
+    def branch_pattern(self):
+        return self._branch_pattern or '*'
+
+    @hybrid_property
+    def branch_hash(self):
+        return self._branch_hash
+
+    def _validate_glob(self, value):
+        re.compile('^' + glob2re(value) + '$')
+
+    @branch_pattern.setter
+    def branch_pattern(self, value):
+        self._validate_glob(value)
+        self._branch_pattern = value or '*'
+        # set the Hash when setting the branch pattern
+        self._branch_hash = self.compute_hash(self._branch_pattern)
+
+    def matches(self, branch):
+        """
+        Check if this the branch matches entry
+
+        :param branch: branch name for the commit
+        """
+
+        branch = branch or ''
+
+        branch_matches = True
+        if branch:
+            branch_regex = re.compile('^' + glob2re(self.branch_pattern) + '$')
+            branch_matches = bool(branch_regex.search(branch))
+
+        return branch_matches
+
+
+class UserToRepoBranchPermission(Base, _BaseBranchPerms):
+    __tablename__ = 'user_to_repo_branch_permissions'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+    )
+
+    branch_rule_id = Column('branch_rule_id', Integer(), primary_key=True)
+
+    repository_id = Column('repository_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+    repo = relationship('Repository', backref='user_branch_perms')
+
+    permission_id = Column('permission_id', Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+    permission = relationship('Permission')
+
+    rule_to_perm_id = Column('rule_to_perm_id', Integer(), ForeignKey('repo_to_perm.repo_to_perm_id'), nullable=False, unique=None, default=None)
+    user_repo_to_perm = relationship('UserRepoToPerm')
+
+    rule_order = Column('rule_order', Integer(), nullable=False)
+    _branch_pattern = Column('branch_pattern', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), default=u'*')  # glob
+    _branch_hash = Column('branch_hash', UnicodeText().with_variant(UnicodeText(2048), 'mysql'))
+
+    def __unicode__(self):
+        return u'<UserBranchPermission(%s => %r)>' % (
+            self.user_repo_to_perm, self.branch_pattern)
+
+
+class UserGroupToRepoBranchPermission(Base, _BaseBranchPerms):
+    __tablename__ = 'user_group_to_repo_branch_permissions'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+    )
+
+    branch_rule_id = Column('branch_rule_id', Integer(), primary_key=True)
+
+    repository_id = Column('repository_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+    repo = relationship('Repository', backref='user_group_branch_perms')
+
+    permission_id = Column('permission_id', Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+    permission = relationship('Permission')
+
+    rule_to_perm_id = Column('rule_to_perm_id', Integer(), ForeignKey('users_group_repo_to_perm.users_group_to_perm_id'), nullable=False, unique=None, default=None)
+    user_group_repo_to_perm = relationship('UserGroupRepoToPerm')
+
+    rule_order = Column('rule_order', Integer(), nullable=False)
+    _branch_pattern = Column('branch_pattern', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), default=u'*')  # glob
+    _branch_hash = Column('branch_hash', UnicodeText().with_variant(UnicodeText(2048), 'mysql'))
+
+    def __unicode__(self):
+        return u'<UserBranchPermission(%s => %r)>' % (
+            self.user_group_repo_to_perm, self.branch_pattern)
+
+
+class DbMigrateVersion(Base, BaseModel):
+    __tablename__ = 'db_migrate_version'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    repository_id = Column('repository_id', String(250), primary_key=True)
+    repository_path = Column('repository_path', Text)
+    version = Column('version', Integer)
+
+
+class DbSession(Base, BaseModel):
+    __tablename__ = 'db_session'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    def __repr__(self):
+        return '<DB:DbSession({})>'.format(self.id)
+
+    id = Column('id', Integer())
+    namespace = Column('namespace', String(255), primary_key=True)
+    accessed = Column('accessed', DateTime, nullable=False)
+    created = Column('created', DateTime, nullable=False)
+    data = Column('data', PickleType, nullable=False)
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py
@@ -1963,18 +1963,7 @@ class Repository(Base, BaseModel):
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
-        @cache_region('long_term')
-        def _get_repo(cache_key):
-            return self._get_instance()
-
-        invalidator_context = CacheKey.repo_context_cache(
-            _get_repo, self.repo_name, None)
-
-        with invalidator_context as context:
-            context.invalidate()
-            repo = context.compute()
-
-        return repo
+        self._get_instance()
 
     def _get_instance(self, cache=True, config=None):
         repo_full_path = self.repo_full_path
@@ -2849,25 +2838,6 @@ class CacheKey(Base, BaseModel):
             return inv_obj
         return None
 
-    @classmethod
-    def repo_context_cache(cls, compute_func, repo_name, cache_type):
-        """
-        @cache_region('long_term')
-        def _heavy_calculation(cache_key):
-            return 'result'
-
-        cache_context = CacheKey.repo_context_cache(
-            _heavy_calculation, repo_name, cache_type)
-
-        with cache_context as context:
-            context.invalidate()
-            computed = context.compute()
-
-        assert computed == 'result'
-        """
-        from rhodecode.lib import caches
-        return caches.InvalidationContext(compute_func, repo_name, cache_type)
-
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py
@@ -1966,18 +1966,7 @@ class Repository(Base, BaseModel):
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
-        @cache_region('long_term')
-        def _get_repo(cache_key):
-            return self._get_instance()
-
-        invalidator_context = CacheKey.repo_context_cache(
-            _get_repo, self.repo_name, None, thread_scoped=True)
-
-        with invalidator_context as context:
-            context.invalidate()
-            repo = context.compute()
-
-        return repo
+        self._get_instance()
 
     def _get_instance(self, cache=True, config=None):
         config = config or self._config
@@ -2841,27 +2830,6 @@ class CacheKey(Base, BaseModel):
             return inv_obj
         return None
 
-    @classmethod
-    def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                           thread_scoped=False):
-        """
-        @cache_region('long_term')
-        def _heavy_calculation(cache_key):
-            return 'result'
-
-        cache_context = CacheKey.repo_context_cache(
-            _heavy_calculation, repo_name, cache_type)
-
-        with cache_context as context:
-            context.invalidate()
-            computed = context.compute()
-
-        assert computed == 'result'
-        """
-        from rhodecode.lib import caches
-        return caches.InvalidationContext(
-            compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
-
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py b/rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py
@@ -1966,18 +1966,7 @@ class Repository(Base, BaseModel):
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
-        @cache_region('long_term')
-        def _get_repo(cache_key):
-            return self._get_instance()
-
-        invalidator_context = CacheKey.repo_context_cache(
-            _get_repo, self.repo_name, None, thread_scoped=True)
-
-        with invalidator_context as context:
-            context.invalidate()
-            repo = context.compute()
-
-        return repo
+        self._get_instance()
 
     def _get_instance(self, cache=True, config=None):
         config = config or self._config
@@ -2841,26 +2830,6 @@ class CacheKey(Base, BaseModel):
             return inv_obj
         return None
 
-    @classmethod
-    def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                           thread_scoped=False):
-        """
-        @cache_region('long_term')
-        def _heavy_calculation(cache_key):
-            return 'result'
-
-        cache_context = CacheKey.repo_context_cache(
-            _heavy_calculation, repo_name, cache_type)
-
-        with cache_context as context:
-            context.invalidate()
-            computed = context.compute()
-
-        assert computed == 'result'
-        """
-        from rhodecode.lib import caches
-        return caches.InvalidationContext(
-            compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
 
 
 class ChangesetComment(Base, BaseModel):
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py b/rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py
@@ -1968,18 +1968,7 @@ class Repository(Base, BaseModel):
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
-        @cache_region('long_term')
-        def _get_repo(cache_key):
-            return self._get_instance()
-
-        invalidator_context = CacheKey.repo_context_cache(
-            _get_repo, self.repo_name, None, thread_scoped=True)
-
-        with invalidator_context as context:
-            context.invalidate()
-            repo = context.compute()
-
-        return repo
+        self._get_instance()
 
     def _get_instance(self, cache=True, config=None):
         config = config or self._config
@@ -2845,27 +2834,6 @@ class CacheKey(Base, BaseModel):
             return inv_obj
         return None
 
-    @classmethod
-    def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                           thread_scoped=False):
-        """
-        @cache_region('long_term')
-        def _heavy_calculation(cache_key):
-            return 'result'
-
-        cache_context = CacheKey.repo_context_cache(
-            _heavy_calculation, repo_name, cache_type)
-
-        with cache_context as context:
-            context.invalidate()
-            computed = context.compute()
-
-        assert computed == 'result'
-        """
-        from rhodecode.lib import caches
-        return caches.InvalidationContext(
-            compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
-
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py
@@ -1968,18 +1968,7 @@ class Repository(Base, BaseModel):
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
-        @cache_region('long_term')
-        def _get_repo(cache_key):
-            return self._get_instance()
-
-        invalidator_context = CacheKey.repo_context_cache(
-            _get_repo, self.repo_name, None, thread_scoped=True)
-
-        with invalidator_context as context:
-            context.invalidate()
-            repo = context.compute()
-
-        return repo
+        self._get_instance()
 
     def _get_instance(self, cache=True, config=None):
         config = config or self._config
@@ -2845,27 +2834,6 @@ class CacheKey(Base, BaseModel):
             return inv_obj
         return None
 
-    @classmethod
-    def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                           thread_scoped=False):
-        """
-        @cache_region('long_term')
-        def _heavy_calculation(cache_key):
-            return 'result'
-
-        cache_context = CacheKey.repo_context_cache(
-            _heavy_calculation, repo_name, cache_type)
-
-        with cache_context as context:
-            context.invalidate()
-            computed = context.compute()
-
-        assert computed == 'result'
-        """
-        from rhodecode.lib import caches
-        return caches.InvalidationContext(
-            compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
-
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py
@@ -2010,18 +2010,7 @@ class Repository(Base, BaseModel):
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
-        @cache_region('long_term')
-        def _get_repo(cache_key):
-            return self._get_instance()
-
-        invalidator_context = CacheKey.repo_context_cache(
-            _get_repo, self.repo_name, None, thread_scoped=True)
-
-        with invalidator_context as context:
-            context.invalidate()
-            repo = context.compute()
-
-        return repo
+        self._get_instance()
 
     def _get_instance(self, cache=True, config=None):
         config = config or self._config
@@ -2900,27 +2889,6 @@ class CacheKey(Base, BaseModel):
             return inv_obj
         return None
 
-    @classmethod
-    def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                           thread_scoped=False):
-        """
-        @cache_region('long_term')
-        def _heavy_calculation(cache_key):
-            return 'result'
-
-        cache_context = CacheKey.repo_context_cache(
-            _heavy_calculation, repo_name, cache_type)
-
-        with cache_context as context:
-            context.invalidate()
-            computed = context.compute()
-
-        assert computed == 'result'
-        """
-        from rhodecode.lib import caches
-        return caches.InvalidationContext(
-            compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
-
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py b/rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py
@@ -2011,18 +2011,7 @@ class Repository(Base, BaseModel):
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
-        @cache_region('long_term')
-        def _get_repo(cache_key):
-            return self._get_instance()
-
-        invalidator_context = CacheKey.repo_context_cache(
-            _get_repo, self.repo_name, None, thread_scoped=True)
-
-        with invalidator_context as context:
-            context.invalidate()
-            repo = context.compute()
-
-        return repo
+        self._get_instance()
 
     def _get_instance(self, cache=True, config=None):
         config = config or self._config
@@ -2901,27 +2890,6 @@ class CacheKey(Base, BaseModel):
             return inv_obj
         return None
 
-    @classmethod
-    def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                           thread_scoped=False):
-        """
-        @cache_region('long_term')
-        def _heavy_calculation(cache_key):
-            return 'result'
-
-        cache_context = CacheKey.repo_context_cache(
-            _heavy_calculation, repo_name, cache_type)
-
-        with cache_context as context:
-            context.invalidate()
-            computed = context.compute()
-
-        assert computed == 'result'
-        """
-        from rhodecode.lib import caches
-        return caches.InvalidationContext(
-            compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
-
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py
@@ -2199,18 +2199,7 @@ class Repository(Base, BaseModel):
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
-        @cache_region('long_term')
-        def _get_repo(cache_key):
-            return self._get_instance()
-
-        invalidator_context = CacheKey.repo_context_cache(
-            _get_repo, self.repo_name, None, thread_scoped=True)
-
-        with invalidator_context as context:
-            context.invalidate()
-            repo = context.compute()
-
-        return repo
+        self._get_instance()
 
     def _get_instance(self, cache=True, config=None):
         config = config or self._config
@@ -3101,27 +3090,6 @@ class CacheKey(Base, BaseModel):
             return inv_obj
         return None
 
-    @classmethod
-    def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                           thread_scoped=False):
-        """
-        @cache_region('long_term')
-        def _heavy_calculation(cache_key):
-            return 'result'
-
-        cache_context = CacheKey.repo_context_cache(
-            _heavy_calculation, repo_name, cache_type)
-
-        with cache_context as context:
-            context.invalidate()
-            computed = context.compute()
-
-        assert computed == 'result'
-        """
-        from rhodecode.lib import caches
-        return caches.InvalidationContext(
-            compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
-
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
diff --git a/rhodecode/lib/dbmigrate/versions/087_version_4_13_0.py b/rhodecode/lib/dbmigrate/versions/087_version_4_13_0.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/087_version_4_13_0.py
@@ -0,0 +1,40 @@
+import logging
+
+from sqlalchemy import *
+
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_11_0_0 as db
+
+    pull_request_table = db.PullRequest.__table__
+    pull_request_version_table = db.PullRequestVersion.__table__
+
+    renderer = Column('description_renderer', Unicode(64), nullable=True)
+    renderer.create(table=pull_request_table)
+
+    renderer_ver = Column('description_renderer', Unicode(64), nullable=True)
+    renderer_ver.create(table=pull_request_version_table)
+
+    # issue fixups
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    pass
+
+
diff --git a/rhodecode/lib/dbmigrate/versions/088_version_4_13_0.py b/rhodecode/lib/dbmigrate/versions/088_version_4_13_0.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/088_version_4_13_0.py
@@ -0,0 +1,46 @@
+import logging
+
+from sqlalchemy import *
+from sqlalchemy.engine import reflection
+from sqlalchemy.dialects.mysql import LONGTEXT
+
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+
+from rhodecode.lib.dbmigrate.utils import create_default_permissions, \
+    create_default_object_permission
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_13_0_0 as db
+
+    # issue fixups
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    # create default permissions
+    create_default_permissions(_SESSION, models)
+    log.info('created default global permissions definitions')
+    _SESSION().commit()
+
+    # # fix default object permissions
+    # create_default_object_permission(_SESSION, models)
+
+    log.info('created default permission')
+    _SESSION().commit()
+
diff --git a/rhodecode/lib/dbmigrate/versions/089_version_4_13_0.py b/rhodecode/lib/dbmigrate/versions/089_version_4_13_0.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/089_version_4_13_0.py
@@ -0,0 +1,39 @@
+import logging
+
+from sqlalchemy import *
+from sqlalchemy.engine import reflection
+from sqlalchemy.dialects.mysql import LONGTEXT
+
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_13_0_0 as db
+
+    db.UserToRepoBranchPermission.__table__.create()
+    db.UserGroupToRepoBranchPermission.__table__.create()
+
+    # issue fixups
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    pass
+
+
diff --git a/rhodecode/lib/dbmigrate/versions/090_version_4_13_0.py b/rhodecode/lib/dbmigrate/versions/090_version_4_13_0.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/090_version_4_13_0.py
@@ -0,0 +1,43 @@
+import logging
+
+from sqlalchemy import *
+
+from rhodecode.lib.dbmigrate.utils import (
+    create_default_object_permission, create_default_permissions)
+
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_13_0_0 as db
+
+    # issue fixups
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    # create default permissions
+    create_default_permissions(_SESSION, models)
+    log.info('created default global permissions definitions')
+    _SESSION().commit()
+
+    # fix default object permissions
+    create_default_object_permission(_SESSION, models)
+
+    log.info('created default permission')
+    _SESSION().commit()
+
+
diff --git a/rhodecode/lib/exc_tracking.py b/rhodecode/lib/exc_tracking.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/exc_tracking.py
@@ -0,0 +1,146 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import os
+import time
+import datetime
+import msgpack
+import logging
+import traceback
+import tempfile
+
+
+log = logging.getLogger(__name__)
+
+# NOTE: Any changes should be synced with exc_tracking at vcsserver.lib.exc_tracking
+global_prefix = 'rhodecode'
+
+
+def exc_serialize(exc_id, tb, exc_type):
+
+    data = {
+        'version': 'v1',
+        'exc_id': exc_id,
+        'exc_utc_date': datetime.datetime.utcnow().isoformat(),
+        'exc_timestamp': repr(time.time()),
+        'exc_message': tb,
+        'exc_type': exc_type,
+    }
+    return msgpack.packb(data), data
+
+
+def exc_unserialize(tb):
+    return msgpack.unpackb(tb)
+
+
+def get_exc_store():
+    """
+    Get and create exception store if it's not existing
+    """
+    exc_store_dir = 'rc_exception_store_v1'
+    # fallback
+    _exc_store_path = os.path.join(tempfile.gettempdir(), exc_store_dir)
+
+    exc_store_dir = ''  # TODO: need a persistent cross instance store here
+    if exc_store_dir:
+        _exc_store_path = os.path.join(exc_store_dir, exc_store_dir)
+
+    _exc_store_path = os.path.abspath(_exc_store_path)
+    if not os.path.isdir(_exc_store_path):
+        os.makedirs(_exc_store_path)
+        log.debug('Initializing exceptions store at %s', _exc_store_path)
+    return _exc_store_path
+
+
+def _store_exception(exc_id, exc_info, prefix):
+    exc_type, exc_value, exc_traceback = exc_info
+    tb = ''.join(traceback.format_exception(
+        exc_type, exc_value, exc_traceback, None))
+
+    exc_type_name = exc_type.__name__
+    exc_store_path = get_exc_store()
+    exc_data, org_data = exc_serialize(exc_id, tb, exc_type_name)
+    exc_pref_id = '{}_{}_{}'.format(exc_id, prefix, org_data['exc_timestamp'])
+    if not os.path.isdir(exc_store_path):
+        os.makedirs(exc_store_path)
+    stored_exc_path = os.path.join(exc_store_path, exc_pref_id)
+    with open(stored_exc_path, 'wb') as f:
+        f.write(exc_data)
+    log.debug('Stored generated exception %s as: %s', exc_id, stored_exc_path)
+
+
+def store_exception(exc_id, exc_info, prefix=global_prefix):
+    try:
+        _store_exception(exc_id=exc_id, exc_info=exc_info, prefix=prefix)
+    except Exception:
+        log.exception('Failed to store exception `%s` information', exc_id)
+        # there's no way this can fail, it will crash server badly if it does.
+        pass
+
+
+def _find_exc_file(exc_id, prefix=global_prefix):
+    exc_store_path = get_exc_store()
+    if prefix:
+        exc_id = '{}_{}'.format(exc_id, prefix)
+    else:
+        # search without a prefix
+        exc_id = '{}'.format(exc_id)
+
+    # we need to search the store for such start pattern as above
+    for fname in os.listdir(exc_store_path):
+        if fname.startswith(exc_id):
+            exc_id = os.path.join(exc_store_path, fname)
+            break
+        continue
+    else:
+        exc_id = None
+
+    return exc_id
+
+
+def _read_exception(exc_id, prefix):
+    exc_id_file_path = _find_exc_file(exc_id=exc_id, prefix=prefix)
+    if exc_id_file_path:
+        with open(exc_id_file_path, 'rb') as f:
+            return exc_unserialize(f.read())
+    else:
+        log.debug('Exception File `%s` not found', exc_id_file_path)
+    return None
+
+
+def read_exception(exc_id, prefix=global_prefix):
+    try:
+        return _read_exception(exc_id=exc_id, prefix=prefix)
+    except Exception:
+        log.exception('Failed to read exception `%s` information', exc_id)
+        # there's no way this can fail, it will crash server badly if it does.
+    return None
+
+
+def delete_exception(exc_id, prefix=global_prefix):
+    try:
+        exc_id_file_path = _find_exc_file(exc_id, prefix=prefix)
+        if exc_id_file_path:
+            os.remove(exc_id_file_path)
+
+    except Exception:
+        log.exception('Failed to remove exception `%s` information', exc_id)
+        # there's no way this can fail, it will crash server badly if it does.
+        pass
diff --git a/rhodecode/lib/exceptions.py b/rhodecode/lib/exceptions.py
--- a/rhodecode/lib/exceptions.py
+++ b/rhodecode/lib/exceptions.py
@@ -107,6 +107,21 @@ class HTTPLockedRC(HTTPClientError):
         self.args = (message, )
 
 
+class HTTPBranchProtected(HTTPClientError):
+    """
+    Special Exception For Indicating that branch is protected in RhodeCode, the
+    return code can be overwritten by _code keyword argument passed into constructors
+    """
+    code = 403
+    title = explanation = 'Branch Protected'
+    reason = None
+
+    def __init__(self, message, *args, **kwargs):
+        self.title = self.explanation = message
+        super(HTTPBranchProtected, self).__init__(*args, **kwargs)
+        self.args = (message, )
+
+
 class IMCCommitError(Exception):
     pass
 
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -29,6 +29,7 @@ import os
 import random
 import hashlib
 import StringIO
+import textwrap
 import urllib
 import math
 import logging
@@ -42,6 +43,7 @@ from collections import OrderedDict
 import pygments
 import itertools
 import fnmatch
+import bleach
 
 from datetime import datetime
 from functools import partial
@@ -1777,16 +1779,19 @@ def render_binary(repo_name, file_obj):
     """
     Choose how to render a binary file
     """
+
     filename = file_obj.name
 
     # images
     for ext in ['*.png', '*.jpg', '*.ico', '*.gif']:
         if fnmatch.fnmatch(filename, pat=ext):
-            alt = filename
+            alt = escape(filename)
             src = route_path(
                 'repo_file_raw', repo_name=repo_name,
-                commit_id=file_obj.commit.raw_id, f_path=file_obj.path)
-            return literal('<img class="rendered-binary" alt="{}" src="{}">'.format(alt, src))
+                commit_id=file_obj.commit.raw_id,
+                f_path=file_obj.path)
+            return literal(
+                '<img class="rendered-binary" alt="{}" src="{}">'.format(alt, src))
 
 
 def renderer_from_filename(filename, exclude=None):
@@ -1813,7 +1818,11 @@ def render(source, renderer='rst', menti
             return relative_links(html_source, relative_urls)
         return html_source
 
-    if renderer == 'rst':
+    if renderer == 'plain':
+        return literal(
+            MarkupRenderer.plain(source, leading_newline=False))
+
+    elif renderer == 'rst':
         if repo_name:
             # process patterns on comments if we pass in repo name
             source, issues = process_patterns(
@@ -1823,6 +1832,7 @@ def render(source, renderer='rst', menti
             '<div class="rst-block">%s</div>' %
             maybe_convert_relative_links(
                 MarkupRenderer.rst(source, mentions=mentions)))
+
     elif renderer == 'markdown':
         if repo_name:
             # process patterns on comments if we pass in repo name
@@ -1834,6 +1844,7 @@ def render(source, renderer='rst', menti
             maybe_convert_relative_links(
                 MarkupRenderer.markdown(source, flavored=True,
                                         mentions=mentions)))
+
     elif renderer == 'jupyter':
         return literal(
             '<div class="ipynb">%s</div>' %
@@ -1864,6 +1875,8 @@ def get_permission_name(key):
 
 def journal_filter_help(request):
     _ = request.translate
+    from rhodecode.lib.audit_logger import ACTIONS
+    actions = '\n'.join(textwrap.wrap(', '.join(sorted(ACTIONS.keys())), 80))
 
     return _(
         'Example filter terms:\n' +
@@ -1875,6 +1888,8 @@ def journal_filter_help(request):
         '     date:20120101\n' +
         '     date:[20120101100000 TO 20120102]\n' +
         '\n' +
+        'Actions: {actions}\n' +
+        '\n' +
         'Generate wildcards using \'*\' character:\n' +
         '     "repository:vcs*" - search everything starting with \'vcs\'\n' +
         '     "repository:*vcs*" - search for repository containing \'vcs\'\n' +
@@ -1882,7 +1897,7 @@ def journal_filter_help(request):
         'Optional AND / OR operators in queries\n' +
         '     "repository:vcs OR repository:test"\n' +
         '     "username:test AND repository:test*"\n'
-    )
+    ).format(actions=actions)
 
 
 def search_filter_help(searcher, request):
diff --git a/rhodecode/lib/hooks_base.py b/rhodecode/lib/hooks_base.py
--- a/rhodecode/lib/hooks_base.py
+++ b/rhodecode/lib/hooks_base.py
@@ -32,7 +32,8 @@ from rhodecode import events
 from rhodecode.lib import helpers as h
 from rhodecode.lib import audit_logger
 from rhodecode.lib.utils2 import safe_str
-from rhodecode.lib.exceptions import HTTPLockedRC, UserCreationError
+from rhodecode.lib.exceptions import (
+    HTTPLockedRC, HTTPBranchProtected, UserCreationError)
 from rhodecode.model.db import Repository, User
 
 log = logging.getLogger(__name__)
@@ -94,9 +95,9 @@ def pre_push(extras):
     It bans pushing when the repository is locked.
     """
 
-    usr = User.get_by_username(extras.username)
+    user = User.get_by_username(extras.username)
     output = ''
-    if extras.locked_by[0] and usr.user_id != int(extras.locked_by[0]):
+    if extras.locked_by[0] and user.user_id != int(extras.locked_by[0]):
         locked_by = User.get(extras.locked_by[0]).username
         reason = extras.locked_by[2]
         # this exception is interpreted in git/hg middlewares and based
@@ -109,9 +110,48 @@ def pre_push(extras):
         else:
             raise _http_ret
 
-    # Propagate to external components. This is done after checking the
-    # lock, for consistent behavior.
     if not is_shadow_repo(extras):
+        if extras.commit_ids and extras.check_branch_perms:
+
+            auth_user = user.AuthUser()
+            repo = Repository.get_by_repo_name(extras.repository)
+            affected_branches = []
+            if repo.repo_type == 'hg':
+                for entry in extras.commit_ids:
+                    if entry['type'] == 'branch':
+                        is_forced = bool(entry['multiple_heads'])
+                        affected_branches.append([entry['name'], is_forced])
+            elif repo.repo_type == 'git':
+                for entry in extras.commit_ids:
+                    if entry['type'] == 'heads':
+                        is_forced = bool(entry['pruned_sha'])
+                        affected_branches.append([entry['name'], is_forced])
+
+            for branch_name, is_forced in affected_branches:
+
+                rule, branch_perm = auth_user.get_rule_and_branch_permission(
+                    extras.repository, branch_name)
+                if not branch_perm:
+                    # no branch permission found for this branch, just keep checking
+                    continue
+
+                if branch_perm == 'branch.push_force':
+                    continue
+                elif branch_perm == 'branch.push' and is_forced is False:
+                    continue
+                elif branch_perm == 'branch.push' and is_forced is True:
+                    halt_message = 'Branch `{}` changes rejected by rule {}. ' \
+                                   'FORCE PUSH FORBIDDEN.'.format(branch_name, rule)
+                else:
+                    halt_message = 'Branch `{}` changes rejected by rule {}.'.format(
+                        branch_name, rule)
+
+                if halt_message:
+                    _http_ret = HTTPBranchProtected(halt_message)
+                    raise _http_ret
+
+        # Propagate to external components. This is done after checking the
+        # lock, for consistent behavior.
         pre_push_extension(repo_store_path=Repository.base_path(), **extras)
         events.trigger(events.RepoPrePushEvent(
             repo_name=extras.repository, extras=extras))
diff --git a/rhodecode/lib/hooks_daemon.py b/rhodecode/lib/hooks_daemon.py
--- a/rhodecode/lib/hooks_daemon.py
+++ b/rhodecode/lib/hooks_daemon.py
@@ -29,12 +29,13 @@ from BaseHTTPServer import BaseHTTPReque
 from SocketServer import TCPServer
 
 import rhodecode
+from rhodecode.lib.exceptions import HTTPLockedRC, HTTPBranchProtected
 from rhodecode.model import meta
 from rhodecode.lib.base import bootstrap_request, bootstrap_config
 from rhodecode.lib import hooks_base
 from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.lib.ext_json import json
-
+from rhodecode.lib import rc_cache
 
 log = logging.getLogger(__name__)
 
@@ -45,10 +46,9 @@ class HooksHttpHandler(BaseHTTPRequestHa
         method, extras = self._read_request()
         txn_id = getattr(self.server, 'txn_id', None)
         if txn_id:
-            from rhodecode.lib.caches import compute_key_from_params
             log.debug('Computing TXN_ID based on `%s`:`%s`',
                       extras['repository'], extras['txn_id'])
-            computed_txn_id = compute_key_from_params(
+            computed_txn_id = rc_cache.utils.compute_key_from_params(
                 extras['repository'], extras['txn_id'])
             if txn_id != computed_txn_id:
                 raise Exception(
@@ -119,8 +119,8 @@ class ThreadedHookCallbackDaemon(object)
     _daemon = None
     _done = False
 
-    def __init__(self, txn_id=None, port=None):
-        self._prepare(txn_id=txn_id, port=port)
+    def __init__(self, txn_id=None, host=None, port=None):
+        self._prepare(txn_id=txn_id, host=None, port=port)
 
     def __enter__(self):
         self._run()
@@ -130,7 +130,7 @@ class ThreadedHookCallbackDaemon(object)
         log.debug('Callback daemon exiting now...')
         self._stop()
 
-    def _prepare(self, txn_id=None, port=None):
+    def _prepare(self, txn_id=None, host=None, port=None):
         raise NotImplementedError()
 
     def _run(self):
@@ -147,17 +147,16 @@ class HttpHooksCallbackDaemon(ThreadedHo
 
     hooks_uri = None
 
-    IP_ADDRESS = '127.0.0.1'
-
     # From Python docs: Polling reduces our responsiveness to a shutdown
     # request and wastes cpu at all other times.
     POLL_INTERVAL = 0.01
 
-    def _prepare(self, txn_id=None, port=None):
+    def _prepare(self, txn_id=None, host=None, port=None):
+        host = host or '127.0.0.1'
         self._done = False
-        self._daemon = TCPServer((self.IP_ADDRESS, port or 0), HooksHttpHandler)
+        self._daemon = TCPServer((host, port or 0), HooksHttpHandler)
         _, port = self._daemon.server_address
-        self.hooks_uri = '{}:{}'.format(self.IP_ADDRESS, port)
+        self.hooks_uri = '{}:{}'.format(host, port)
         self.txn_id = txn_id
         # inject transaction_id for later verification
         self._daemon.txn_id = self.txn_id
@@ -220,7 +219,7 @@ def get_txn_id_from_store(txn_id):
         return {}
 
 
-def prepare_callback_daemon(extras, protocol, use_direct_calls, txn_id=None):
+def prepare_callback_daemon(extras, protocol, host, use_direct_calls, txn_id=None):
     txn_details = get_txn_id_from_store(txn_id)
     port = txn_details.get('port', 0)
     if use_direct_calls:
@@ -228,7 +227,8 @@ def prepare_callback_daemon(extras, prot
         extras['hooks_module'] = callback_daemon.hooks_module
     else:
         if protocol == 'http':
-            callback_daemon = HttpHooksCallbackDaemon(txn_id=txn_id, port=port)
+            callback_daemon = HttpHooksCallbackDaemon(
+                txn_id=txn_id, host=host, port=port)
         else:
             log.error('Unsupported callback daemon protocol "%s"', protocol)
             raise Exception('Unsupported callback daemon protocol.')
@@ -286,9 +286,20 @@ class Hooks(object):
 
         try:
             result = hook(extras)
-        except Exception as error:
-            exc_tb = traceback.format_exc()
-            log.exception('Exception when handling hook %s', hook)
+        except HTTPBranchProtected as handled_error:
+            # Those special cases doesn't need error reporting. It's a case of
+            # locked repo or protected branch
+            result = AttributeDict({
+                'status': handled_error.code,
+                'output': handled_error.explanation
+            })
+        except (HTTPLockedRC, Exception) as error:
+            # locked needs different handling since we need to also
+            # handle PULL operations
+            exc_tb = ''
+            if not isinstance(error, HTTPLockedRC):
+                exc_tb = traceback.format_exc()
+                log.exception('Exception when handling hook %s', hook)
             error_args = error.args
             return {
                 'status': 128,
diff --git a/rhodecode/lib/logging_formatter.py b/rhodecode/lib/logging_formatter.py
--- a/rhodecode/lib/logging_formatter.py
+++ b/rhodecode/lib/logging_formatter.py
@@ -123,6 +123,35 @@ class ColorFormatter(ExceptionAwareForma
         return colored_record
 
 
+def _inject_req_id(record):
+    from pyramid.threadlocal import get_current_request
+    req = get_current_request()
+    req_id = 'req_id:%-36s ' % (getattr(req, 'req_id', None))
+    record.req_id = req_id
+
+
+class RequestTrackingFormatter(ExceptionAwareFormatter):
+    def format(self, record):
+        _inject_req_id(record)
+        def_record = logging.Formatter.format(self, record)
+        return def_record
+
+
+class ColorRequestTrackingFormatter(ColorFormatter):
+    def format(self, record):
+        """
+        Changes record's levelname to use with COLORS enum
+        """
+        _inject_req_id(record)
+        levelname = record.levelname
+        start = COLOR_SEQ % (COLORS[levelname])
+        def_record = logging.Formatter.format(self, record)
+        end = RESET_SEQ
+
+        colored_record = ''.join([start, def_record, end])
+        return colored_record
+
+
 class ColorFormatterSql(logging.Formatter):
 
     def format(self, record):
diff --git a/rhodecode/lib/markup_renderer.py b/rhodecode/lib/markup_renderer.py
--- a/rhodecode/lib/markup_renderer.py
+++ b/rhodecode/lib/markup_renderer.py
@@ -240,7 +240,11 @@ class MarkupRenderer(object):
         from .bleach_whitelist import markdown_attrs, markdown_tags
         allowed_tags = markdown_tags
         allowed_attrs = markdown_attrs
-        return bleach.clean(text, tags=allowed_tags, attributes=allowed_attrs)
+
+        try:
+            return bleach.clean(text, tags=allowed_tags, attributes=allowed_attrs)
+        except Exception:
+            return 'UNPARSEABLE TEXT'
 
     @classmethod
     def renderer_from_filename(cls, filename, exclude):
@@ -319,14 +323,18 @@ class MarkupRenderer(object):
         return cls.URL_PAT.sub(url_func, text)
 
     @classmethod
-    def plain(cls, source, universal_newline=True):
+    def plain(cls, source, universal_newline=True, leading_newline=True):
         source = safe_unicode(source)
         if universal_newline:
             newline = '\n'
             source = newline.join(source.splitlines())
 
-        source = cls.urlify_text(source)
-        return '<br />' + source.replace("\n", '<br />')
+        rendered_source = cls.urlify_text(source)
+        source = ''
+        if leading_newline:
+            source += '<br />'
+        source += rendered_source.replace("\n", '<br />')
+        return source
 
     @classmethod
     def markdown(cls, source, safe=True, flavored=True, mentions=False,
@@ -357,17 +365,18 @@ class MarkupRenderer(object):
             if flavored:
                 source = cls._flavored_markdown(source)
             rendered = markdown_renderer.convert(source)
-            if clean_html:
-                rendered = cls.bleach_clean(rendered)
-            return rendered
         except Exception:
             log.exception('Error when rendering Markdown')
             if safe:
                 log.debug('Fallback to render in plain mode')
-                return cls.plain(source)
+                rendered = cls.plain(source)
             else:
                 raise
 
+        if clean_html:
+            rendered = cls.bleach_clean(rendered)
+        return rendered
+
     @classmethod
     def rst(cls, source, safe=True, mentions=False, clean_html=False):
         if mentions:
diff --git a/rhodecode/lib/memory_lru_debug.py b/rhodecode/lib/memory_lru_dict.py
rename from rhodecode/lib/memory_lru_debug.py
rename to rhodecode/lib/memory_lru_dict.py
--- a/rhodecode/lib/memory_lru_debug.py
+++ b/rhodecode/lib/memory_lru_dict.py
@@ -25,24 +25,38 @@ and the state of LRU dict.
 inrae.cache is licensed under LRUDict is licensed under ZPL license
 This software is Copyright (c) Zope Corporation (tm) and
 Contributors. All rights reserved.
-
-TODO: marcink, we might think of replacing the LRUDict with lru-dict library
-written in C.
+"""
 
-eg difference in speed:
-
-    LRUDictC  Time : 0.00025 s, Memory : 110592 Kb
-    LRUDict   Time : 0.00369 s, Memory : 147456 Kb
-"""
 import logging
 
-from infrae.cache.beakerext.lru import LRUDict
+from repoze.lru import LRUCache
 from beaker.container import MemoryNamespaceManager, AbstractDictionaryNSManager
 from rhodecode.lib.utils2 import safe_str
 
 log = logging.getLogger(__name__)
 
 
+class LRUDict(LRUCache):
+    """
+    Wrapper to provide partial dict access
+    """
+
+    def __setitem__(self, key, value):
+        return self.put(key, value)
+
+    def __getitem__(self, key):
+        return self.get(key)
+
+    def __contains__(self, key):
+        return bool(self.get(key))
+
+    def __delitem__(self, key):
+        del self.data[key]
+
+    def keys(self):
+        return self.data.keys()
+
+
 class LRUDictDebug(LRUDict):
     """
     Wrapper to provide some debug options
diff --git a/rhodecode/lib/middleware/simplehg.py b/rhodecode/lib/middleware/simplehg.py
--- a/rhodecode/lib/middleware/simplehg.py
+++ b/rhodecode/lib/middleware/simplehg.py
@@ -25,6 +25,7 @@ SimpleHG middleware for handling mercuri
 
 import logging
 import urlparse
+import urllib
 
 from rhodecode.lib import utils
 from rhodecode.lib.ext_json import json
@@ -51,24 +52,94 @@ class SimpleHg(simplevcs.SimpleVCS):
         'getbundle': 'pull',
         'stream_out': 'pull',
         'listkeys': 'pull',
+        'between': 'pull',
+        'branchmap': 'pull',
+        'branches': 'pull',
+        'clonebundles': 'pull',
+        'capabilities': 'pull',
+        'debugwireargs': 'pull',
+        'heads': 'pull',
+        'lookup': 'pull',
+        'hello': 'pull',
+        'known': 'pull',
+
+        # largefiles
+        'putlfile': 'push',
+        'getlfile': 'pull',
+        'statlfile': 'pull',
+        'lheads': 'pull',
+
         'unbundle': 'push',
         'pushkey': 'push',
     }
 
+    @classmethod
+    def _get_xarg_headers(cls, environ):
+        i = 1
+        chunks = []  # gather chunks stored in multiple 'hgarg_N'
+        while True:
+            head = environ.get('HTTP_X_HGARG_{}'.format(i))
+            if not head:
+                break
+            i += 1
+            chunks.append(urllib.unquote_plus(head))
+        full_arg = ''.join(chunks)
+        pref = 'cmds='
+        if full_arg.startswith(pref):
+            # strip the cmds= header defining our batch commands
+            full_arg = full_arg[len(pref):]
+        cmds = full_arg.split(';')
+        return cmds
+
+    @classmethod
+    def _get_batch_cmd(cls, environ):
+        """
+        Handle batch command send commands. Those are ';' separated commands
+        sent by batch command that server needs to execute. We need to extract
+        those, and map them to our ACTION_MAPPING to get all push/pull commands
+        specified in the batch
+        """
+        default = 'push'
+        batch_cmds = []
+        try:
+            cmds = cls._get_xarg_headers(environ)
+            for pair in cmds:
+                parts = pair.split(' ', 1)
+                if len(parts) != 2:
+                    continue
+                # entry should be in a format `key ARGS`
+                cmd, args = parts
+                action = cls._ACTION_MAPPING.get(cmd, default)
+                batch_cmds.append(action)
+        except Exception:
+            log.exception('Failed to extract batch commands operations')
+
+        # in case we failed, (e.g malformed data) assume it's PUSH sub-command
+        # for safety
+        return batch_cmds or [default]
+
     def _get_action(self, environ):
         """
         Maps mercurial request commands into a pull or push command.
-        In case of unknown/unexpected data, it returns 'pull' to be safe.
+        In case of unknown/unexpected data, it returns 'push' to be safe.
 
         :param environ:
         """
+        default = 'push'
         query = urlparse.parse_qs(environ['QUERY_STRING'],
                                   keep_blank_values=True)
+
         if 'cmd' in query:
             cmd = query['cmd'][0]
-            return self._ACTION_MAPPING.get(cmd, 'pull')
+            if cmd == 'batch':
+                cmds = self._get_batch_cmd(environ)
+                if 'push' in cmds:
+                    return 'push'
+                else:
+                    return 'pull'
+            return self._ACTION_MAPPING.get(cmd, default)
 
-        return 'pull'
+        return default
 
     def _create_wsgi_app(self, repo_path, repo_name, config):
         return self.scm_app.create_hg_wsgi_app(
diff --git a/rhodecode/lib/middleware/simplesvn.py b/rhodecode/lib/middleware/simplesvn.py
--- a/rhodecode/lib/middleware/simplesvn.py
+++ b/rhodecode/lib/middleware/simplesvn.py
@@ -26,7 +26,7 @@ from urlparse import urljoin
 import requests
 from pyramid.httpexceptions import HTTPNotAcceptable
 
-from rhodecode.lib import caches
+from rhodecode.lib import rc_cache
 from rhodecode.lib.middleware import simplevcs
 from rhodecode.lib.utils import is_valid_repo
 from rhodecode.lib.utils2 import str2bool, safe_int
@@ -86,7 +86,7 @@ class SimpleSvnApp(object):
 
         if response.headers.get('SVN-Txn-name'):
             svn_tx_id = response.headers.get('SVN-Txn-name')
-            txn_id = caches.compute_key_from_params(
+            txn_id = rc_cache.utils.compute_key_from_params(
                 self.config['repository'], svn_tx_id)
             port = safe_int(self.rc_extras['hooks_uri'].split(':')[-1])
             store_txn_id_data(txn_id, {'port': port})
diff --git a/rhodecode/lib/middleware/simplevcs.py b/rhodecode/lib/middleware/simplevcs.py
--- a/rhodecode/lib/middleware/simplevcs.py
+++ b/rhodecode/lib/middleware/simplevcs.py
@@ -39,9 +39,8 @@ from pyramid.httpexceptions import (
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
 import rhodecode
-from rhodecode.authentication.base import (
-    authenticate, get_perms_cache_manager, VCS_TYPE, loadplugin)
-from rhodecode.lib import caches
+from rhodecode.authentication.base import authenticate, VCS_TYPE, loadplugin
+from rhodecode.lib import rc_cache
 from rhodecode.lib.auth import AuthUser, HasPermissionAnyMiddleware
 from rhodecode.lib.base import (
     BasicAuth, get_ip_addr, get_user_agent, vcs_operation_context)
@@ -65,7 +64,7 @@ log = logging.getLogger(__name__)
 
 def extract_svn_txn_id(acl_repo_name, data):
     """
-    Helper method for extraction of svn txn_id from submited XML data during
+    Helper method for extraction of svn txn_id from submitted XML data during
     POST operations
     """
     try:
@@ -78,7 +77,7 @@ def extract_svn_txn_id(acl_repo_name, da
                         match = pat.search(sub_el.text)
                         if match:
                             svn_tx_id = match.groupdict()['txn_id']
-                            txn_id = caches.compute_key_from_params(
+                            txn_id = rc_cache.utils.compute_key_from_params(
                                 acl_repo_name, svn_tx_id)
                             return txn_id
     except Exception:
@@ -204,13 +203,14 @@ class SimpleVCS(object):
 
             # Only proceed if we got a pull request and if acl repo name from
             # URL equals the target repo name of the pull request.
-            if pull_request and (acl_repo_name ==
-                                 pull_request.target_repo.repo_name):
+            if pull_request and \
+                    (acl_repo_name == pull_request.target_repo.repo_name):
+                repo_id = pull_request.target_repo.repo_id
                 # Get file system path to shadow repository.
                 workspace_id = PullRequestModel()._workspace_id(pull_request)
                 target_vcs = pull_request.target_repo.scm_instance()
                 vcs_repo_name = target_vcs._get_shadow_repository_path(
-                    workspace_id)
+                    repo_id, workspace_id)
 
                 # Store names for later usage.
                 self.vcs_repo_name = vcs_repo_name
@@ -297,7 +297,7 @@ class SimpleVCS(object):
     def is_shadow_repo_dir(self):
         return os.path.isdir(self.vcs_repo_name)
 
-    def _check_permission(self, action, user, repo_name, ip_addr=None,
+    def _check_permission(self, action, user, auth_user, repo_name, ip_addr=None,
                           plugin_id='', plugin_cache_active=False, cache_ttl=0):
         """
         Checks permissions using action (push/pull) user and repository
@@ -310,36 +310,24 @@ class SimpleVCS(object):
         :param repo_name: repository name
         """
 
-        # get instance of cache manager configured for a namespace
-        cache_manager = get_perms_cache_manager(
-            custom_ttl=cache_ttl, suffix=user.user_id)
         log.debug('AUTH_CACHE_TTL for permissions `%s` active: %s (TTL: %s)',
                   plugin_id, plugin_cache_active, cache_ttl)
 
-        # for environ based password can be empty, but then the validation is
-        # on the server that fills in the env data needed for authentication
-        _perm_calc_hash = caches.compute_key_from_params(
-            plugin_id, action, user.user_id, repo_name, ip_addr)
+        user_id = user.user_id
+        cache_namespace_uid = 'cache_user_auth.{}'.format(user_id)
+        region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
 
-        # _authenticate is a wrapper for .auth() method of plugin.
-        # it checks if .auth() sends proper data.
-        # For RhodeCodeExternalAuthPlugin it also maps users to
-        # Database and maps the attributes returned from .auth()
-        # to RhodeCode database. If this function returns data
-        # then auth is correct.
-        start = time.time()
-        log.debug('Running plugin `%s` permissions check', plugin_id)
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                               expiration_time=cache_ttl,
+                                               condition=plugin_cache_active)
+        def compute_perm_vcs(
+                cache_name, plugin_id, action, user_id, repo_name, ip_addr):
 
-        def perm_func():
-            """
-            This function is used internally in Cache of Beaker to calculate
-            Results
-            """
             log.debug('auth: calculating permission access now...')
             # check IP
             inherit = user.inherit_default_permissions
             ip_allowed = AuthUser.check_ip_allowed(
-                user.user_id, ip_addr, inherit_from_default=inherit)
+                user_id, ip_addr, inherit_from_default=inherit)
             if ip_allowed:
                 log.info('Access for IP:%s allowed', ip_addr)
             else:
@@ -347,24 +335,25 @@ class SimpleVCS(object):
 
             if action == 'push':
                 perms = ('repository.write', 'repository.admin')
-                if not HasPermissionAnyMiddleware(*perms)(user, repo_name):
+                if not HasPermissionAnyMiddleware(*perms)(auth_user, repo_name):
                     return False
 
             else:
                 # any other action need at least read permission
                 perms = (
                     'repository.read', 'repository.write', 'repository.admin')
-                if not HasPermissionAnyMiddleware(*perms)(user, repo_name):
+                if not HasPermissionAnyMiddleware(*perms)(auth_user, repo_name):
                     return False
 
             return True
 
-        if plugin_cache_active:
-            log.debug('Trying to fetch cached perms by %s', _perm_calc_hash[:6])
-            perm_result = cache_manager.get(
-                _perm_calc_hash, createfunc=perm_func)
-        else:
-            perm_result = perm_func()
+        start = time.time()
+        log.debug('Running plugin `%s` permissions check', plugin_id)
+
+        # for environ based auth, password can be empty, but then the validation is
+        # on the server that fills in the env data needed for authentication
+        perm_result = compute_perm_vcs(
+            'vcs_permissions', plugin_id, action, user.user_id, repo_name, ip_addr)
 
         auth_time = time.time() - start
         log.debug('Permissions for plugin `%s` completed in %.3fs, '
@@ -452,14 +441,17 @@ class SimpleVCS(object):
         # ======================================================================
         # CHECK ANONYMOUS PERMISSION
         # ======================================================================
+        detect_force_push = False
+        check_branch_perms = False
         if action in ['pull', 'push']:
-            anonymous_user = User.get_default_user()
+            user_obj = anonymous_user = User.get_default_user()
+            auth_user = user_obj.AuthUser()
             username = anonymous_user.username
             if anonymous_user.active:
                 plugin_cache_active, cache_ttl = self._get_default_cache_ttl()
                 # ONLY check permissions if the user is activated
                 anonymous_perm = self._check_permission(
-                    action, anonymous_user, self.acl_repo_name, ip_addr,
+                    action, anonymous_user, auth_user, self.acl_repo_name, ip_addr,
                     plugin_id='anonymous_access',
                     plugin_cache_active=plugin_cache_active,
                     cache_ttl=cache_ttl,
@@ -525,7 +517,6 @@ class SimpleVCS(object):
                         return auth_result.wsgi_application(
                             environ, start_response)
 
-
                 # ==============================================================
                 # CHECK PERMISSIONS FOR THIS REQUEST USING GIVEN USERNAME
                 # ==============================================================
@@ -533,11 +524,11 @@ class SimpleVCS(object):
                 if not self.valid_and_active_user(user):
                     return HTTPForbidden()(environ, start_response)
                 username = user.username
-                user.update_lastactivity()
-                meta.Session().commit()
+                user_id = user.user_id
 
                 # check user attributes for password change flag
                 user_obj = user
+                auth_user = user_obj.AuthUser()
                 if user_obj and user_obj.username != User.DEFAULT_USER and \
                         user_obj.user_data.get('force_password_change'):
                     reason = 'password change required'
@@ -546,18 +537,27 @@ class SimpleVCS(object):
 
                 # check permissions for this repository
                 perm = self._check_permission(
-                    action, user, self.acl_repo_name, ip_addr,
+                    action, user, auth_user, self.acl_repo_name, ip_addr,
                     plugin, plugin_cache_active, cache_ttl)
                 if not perm:
                     return HTTPForbidden()(environ, start_response)
+                environ['rc_auth_user_id'] = user_id
+
+            if action == 'push':
+                perms = auth_user.get_branch_permissions(self.acl_repo_name)
+                if perms:
+                    check_branch_perms = True
+                    detect_force_push = True
 
         # extras are injected into UI object and later available
         # in hooks executed by RhodeCode
         check_locking = _should_check_locking(environ.get('QUERY_STRING'))
+
         extras = vcs_operation_context(
             environ, repo_name=self.acl_repo_name, username=username,
             action=action, scm=self.SCM, check_locking=check_locking,
-            is_shadow_repo=self.is_shadow_repo
+            is_shadow_repo=self.is_shadow_repo, check_branch_perms=check_branch_perms,
+            detect_force_push=detect_force_push
         )
 
         # ======================================================================
@@ -662,7 +662,7 @@ class SimpleVCS(object):
 
         return prepare_callback_daemon(
             extras, protocol=vcs_settings.HOOKS_PROTOCOL,
-            use_direct_calls=direct_calls, txn_id=txn_id)
+            host=vcs_settings.HOOKS_HOST, use_direct_calls=direct_calls, txn_id=txn_id)
 
 
 def _should_check_locking(query_string):
diff --git a/rhodecode/lib/middleware/vcs.py b/rhodecode/lib/middleware/vcs.py
--- a/rhodecode/lib/middleware/vcs.py
+++ b/rhodecode/lib/middleware/vcs.py
@@ -158,7 +158,7 @@ def detect_vcs_request(environ, backends
             log.debug('got handler:%s from environ', handler)
 
     if not handler:
-        log.debug('checking if request is of VCS type in order: %s', backends)
+        log.debug('request start: checking if request is of VCS type in order: %s', backends)
         for vcs_type in backends:
             vcs_check, _handler = checks[vcs_type]
             if vcs_check(environ):
diff --git a/rhodecode/lib/pyramid_utils.py b/rhodecode/lib/pyramid_utils.py
--- a/rhodecode/lib/pyramid_utils.py
+++ b/rhodecode/lib/pyramid_utils.py
@@ -21,9 +21,10 @@
 import os
 from pyramid.compat import configparser
 from pyramid.paster import bootstrap as pyramid_bootstrap, setup_logging  # noqa
-from pyramid.request import Request
 from pyramid.scripting import prepare
 
+from rhodecode.lib.request import Request
+
 
 def get_config(ini_path, **kwargs):
     parser = configparser.ConfigParser(**kwargs)
diff --git a/rhodecode/lib/rc_cache/__init__.py b/rhodecode/lib/rc_cache/__init__.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/rc_cache/__init__.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2015-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+from dogpile.cache import register_backend
+
+register_backend(
+    "dogpile.cache.rc.memory_lru", "rhodecode.lib.rc_cache.backends",
+    "LRUMemoryBackend")
+
+register_backend(
+    "dogpile.cache.rc.file_namespace", "rhodecode.lib.rc_cache.backends",
+    "FileNamespaceBackend")
+
+register_backend(
+    "dogpile.cache.rc.redis", "rhodecode.lib.rc_cache.backends",
+    "RedisPickleBackend")
+
+
+log = logging.getLogger(__name__)
+
+from . import region_meta
+from .utils import (
+    get_default_cache_settings, key_generator, get_or_create_region,
+    clear_cache_namespace, make_region, InvalidationContext,
+    FreshRegionCache, ActiveRegionCache)
+
+
+def configure_dogpile_cache(settings):
+    cache_dir = settings.get('cache_dir')
+    if cache_dir:
+        region_meta.dogpile_config_defaults['cache_dir'] = cache_dir
+
+    rc_cache_data = get_default_cache_settings(settings, prefixes=['rc_cache.'])
+
+    # inspect available namespaces
+    avail_regions = set()
+    for key in rc_cache_data.keys():
+        namespace_name = key.split('.', 1)[0]
+        avail_regions.add(namespace_name)
+    log.debug('dogpile: found following cache regions: %s', avail_regions)
+
+    # register them into namespace
+    for region_name in avail_regions:
+        new_region = make_region(
+            name=region_name,
+            function_key_generator=key_generator
+        )
+
+        new_region.configure_from_config(settings, 'rc_cache.{}.'.format(region_name))
+
+        log.debug('dogpile: registering a new region %s[%s]',
+                  region_name, new_region.__dict__)
+        region_meta.dogpile_cache_regions[region_name] = new_region
+
+
+def includeme(config):
+    configure_dogpile_cache(config.registry.settings)
diff --git a/rhodecode/lib/rc_cache/backends.py b/rhodecode/lib/rc_cache/backends.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/rc_cache/backends.py
@@ -0,0 +1,203 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2015-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+import time
+import errno
+import logging
+
+import gevent
+
+from dogpile.cache.backends import memory as memory_backend
+from dogpile.cache.backends import file as file_backend
+from dogpile.cache.backends import redis as redis_backend
+from dogpile.cache.backends.file import NO_VALUE, compat, FileLock
+from dogpile.cache.util import memoized_property
+
+from rhodecode.lib.memory_lru_dict import LRUDict, LRUDictDebug
+
+
+_default_max_size = 1024
+
+log = logging.getLogger(__name__)
+
+
+class LRUMemoryBackend(memory_backend.MemoryBackend):
+    pickle_values = False
+
+    def __init__(self, arguments):
+        max_size = arguments.pop('max_size', _default_max_size)
+
+        LRUDictClass = LRUDict
+        if arguments.pop('log_key_count', None):
+            LRUDictClass = LRUDictDebug
+
+        arguments['cache_dict'] = LRUDictClass(max_size)
+        super(LRUMemoryBackend, self).__init__(arguments)
+
+    def delete(self, key):
+        try:
+            del self._cache[key]
+        except KeyError:
+            # we don't care if key isn't there at deletion
+            pass
+
+    def delete_multi(self, keys):
+        for key in keys:
+            self.delete(key)
+
+
+class Serializer(object):
+    def _dumps(self, value, safe=False):
+        try:
+            return compat.pickle.dumps(value)
+        except Exception:
+            if safe:
+                return NO_VALUE
+            else:
+                raise
+
+    def _loads(self, value, safe=True):
+        try:
+            return compat.pickle.loads(value)
+        except Exception:
+            if safe:
+                return NO_VALUE
+            else:
+                raise
+
+
+class CustomLockFactory(FileLock):
+
+    @memoized_property
+    def _module(self):
+        import fcntl
+        flock_org = fcntl.flock
+
+        def gevent_flock(fd, operation):
+            """
+            Gevent compatible flock
+            """
+            # set non-blocking, this will cause an exception if we cannot acquire a lock
+            operation |= fcntl.LOCK_NB
+            start_lock_time = time.time()
+            timeout = 60 * 5  # 5min
+            while True:
+                try:
+                    flock_org(fd, operation)
+                    # lock has been acquired
+                    break
+                except (OSError, IOError) as e:
+                    # raise on other errors than Resource temporarily unavailable
+                    if e.errno != errno.EAGAIN:
+                        raise
+                    elif (time.time() - start_lock_time) > timeout:
+                        # waited to much time on a lock, better fail than loop for ever
+                        log.error('Failed to acquire lock on `%s` after waiting %ss',
+                                  self.filename, timeout)
+                        raise
+                    wait_timeout = 0.03
+                    log.debug('Failed to acquire lock on `%s`, retry in %ss',
+                              self.filename, wait_timeout)
+                    gevent.sleep(wait_timeout)
+
+        fcntl.flock = gevent_flock
+        return fcntl
+
+
+class FileNamespaceBackend(Serializer, file_backend.DBMBackend):
+
+    def __init__(self, arguments):
+        arguments['lock_factory'] = CustomLockFactory
+        super(FileNamespaceBackend, self).__init__(arguments)
+
+    def list_keys(self, prefix=''):
+        def cond(v):
+            if not prefix:
+                return True
+
+            if v.startswith(prefix):
+                return True
+            return False
+
+        with self._dbm_file(True) as dbm:
+
+            return filter(cond, dbm.keys())
+
+    def get_store(self):
+        return self.filename
+
+    def get(self, key):
+        with self._dbm_file(False) as dbm:
+            if hasattr(dbm, 'get'):
+                value = dbm.get(key, NO_VALUE)
+            else:
+                # gdbm objects lack a .get method
+                try:
+                    value = dbm[key]
+                except KeyError:
+                    value = NO_VALUE
+            if value is not NO_VALUE:
+                value = self._loads(value)
+            return value
+
+    def set(self, key, value):
+        with self._dbm_file(True) as dbm:
+            dbm[key] = self._dumps(value)
+
+    def set_multi(self, mapping):
+        with self._dbm_file(True) as dbm:
+            for key, value in mapping.items():
+                dbm[key] = self._dumps(value)
+
+
+class RedisPickleBackend(Serializer, redis_backend.RedisBackend):
+    def list_keys(self, prefix=''):
+        if prefix:
+            prefix = prefix + '*'
+        return self.client.keys(prefix)
+
+    def get_store(self):
+        return self.client.connection_pool
+
+    def get(self, key):
+        value = self.client.get(key)
+        if value is None:
+            return NO_VALUE
+        return self._loads(value)
+
+    def set(self, key, value):
+        if self.redis_expiration_time:
+            self.client.setex(key, self.redis_expiration_time,
+                              self._dumps(value))
+        else:
+            self.client.set(key, self._dumps(value))
+
+    def set_multi(self, mapping):
+        mapping = dict(
+            (k, self._dumps(v))
+            for k, v in mapping.items()
+        )
+
+        if not self.redis_expiration_time:
+            self.client.mset(mapping)
+        else:
+            pipe = self.client.pipeline()
+            for key, value in mapping.items():
+                pipe.setex(key, self.redis_expiration_time, value)
+            pipe.execute()
diff --git a/rhodecode/lib/rc_cache/region_meta.py b/rhodecode/lib/rc_cache/region_meta.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/rc_cache/region_meta.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2015-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+import os
+import tempfile
+
+dogpile_config_defaults = {
+    'cache_dir': os.path.join(tempfile.gettempdir(), 'rc_cache')
+}
+
+# GLOBAL TO STORE ALL REGISTERED REGIONS
+dogpile_cache_regions = {}
diff --git a/rhodecode/lib/rc_cache/utils.py b/rhodecode/lib/rc_cache/utils.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/rc_cache/utils.py
@@ -0,0 +1,322 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2015-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+import os
+import time
+import logging
+import functools
+import threading
+
+from dogpile.cache import CacheRegion
+from dogpile.cache.util import compat
+
+import rhodecode
+from rhodecode.lib.utils import safe_str, sha1
+from rhodecode.lib.utils2 import safe_unicode, str2bool
+from rhodecode.model.db import Session, CacheKey, IntegrityError
+
+from . import region_meta
+
+log = logging.getLogger(__name__)
+
+
+class RhodeCodeCacheRegion(CacheRegion):
+
+    def conditional_cache_on_arguments(
+            self, namespace=None,
+            expiration_time=None,
+            should_cache_fn=None,
+            to_str=compat.string_type,
+            function_key_generator=None,
+            condition=True):
+        """
+        Custom conditional decorator, that will not touch any dogpile internals if
+        condition isn't meet. This works a bit different than should_cache_fn
+        And it's faster in cases we don't ever want to compute cached values
+        """
+        expiration_time_is_callable = compat.callable(expiration_time)
+
+        if function_key_generator is None:
+            function_key_generator = self.function_key_generator
+
+        def decorator(fn):
+            if to_str is compat.string_type:
+                # backwards compatible
+                key_generator = function_key_generator(namespace, fn)
+            else:
+                key_generator = function_key_generator(namespace, fn, to_str=to_str)
+
+            @functools.wraps(fn)
+            def decorate(*arg, **kw):
+                key = key_generator(*arg, **kw)
+
+                @functools.wraps(fn)
+                def creator():
+                    return fn(*arg, **kw)
+
+                if not condition:
+                    return creator()
+
+                timeout = expiration_time() if expiration_time_is_callable \
+                    else expiration_time
+
+                return self.get_or_create(key, creator, timeout, should_cache_fn)
+
+            def invalidate(*arg, **kw):
+                key = key_generator(*arg, **kw)
+                self.delete(key)
+
+            def set_(value, *arg, **kw):
+                key = key_generator(*arg, **kw)
+                self.set(key, value)
+
+            def get(*arg, **kw):
+                key = key_generator(*arg, **kw)
+                return self.get(key)
+
+            def refresh(*arg, **kw):
+                key = key_generator(*arg, **kw)
+                value = fn(*arg, **kw)
+                self.set(key, value)
+                return value
+
+            decorate.set = set_
+            decorate.invalidate = invalidate
+            decorate.refresh = refresh
+            decorate.get = get
+            decorate.original = fn
+            decorate.key_generator = key_generator
+
+            return decorate
+
+        return decorator
+
+
+def make_region(*arg, **kw):
+    return RhodeCodeCacheRegion(*arg, **kw)
+
+
+def get_default_cache_settings(settings, prefixes=None):
+    prefixes = prefixes or []
+    cache_settings = {}
+    for key in settings.keys():
+        for prefix in prefixes:
+            if key.startswith(prefix):
+                name = key.split(prefix)[1].strip()
+                val = settings[key]
+                if isinstance(val, basestring):
+                    val = val.strip()
+                cache_settings[name] = val
+    return cache_settings
+
+
+def compute_key_from_params(*args):
+    """
+    Helper to compute key from given params to be used in cache manager
+    """
+    return sha1("_".join(map(safe_str, args)))
+
+
+def key_generator(namespace, fn):
+    fname = fn.__name__
+
+    def generate_key(*args):
+        namespace_pref = namespace or 'default'
+        arg_key = compute_key_from_params(*args)
+        final_key = "{}:{}_{}".format(namespace_pref, fname, arg_key)
+
+        return final_key
+
+    return generate_key
+
+
+def get_or_create_region(region_name, region_namespace=None):
+    from rhodecode.lib.rc_cache.backends import FileNamespaceBackend
+    region_obj = region_meta.dogpile_cache_regions.get(region_name)
+    if not region_obj:
+        raise EnvironmentError(
+            'Region `{}` not in configured: {}.'.format(
+                region_name, region_meta.dogpile_cache_regions.keys()))
+
+    region_uid_name = '{}:{}'.format(region_name, region_namespace)
+    if isinstance(region_obj.actual_backend, FileNamespaceBackend):
+        region_exist = region_meta.dogpile_cache_regions.get(region_namespace)
+        if region_exist:
+            log.debug('Using already configured region: %s', region_namespace)
+            return region_exist
+        cache_dir = region_meta.dogpile_config_defaults['cache_dir']
+        expiration_time = region_obj.expiration_time
+
+        if not os.path.isdir(cache_dir):
+            os.makedirs(cache_dir)
+        new_region = make_region(
+            name=region_uid_name, function_key_generator=key_generator
+        )
+        namespace_filename = os.path.join(
+            cache_dir, "{}.cache.dbm".format(region_namespace))
+        # special type that allows 1db per namespace
+        new_region.configure(
+            backend='dogpile.cache.rc.file_namespace',
+            expiration_time=expiration_time,
+            arguments={"filename": namespace_filename}
+        )
+
+        # create and save in region caches
+        log.debug('configuring new region: %s',region_uid_name)
+        region_obj = region_meta.dogpile_cache_regions[region_namespace] = new_region
+
+    return region_obj
+
+
+def clear_cache_namespace(cache_region, cache_namespace_uid):
+    region = get_or_create_region(cache_region, cache_namespace_uid)
+    cache_keys = region.backend.list_keys(prefix=cache_namespace_uid)
+    num_delete_keys = len(cache_keys)
+    if num_delete_keys:
+        region.delete_multi(cache_keys)
+    return num_delete_keys
+
+
+class ActiveRegionCache(object):
+    def __init__(self, context):
+        self.context = context
+
+    def should_invalidate(self):
+        return False
+
+
+class FreshRegionCache(object):
+    def __init__(self, context):
+        self.context = context
+
+    def should_invalidate(self):
+        return True
+
+
+class InvalidationContext(object):
+    """
+    usage::
+
+        from rhodecode.lib import rc_cache
+
+        cache_namespace_uid = CacheKey.SOME_NAMESPACE.format(1)
+        region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
+
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=True)
+        def heavy_compute(cache_name, param1, param2):
+            print('COMPUTE {}, {}, {}'.format(cache_name, param1, param2))
+
+        # invalidation namespace is shared namespace key for all process caches
+        # we use it to send a global signal
+        invalidation_namespace = 'repo_cache:1'
+
+        inv_context_manager = rc_cache.InvalidationContext(
+            uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
+        with inv_context_manager as invalidation_context:
+            args = ('one', 'two')
+            # re-compute and store cache if we get invalidate signal
+            if invalidation_context.should_invalidate():
+                result = heavy_compute.refresh(*args)
+            else:
+                result = heavy_compute(*args)
+
+            compute_time = inv_context_manager.compute_time
+            log.debug('result computed in %.3fs' ,compute_time)
+
+        # To send global invalidation signal, simply run
+        CacheKey.set_invalidate(invalidation_namespace)
+
+    """
+
+    def __repr__(self):
+        return '<InvalidationContext:{}[{}]>'.format(
+            safe_str(self.cache_key), safe_str(self.uid))
+
+    def __init__(self, uid, invalidation_namespace='',
+                 raise_exception=False, thread_scoped=None):
+        self.uid = uid
+        self.invalidation_namespace = invalidation_namespace
+        self.raise_exception = raise_exception
+        self.proc_id = safe_unicode(rhodecode.CONFIG.get('instance_id') or 'DEFAULT')
+        self.thread_id = 'global'
+
+        if thread_scoped is None:
+            # if we set "default" we can override this via .ini settings
+            thread_scoped = str2bool(rhodecode.CONFIG.get('cache_thread_scoped'))
+
+        # Append the thread id to the cache key if this invalidation context
+        # should be scoped to the current thread.
+        if thread_scoped is True:
+            self.thread_id = threading.current_thread().ident
+
+        self.cache_key = compute_key_from_params(uid)
+        self.cache_key = 'proc:{}_thread:{}_{}'.format(
+            self.proc_id, self.thread_id, self.cache_key)
+        self.compute_time = 0
+
+    def get_or_create_cache_obj(self, uid, invalidation_namespace=''):
+        cache_obj = CacheKey.get_active_cache(self.cache_key)
+        log.debug('Fetched cache obj %s using %s cache key.', cache_obj, self.cache_key)
+        invalidation_namespace = invalidation_namespace or self.invalidation_namespace
+        if not cache_obj:
+            cache_obj = CacheKey(self.cache_key, cache_args=invalidation_namespace)
+        return cache_obj
+
+    def __enter__(self):
+        """
+        Test if current object is valid, and return CacheRegion function
+        that does invalidation and calculation
+        """
+        # register or get a new key based on uid
+        self.cache_obj = self.get_or_create_cache_obj(uid=self.uid)
+        self._start_time = time.time()
+        if self.cache_obj.cache_active:
+            # means our cache obj is existing and marked as it's
+            # cache is not outdated, we return ActiveRegionCache
+            self.skip_cache_active_change = True
+
+            return ActiveRegionCache(context=self)
+
+            # the key is either not existing or set to False, we return
+        # the real invalidator which re-computes value. We additionally set
+        # the flag to actually update the Database objects
+        self.skip_cache_active_change = False
+        return FreshRegionCache(context=self)
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        # save compute time
+        self.compute_time = time.time() - self._start_time
+
+        if self.skip_cache_active_change:
+            return
+
+        try:
+            self.cache_obj.cache_active = True
+            Session().add(self.cache_obj)
+            Session().commit()
+        except IntegrityError:
+            # if we catch integrity error, it means we inserted this object
+            # assumption is that's really an edge race-condition case and
+            # it's safe is to skip it
+            Session().rollback()
+        except Exception:
+            log.exception('Failed to commit on cache key update')
+            Session().rollback()
+            if self.raise_exception:
+                raise
diff --git a/rhodecode/lib/rcmail/smtp_mailer.py b/rhodecode/lib/rcmail/smtp_mailer.py
--- a/rhodecode/lib/rcmail/smtp_mailer.py
+++ b/rhodecode/lib/rcmail/smtp_mailer.py
@@ -24,8 +24,9 @@ Simple smtp mailer used in RhodeCode
 
 import time
 import logging
-from socket import sslerror
+import socket
 from email.utils import formatdate
+
 from rhodecode.lib.rcmail.message import Message
 from rhodecode.lib.rcmail.utils import DNS_NAME
 
@@ -33,7 +34,8 @@ log = logging.getLogger(__name__)
 
 
 class SmtpMailer(object):
-    """SMTP mailer class
+    """
+    SMTP mailer class
 
     mailer = SmtpMailer(mail_from, user, passwd, mail_server, smtp_auth
                         mail_port, ssl, tls)
@@ -59,7 +61,7 @@ class SmtpMailer(object):
         self.auth = smtp_auth
 
     def _get_smptlib(self):
-        #patch the output
+        # patch the output
         import smtplib
 
         class StderrLogger(object):
@@ -83,7 +85,7 @@ class SmtpMailer(object):
                       recipients_separator=", ", extra_headers=headers)
         raw_msg = msg.to_message()
 
-        #patched smtplib without stderr
+        # patched smtplib without stderr
         smtplib = self._get_smptlib()
         if self.ssl:
             smtp_serv = smtplib.SMTP_SSL(self.mail_server, self.mail_port,
@@ -109,10 +111,10 @@ class SmtpMailer(object):
             smtp_serv.login(self.user, self.passwd)
 
         smtp_serv.sendmail(msg.sender, msg.send_to, raw_msg.as_string())
-        logging.info('MAIL SEND TO: %s' % recipients)
+        log.info('email sent to: %s' % recipients)
 
         try:
             smtp_serv.quit()
-        except sslerror:
+        except socket.sslerror:
             # sslerror is raised in tls connections on closing sometimes
             smtp_serv.close()
diff --git a/rhodecode/lib/request.py b/rhodecode/lib/request.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/lib/request.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2017-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+from uuid import uuid4
+from pyramid.decorator import reify
+from pyramid.request import Request as _Request
+
+
+class Request(_Request):
+    @reify
+    def req_id(self):
+        return str(uuid4())
diff --git a/rhodecode/lib/system_info.py b/rhodecode/lib/system_info.py
--- a/rhodecode/lib/system_info.py
+++ b/rhodecode/lib/system_info.py
@@ -142,6 +142,21 @@ def platform_type():
     return SysInfoRes(value=value)
 
 
+def locale_info():
+    import locale
+
+    value = dict(
+        locale_default=locale.getdefaultlocale(),
+        locale_lc_all=locale.getlocale(locale.LC_ALL),
+        lang_env=os.environ.get('LANG'),
+        lc_all_env=os.environ.get('LC_ALL'),
+        local_archive_env=os.environ.get('LOCALE_ARCHIVE'),
+    )
+    human_value = 'LANG: {}, locale LC_ALL: {},  Default locales: {}'.format(
+        value['lang_env'], value['locale_lc_all'], value['locale_default'])
+    return SysInfoRes(value=value, human_value=human_value)
+
+
 def ulimit_info():
     data = collections.OrderedDict([
         ('cpu time (seconds)', resource.getrlimit(resource.RLIMIT_CPU)),
@@ -712,7 +727,6 @@ def usage_info():
     return SysInfoRes(value=value)
 
 
-
 def get_system_info(environ):
     environ = environ or {}
     return {
@@ -723,6 +737,7 @@ def get_system_info(environ):
         'py_modules': SysInfo(py_modules)(),
 
         'platform': SysInfo(platform_type)(),
+        'locale': SysInfo(locale_info)(),
         'server': SysInfo(server_info, environ=environ)(),
         'database': SysInfo(database_info)(),
         'ulimit': SysInfo(ulimit_info)(),
diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py
--- a/rhodecode/lib/utils.py
+++ b/rhodecode/lib/utils.py
@@ -41,14 +41,14 @@ import pkg_resources
 from webhelpers.text import collapse, remove_formatting, strip_tags
 from mako import exceptions
 from pyramid.threadlocal import get_current_registry
-from pyramid.request import Request
+from rhodecode.lib.request import Request
 
 from rhodecode.lib.fakemod import create_module
 from rhodecode.lib.vcs.backends.base import Config
 from rhodecode.lib.vcs.exceptions import VCSError
 from rhodecode.lib.vcs.utils.helpers import get_scm, get_scm_backend
 from rhodecode.lib.utils2 import (
-    safe_str, safe_unicode, get_current_rhodecode_user, md5)
+    safe_str, safe_unicode, get_current_rhodecode_user, md5, sha1)
 from rhodecode.model import meta
 from rhodecode.model.db import (
     Repository, User, RhodeCodeUi, UserLog, RepoGroup, UserGroup)
@@ -120,7 +120,6 @@ def get_repo_group_slug(request):
         # pyramid
         _group = request.matchdict.get('repo_group_name')
 
-
     if _group:
         _group = _group.rstrip('/')
     return _group
diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py
--- a/rhodecode/lib/utils2.py
+++ b/rhodecode/lib/utils2.py
@@ -56,6 +56,14 @@ def md5_safe(s):
     return md5(safe_str(s))
 
 
+def sha1(s):
+    return hashlib.sha1(s).hexdigest()
+
+
+def sha1_safe(s):
+    return sha1(safe_str(s))
+
+
 def __get_lem(extra_mapping=None):
     """
     Get language extension map based on what's inside pygments lexers
@@ -353,6 +361,8 @@ def ping_connection(connection, branch):
 def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs):
     """Custom engine_from_config functions."""
     log = logging.getLogger('sqlalchemy.engine')
+    _ping_connection = configuration.pop('sqlalchemy.db1.ping_connection', None)
+
     engine = sqlalchemy.engine_from_config(configuration, prefix, **kwargs)
 
     def color_sql(sql):
@@ -360,6 +370,9 @@ def engine_from_config(configuration, pr
         normal = '\x1b[0m'
         return ''.join([color_seq, sql, normal])
 
+    if configuration['debug'] or _ping_connection:
+        sqlalchemy.event.listen(engine, "engine_connect", ping_connection)
+
     if configuration['debug']:
         # attach events only for debug configuration
 
@@ -381,8 +394,6 @@ def engine_from_config(configuration, pr
                                  parameters, context, executemany):
             delattr(conn, 'query_start_time')
 
-        sqlalchemy.event.listen(engine, "engine_connect",
-                                ping_connection)
         sqlalchemy.event.listen(engine, "before_cursor_execute",
                                 before_cursor_execute)
         sqlalchemy.event.listen(engine, "after_cursor_execute",
@@ -740,6 +751,13 @@ class AttributeDict(AttributeDictBase):
 
 
 
+class OrderedDefaultDict(collections.OrderedDict, collections.defaultdict):
+    def __init__(self, default_factory=None, *args, **kwargs):
+        # in python3 you can omit the args to super
+        super(OrderedDefaultDict, self).__init__(*args, **kwargs)
+        self.default_factory = default_factory
+
+
 def fix_PATH(os_=None):
     """
     Get current active python path, and append it to PATH variable to fix
diff --git a/rhodecode/lib/vcs/__init__.py b/rhodecode/lib/vcs/__init__.py
--- a/rhodecode/lib/vcs/__init__.py
+++ b/rhodecode/lib/vcs/__init__.py
@@ -22,7 +22,15 @@
 Various version Control System version lib (vcs) management abstraction layer
 for Python. Build with server client architecture.
 """
+import atexit
+import logging
+import urlparse
+from cStringIO import StringIO
 
+from rhodecode.lib.vcs.conf import settings
+from rhodecode.lib.vcs.backends import get_vcs_instance, get_backend
+from rhodecode.lib.vcs.exceptions import (
+    VCSError, RepositoryError, CommitError, VCSCommunicationError)
 
 VERSION = (0, 5, 0, 'dev')
 
@@ -30,21 +38,8 @@ VERSION = (0, 5, 0, 'dev')
 
 __all__ = [
     'get_version', 'get_vcs_instance', 'get_backend',
-    'VCSError', 'RepositoryError', 'CommitError'
-    ]
-
-import atexit
-import logging
-import subprocess32
-import time
-import urlparse
-from cStringIO import StringIO
-
-
-from rhodecode.lib.vcs.conf import settings
-from rhodecode.lib.vcs.backends import get_vcs_instance, get_backend
-from rhodecode.lib.vcs.exceptions import (
-    VCSError, RepositoryError, CommitError, VCSCommunicationError)
+    'VCSError', 'RepositoryError', 'CommitError', 'VCSCommunicationError'
+]
 
 log = logging.getLogger(__name__)
 
diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py
--- a/rhodecode/lib/vcs/backends/base.py
+++ b/rhodecode/lib/vcs/backends/base.py
@@ -176,7 +176,6 @@ class BaseRepository(object):
     EMPTY_COMMIT_ID = '0' * 40
 
     path = None
-    _remote = None
 
     def __init__(self, repo_path, config=None, create=False, **kwargs):
         """
@@ -222,6 +221,10 @@ class BaseRepository(object):
         return config
 
     @LazyProperty
+    def _remote(self):
+        raise NotImplementedError
+
+    @LazyProperty
     def EMPTY_COMMIT(self):
         return EmptyCommit(self.EMPTY_COMMIT_ID)
 
@@ -451,7 +454,7 @@ class BaseRepository(object):
         """
         raise NotImplementedError
 
-    def merge(self, target_ref, source_repo, source_ref, workspace_id,
+    def merge(self, repo_id, workspace_id, target_ref, source_repo, source_ref,
               user_name='', user_email='', message='', dry_run=False,
               use_rebase=False, close_branch=False):
         """
@@ -465,13 +468,14 @@ class BaseRepository(object):
         'possible', 'executed', 'source_commit', 'target_commit',
         'merge_commit'.
 
+        :param repo_id: `repo_id` target repo id.
+        :param workspace_id: `workspace_id` unique identifier.
         :param target_ref: `target_ref` points to the commit on top of which
             the `source_ref` should be merged.
         :param source_repo: The repository that contains the commits to be
             merged.
         :param source_ref: `source_ref` points to the topmost commit from
             the `source_repo` which should be merged.
-        :param workspace_id: `workspace_id` unique identifier.
         :param user_name: Merge commit `user_name`.
         :param user_email: Merge commit `user_email`.
         :param message: Merge commit `message`.
@@ -492,12 +496,9 @@ class BaseRepository(object):
             if not message:
                 raise ValueError('message cannot be empty')
 
-        shadow_repository_path = self._maybe_prepare_merge_workspace(
-            workspace_id, target_ref, source_ref)
-
         try:
             return self._merge_repo(
-                shadow_repository_path, target_ref, source_repo,
+                repo_id, workspace_id, target_ref, source_repo,
                 source_ref, message, user_name, user_email, dry_run=dry_run,
                 use_rebase=use_rebase, close_branch=close_branch)
         except RepositoryError:
@@ -507,14 +508,15 @@ class BaseRepository(object):
             return MergeResponse(
                 False, False, None, MergeFailureReason.UNKNOWN)
 
-    def _merge_repo(self, shadow_repository_path, target_ref,
+    def _merge_repo(self, repo_id, workspace_id, target_ref,
                     source_repo, source_ref, merge_message,
                     merger_name, merger_email, dry_run=False,
                     use_rebase=False, close_branch=False):
         """Internal implementation of merge."""
         raise NotImplementedError
 
-    def _maybe_prepare_merge_workspace(self, workspace_id, target_ref, source_ref):
+    def _maybe_prepare_merge_workspace(
+            self, repo_id, workspace_id, target_ref, source_ref):
         """
         Create the merge workspace.
 
@@ -522,10 +524,27 @@ class BaseRepository(object):
         """
         raise NotImplementedError
 
-    def _get_shadow_repository_path(self, workspace_id):
-        raise NotImplementedError
+    def _get_legacy_shadow_repository_path(self, workspace_id):
+        """
+        Legacy version that was used before. We still need it for
+        backward compat
+        """
+        return os.path.join(
+            os.path.dirname(self.path),
+            '.__shadow_%s_%s' % (os.path.basename(self.path), workspace_id))
 
-    def cleanup_merge_workspace(self, workspace_id):
+    def _get_shadow_repository_path(self, repo_id, workspace_id):
+        # The name of the shadow repository must start with '.', so it is
+        # skipped by 'rhodecode.lib.utils.get_filesystem_repos'.
+        legacy_repository_path = self._get_legacy_shadow_repository_path(workspace_id)
+        if os.path.exists(legacy_repository_path):
+            return legacy_repository_path
+        else:
+            return os.path.join(
+                os.path.dirname(self.path),
+                '.__shadow_repo_%s_%s' % (repo_id, workspace_id))
+
+    def cleanup_merge_workspace(self, repo_id, workspace_id):
         """
         Remove merge workspace.
 
@@ -534,7 +553,7 @@ class BaseRepository(object):
 
         :param workspace_id: `workspace_id` unique identifier.
         """
-        shadow_repository_path = self._get_shadow_repository_path(workspace_id)
+        shadow_repository_path = self._get_shadow_repository_path(repo_id, workspace_id)
         shadow_repository_path_del = '{}.{}.delete'.format(
             shadow_repository_path, time.time())
 
diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py
--- a/rhodecode/lib/vcs/backends/git/repository.py
+++ b/rhodecode/lib/vcs/backends/git/repository.py
@@ -62,8 +62,7 @@ class GitRepository(BaseRepository):
 
         self.path = safe_str(os.path.abspath(repo_path))
         self.config = config if config else self.get_default_config()
-        self._remote = connection.Git(
-            self.path, self.config, with_wire=with_wire)
+        self.with_wire = with_wire
 
         self._init_repo(create, src_url, update_after_clone, bare)
 
@@ -71,6 +70,10 @@ class GitRepository(BaseRepository):
         self._commit_ids = {}
 
     @LazyProperty
+    def _remote(self):
+        return connection.Git(self.path, self.config, with_wire=self.with_wire)
+
+    @LazyProperty
     def bare(self):
         return self._remote.bare()
 
@@ -103,8 +106,9 @@ class GitRepository(BaseRepository):
         if not isinstance(cmd, list):
             raise ValueError('cmd must be a list, got %s instead' % type(cmd))
 
+        skip_stderr_log = opts.pop('skip_stderr_log', False)
         out, err = self._remote.run_git_command(cmd, **opts)
-        if err:
+        if err and not skip_stderr_log:
             log.debug('Stderr output of git command "%s":\n%s', cmd, err)
         return out, err
 
@@ -173,9 +177,9 @@ class GitRepository(BaseRepository):
         # we must check if this repo is not empty, since later command
         # fails if it is. And it's cheaper to ask than throw the subprocess
         # errors
-        try:
-            self._remote.head()
-        except KeyError:
+
+        head = self._remote.head(show_exc=False)
+        if not head:
             return []
 
         rev_filter = ['--branches', '--tags']
@@ -756,7 +760,7 @@ class GitRepository(BaseRepository):
                 cmd = ['fetch', self.path, source_branch]
                 self.run_git_command(cmd, fail_on_stderr=False)
 
-    def _local_fetch(self, repository_path, branch_name):
+    def _local_fetch(self, repository_path, branch_name, use_origin=False):
         """
         Fetch a branch from a local repository.
         """
@@ -764,7 +768,17 @@ class GitRepository(BaseRepository):
         if repository_path == self.path:
             raise ValueError('Cannot fetch from the same repository')
 
-        cmd = ['fetch', '--no-tags', repository_path, branch_name]
+        if use_origin:
+            branch_name = '+{branch}:refs/heads/{branch}'.format(
+                branch=branch_name)
+
+        cmd = ['fetch', '--no-tags', '--update-head-ok',
+               repository_path, branch_name]
+        self.run_git_command(cmd, fail_on_stderr=False)
+
+    def _local_reset(self, branch_name):
+        branch_name = '{}'.format(branch_name)
+        cmd = ['reset', '--hard', branch_name]
         self.run_git_command(cmd, fail_on_stderr=False)
 
     def _last_fetch_heads(self):
@@ -834,12 +848,12 @@ class GitRepository(BaseRepository):
 
         # N.B.(skreft): the --no-ff option is used to enforce the creation of a
         # commit message. We also specify the user who is doing the merge.
-        cmd = ['-c', 'user.name=%s' % safe_str(user_name),
+        cmd = ['-c', 'user.name="%s"' % safe_str(user_name),
                '-c', 'user.email=%s' % safe_str(user_email),
                'merge', '--no-ff', '-m', safe_str(merge_message)]
         cmd.extend(heads)
         try:
-            self.run_git_command(cmd, fail_on_stderr=False)
+            output = self.run_git_command(cmd, fail_on_stderr=False)
         except RepositoryError:
             # Cleanup any merge leftovers
             self.run_git_command(['merge', '--abort'], fail_on_stderr=False)
@@ -891,35 +905,61 @@ class GitRepository(BaseRepository):
 
         return '%s%d' % (prefix, branch_id)
 
-    def _merge_repo(self, shadow_repository_path, target_ref,
+    def _maybe_prepare_merge_workspace(
+            self, repo_id, workspace_id, target_ref, source_ref):
+        shadow_repository_path = self._get_shadow_repository_path(
+            repo_id, workspace_id)
+        if not os.path.exists(shadow_repository_path):
+            self._local_clone(
+                shadow_repository_path, target_ref.name, source_ref.name)
+            log.debug(
+                'Prepared shadow repository in %s', shadow_repository_path)
+
+        return shadow_repository_path
+
+    def _merge_repo(self, repo_id, workspace_id, target_ref,
                     source_repo, source_ref, merge_message,
                     merger_name, merger_email, dry_run=False,
                     use_rebase=False, close_branch=False):
         if target_ref.commit_id != self.branches[target_ref.name]:
+            log.warning('Target ref %s commit mismatch %s vs %s', target_ref,
+                        target_ref.commit_id, self.branches[target_ref.name])
             return MergeResponse(
                 False, False, None, MergeFailureReason.TARGET_IS_NOT_HEAD)
 
-        shadow_repo = GitRepository(shadow_repository_path)
+        shadow_repository_path = self._maybe_prepare_merge_workspace(
+            repo_id, workspace_id, target_ref, source_ref)
+        shadow_repo = self._get_shadow_instance(shadow_repository_path)
+
         # checkout source, if it's different. Otherwise we could not
         # fetch proper commits for merge testing
         if source_ref.name != target_ref.name:
             if shadow_repo.get_remote_ref(source_ref.name):
                 shadow_repo._checkout(source_ref.name, force=True)
 
-        # checkout target
+        # checkout target, and fetch changes
         shadow_repo._checkout(target_ref.name, force=True)
-        shadow_repo._local_pull(self.path, target_ref.name)
+
+        # fetch/reset pull the target, in case it is changed
+        # this handles even force changes
+        shadow_repo._local_fetch(self.path, target_ref.name, use_origin=True)
+        shadow_repo._local_reset(target_ref.name)
 
         # Need to reload repo to invalidate the cache, or otherwise we cannot
         # retrieve the last target commit.
-        shadow_repo = GitRepository(shadow_repository_path)
+        shadow_repo = self._get_shadow_instance(shadow_repository_path)
         if target_ref.commit_id != shadow_repo.branches[target_ref.name]:
+            log.warning('Shadow Target ref %s commit mismatch %s vs %s',
+                        target_ref, target_ref.commit_id,
+                        shadow_repo.branches[target_ref.name])
             return MergeResponse(
                 False, False, None, MergeFailureReason.TARGET_IS_NOT_HEAD)
 
+        # calculate new branch
         pr_branch = shadow_repo._get_new_pr_branch(
             source_ref.name, target_ref.name)
         log.debug('using pull-request merge branch: `%s`', pr_branch)
+        # checkout to temp branch, and fetch changes
         shadow_repo._checkout(pr_branch, create=True)
         try:
             shadow_repo._local_fetch(source_repo.path, source_ref.name)
@@ -967,18 +1007,3 @@ class GitRepository(BaseRepository):
         return MergeResponse(
             merge_possible, merge_succeeded, merge_ref,
             merge_failure_reason)
-
-    def _get_shadow_repository_path(self, workspace_id):
-        # The name of the shadow repository must start with '.', so it is
-        # skipped by 'rhodecode.lib.utils.get_filesystem_repos'.
-        return os.path.join(
-            os.path.dirname(self.path),
-            '.__shadow_%s_%s' % (os.path.basename(self.path), workspace_id))
-
-    def _maybe_prepare_merge_workspace(self, workspace_id, target_ref, source_ref):
-        shadow_repository_path = self._get_shadow_repository_path(workspace_id)
-        if not os.path.exists(shadow_repository_path):
-            self._local_clone(
-                shadow_repository_path, target_ref.name, source_ref.name)
-
-        return shadow_repository_path
diff --git a/rhodecode/lib/vcs/backends/hg/commit.py b/rhodecode/lib/vcs/backends/hg/commit.py
--- a/rhodecode/lib/vcs/backends/hg/commit.py
+++ b/rhodecode/lib/vcs/backends/hg/commit.py
@@ -56,7 +56,7 @@ class MercurialCommit(base.BaseCommit):
         self._remote = repository._remote
 
         self.raw_id = raw_id
-        self.idx = repository._sanitize_commit_idx(idx)
+        self.idx = idx
 
         self._set_bulk_properties(pre_load)
 
diff --git a/rhodecode/lib/vcs/backends/hg/repository.py b/rhodecode/lib/vcs/backends/hg/repository.py
--- a/rhodecode/lib/vcs/backends/hg/repository.py
+++ b/rhodecode/lib/vcs/backends/hg/repository.py
@@ -77,9 +77,7 @@ class MercurialRepository(BaseRepository
         # special requirements
         self.config = config if config else self.get_default_config(
             default=[('extensions', 'largefiles', '1')])
-
-        self._remote = connection.Hg(
-            self.path, self.config, with_wire=with_wire)
+        self.with_wire = with_wire
 
         self._init_repo(create, src_url, update_after_clone)
 
@@ -87,6 +85,10 @@ class MercurialRepository(BaseRepository
         self._commit_ids = {}
 
     @LazyProperty
+    def _remote(self):
+        return connection.Hg(self.path, self.config, with_wire=self.with_wire)
+
+    @LazyProperty
     def commit_ids(self):
         """
         Returns list of commit ids, in ascending order.  Being lazy
@@ -394,14 +396,6 @@ class MercurialRepository(BaseRepository
         else:
             return os.stat(st_path).st_mtime
 
-    def _sanitize_commit_idx(self, idx):
-        # Note: Mercurial has ``int(-1)`` reserved as not existing id_or_idx
-        # number. A `long` is treated in the correct way though. So we convert
-        # `int` to `long` here to make sure it is handled correctly.
-        if isinstance(idx, int):
-            return long(idx)
-        return idx
-
     def _get_url(self, url):
         """
         Returns normalized url. If schema is not given, would fall
@@ -436,7 +430,6 @@ class MercurialRepository(BaseRepository
                 pass
         elif commit_idx is not None:
             self._validate_commit_idx(commit_idx)
-            commit_idx = self._sanitize_commit_idx(commit_idx)
             try:
                 id_ = self.commit_ids[commit_idx]
                 if commit_idx < 0:
@@ -448,10 +441,6 @@ class MercurialRepository(BaseRepository
         else:
             commit_id = "tip"
 
-        # TODO Paris: Ugly hack to "serialize" long for msgpack
-        if isinstance(commit_id, long):
-            commit_id = float(commit_id)
-
         if isinstance(commit_id, unicode):
             commit_id = safe_str(commit_id)
 
@@ -694,15 +683,10 @@ class MercurialRepository(BaseRepository
             return ref.name
         return self._remote.ctx_branch(ref.commit_id)
 
-    def _get_shadow_repository_path(self, workspace_id):
-        # The name of the shadow repository must start with '.', so it is
-        # skipped by 'rhodecode.lib.utils.get_filesystem_repos'.
-        return os.path.join(
-            os.path.dirname(self.path),
-            '.__shadow_%s_%s' % (os.path.basename(self.path), workspace_id))
-
-    def _maybe_prepare_merge_workspace(self, workspace_id, unused_target_ref, unused_source_ref):
-        shadow_repository_path = self._get_shadow_repository_path(workspace_id)
+    def _maybe_prepare_merge_workspace(
+            self, repo_id, workspace_id, unused_target_ref, unused_source_ref):
+        shadow_repository_path = self._get_shadow_repository_path(
+            repo_id, workspace_id)
         if not os.path.exists(shadow_repository_path):
             self._local_clone(shadow_repository_path)
             log.debug(
@@ -710,7 +694,7 @@ class MercurialRepository(BaseRepository
 
         return shadow_repository_path
 
-    def _merge_repo(self, shadow_repository_path, target_ref,
+    def _merge_repo(self, repo_id, workspace_id, target_ref,
                     source_repo, source_ref, merge_message,
                     merger_name, merger_email, dry_run=False,
                     use_rebase=False, close_branch=False):
@@ -732,6 +716,8 @@ class MercurialRepository(BaseRepository
             return MergeResponse(
                 False, False, None, MergeFailureReason.MISSING_TARGET_REF)
 
+        shadow_repository_path = self._maybe_prepare_merge_workspace(
+            repo_id, workspace_id, target_ref, source_ref)
         shadow_repo = self._get_shadow_instance(shadow_repository_path)
 
         log.debug('Pulling in target reference %s', target_ref)
diff --git a/rhodecode/lib/vcs/backends/svn/repository.py b/rhodecode/lib/vcs/backends/svn/repository.py
--- a/rhodecode/lib/vcs/backends/svn/repository.py
+++ b/rhodecode/lib/vcs/backends/svn/repository.py
@@ -72,11 +72,13 @@ class SubversionRepository(base.BaseRepo
                  **kwargs):
         self.path = safe_str(os.path.abspath(repo_path))
         self.config = config if config else self.get_default_config()
-        self._remote = connection.Svn(
-            self.path, self.config)
 
         self._init_repo(create, src_url)
 
+    @LazyProperty
+    def _remote(self):
+        return connection.Svn(self.path, self.config)
+
     def _init_repo(self, create, src_url):
         if create and os.path.exists(self.path):
             raise RepositoryError(
diff --git a/rhodecode/lib/vcs/client_http.py b/rhodecode/lib/vcs/client_http.py
--- a/rhodecode/lib/vcs/client_http.py
+++ b/rhodecode/lib/vcs/client_http.py
@@ -28,6 +28,7 @@ import threading
 import urllib2
 import urlparse
 import uuid
+import traceback
 
 import pycurl
 import msgpack
@@ -139,8 +140,9 @@ class RemoteRepo(object):
         return _remote_call(self.url, payload, EXCEPTIONS_MAP, self._session)
 
     def _call_with_logging(self, name, *args, **kwargs):
-
-        log.debug('Calling %s@%s with args:%r', self.url, name, args)
+        context_uid = self._wire.get('context')
+        log.debug('Calling %s@%s with args:%r. wire_context: %s',
+                  self.url, name, args, context_uid)
         return RemoteRepo._call(self, name, *args, **kwargs)
 
     def __getitem__(self, key):
@@ -196,7 +198,8 @@ def _remote_call(url, payload, exception
     try:
         response = session.post(url, data=msgpack.packb(payload))
     except pycurl.error as e:
-        raise exceptions.HttpVCSCommunicationError(e)
+        msg = '{}. \npycurl traceback: {}'.format(e, traceback.format_exc())
+        raise exceptions.HttpVCSCommunicationError(msg)
     except Exception as e:
         message = getattr(e, 'message', '')
         if 'Failed to connect' in message:
diff --git a/rhodecode/lib/vcs/conf/settings.py b/rhodecode/lib/vcs/conf/settings.py
--- a/rhodecode/lib/vcs/conf/settings.py
+++ b/rhodecode/lib/vcs/conf/settings.py
@@ -51,6 +51,7 @@ ARCHIVE_SPECS = {
 
 HOOKS_PROTOCOL = None
 HOOKS_DIRECT_CALLS = False
+HOOKS_HOST = '127.0.0.1'
 
 
 def available_aliases():
diff --git a/rhodecode/lib/vcs/exceptions.py b/rhodecode/lib/vcs/exceptions.py
--- a/rhodecode/lib/vcs/exceptions.py
+++ b/rhodecode/lib/vcs/exceptions.py
@@ -205,7 +205,7 @@ def map_vcs_exceptions(func):
                     args = e.args
                 else:
                     args = [__traceback_info__ or 'unhandledException']
-                if __traceback_info__ and kind != 'unhandled':
+                if __traceback_info__ and kind not in ['unhandled', 'lookup']:
                     # for other than unhandled errors also log the traceback
                     # can be usefull for debugging
                     log.error(__traceback_info__)
diff --git a/rhodecode/lib/vcs/geventcurl.py b/rhodecode/lib/vcs/geventcurl.py
--- a/rhodecode/lib/vcs/geventcurl.py
+++ b/rhodecode/lib/vcs/geventcurl.py
@@ -27,6 +27,7 @@ class in a way that is compatible with g
 import logging
 import gevent
 import pycurl
+import greenlet
 
 # Import everything from pycurl.
 # This allows us to use this module as a drop in replacement of pycurl.
@@ -139,7 +140,7 @@ class GeventCurlMulti(object):
         while True:
             try:
                 ret, num_handles = self._curl_multi.socket_action(fd, action)
-            except pycurl.error, e:
+            except pycurl.error as e:
                 ret = e.args[0]
             if ret != pycurl.E_CALL_MULTI_PERFORM:
                 break
@@ -156,7 +157,7 @@ class GeventCurlMulti(object):
             try:
                 ret, num_handles = self._curl_multi.socket_action(
                     pycurl.SOCKET_TIMEOUT, 0)
-            except pycurl.error, e:
+            except pycurl.error as e:
                 ret = e.args[0]
             if ret != pycurl.E_CALL_MULTI_PERFORM:
                 break
@@ -186,7 +187,7 @@ class GeventCurlMulti(object):
         while True:
             num_q, ok_list, err_list = self._curl_multi.info_read()
             for curl in ok_list:
-                curl.waiter.switch()
+                curl.waiter.switch(None)
             for curl, errnum, errmsg in err_list:
                 curl.waiter.throw(Exception('%s %s' % (errnum, errmsg)))
             if num_q == 0:
@@ -230,15 +231,22 @@ class GeventCurl(object):
         This perform method is compatible with gevent because it uses gevent
         synchronization mechanisms to wait for the request to finish.
         """
+        if getattr(self._curl, 'waiter', None) is not None:
+            current = greenlet.getcurrent()
+            msg = 'This curl object is already used by another greenlet, {}, \n' \
+                  'this is {}'.format(self._curl.waiter, current)
+            raise Exception(msg)
+
         waiter = self._curl.waiter = Waiter()
         try:
             self._multi.add_handle(self._curl)
-            response = waiter.get()
+            try:
+                return waiter.get()
+            finally:
+                self._multi.remove_handle(self._curl)
         finally:
-            self._multi.remove_handle(self._curl)
             del self._curl.waiter
 
-        return response
 
 # Curl is originally imported from pycurl. At this point we override it with
 # our custom implementation.
diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py
--- a/rhodecode/model/comment.py
+++ b/rhodecode/model/comment.py
@@ -159,18 +159,18 @@ class CommentsModel(BaseModel):
 
         return todos
 
-    def _log_audit_action(self, action, action_data, user, comment):
+    def _log_audit_action(self, action, action_data, auth_user, comment):
         audit_logger.store(
             action=action,
             action_data=action_data,
-            user=user,
+            user=auth_user,
             repo=comment.repo)
 
     def create(self, text, repo, user, commit_id=None, pull_request=None,
                f_path=None, line_no=None, status_change=None,
                status_change_type=None, comment_type=None,
                resolves_comment_id=None, closing_pr=False, send_email=True,
-               renderer=None):
+               renderer=None, auth_user=None):
         """
         Creates new comment for commit or pull request.
         IF status_change is not none this comment is associated with a
@@ -190,6 +190,8 @@ class CommentsModel(BaseModel):
         :param send_email:
         :param renderer: pick renderer for this comment
         """
+
+        auth_user = auth_user or user
         if not text:
             log.warning('Missing text for comment, skipping...')
             return
@@ -355,7 +357,7 @@ class CommentsModel(BaseModel):
 
         comment_data = comment.get_api_data()
         self._log_audit_action(
-            action, {'data': comment_data}, user, comment)
+            action, {'data': comment_data}, auth_user, comment)
 
         msg_url = ''
         channel = None
@@ -388,7 +390,7 @@ class CommentsModel(BaseModel):
 
         return comment
 
-    def delete(self, comment, user):
+    def delete(self, comment, auth_user):
         """
         Deletes given comment
         """
@@ -402,7 +404,7 @@ class CommentsModel(BaseModel):
             action = 'repo.commit.comment.delete'
 
         self._log_audit_action(
-            action, {'old_data': old_data}, user, comment)
+            action, {'old_data': old_data}, auth_user, comment)
 
         return comment
 
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -47,7 +47,6 @@ from sqlalchemy.ext.declarative import d
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.exc import IntegrityError  # noqa
 from sqlalchemy.dialects.mysql import LONGTEXT
-from beaker.cache import cache_region
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
 from pyramid.threadlocal import get_current_request
@@ -56,7 +55,7 @@ from rhodecode.translation import _
 from rhodecode.lib.vcs import get_vcs_instance
 from rhodecode.lib.vcs.backends.base import EmptyCommit, Reference
 from rhodecode.lib.utils2 import (
-    str2bool, safe_str, get_commit_safe, safe_unicode, md5_safe,
+    str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe,
     time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
     glob2re, StrictAttributeDict, cleaned_uri)
 from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
@@ -114,7 +113,7 @@ def display_user_group_sort(obj):
 
 
 def _hash_key(k):
-    return md5_safe(k)
+    return sha1_safe(k)
 
 
 def in_filter_generator(qry, items, limit=500):
@@ -140,6 +139,14 @@ def in_filter_generator(qry, items, limi
     return parts
 
 
+base_table_args = {
+    'extend_existing': True,
+    'mysql_engine': 'InnoDB',
+    'mysql_charset': 'utf8',
+    'sqlite_autoincrement': True
+}
+
+
 class EncryptedTextValue(TypeDecorator):
     """
     Special column for encrypted long text data, use like::
@@ -302,8 +309,7 @@ class RhodeCodeSetting(Base, BaseModel):
     __tablename__ = 'rhodecode_settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
 
     SETTINGS_TYPES = {
@@ -383,8 +389,7 @@ class RhodeCodeUi(Base, BaseModel):
     __tablename__ = 'rhodecode_ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
 
     HOOK_REPO_SIZE = 'changegroup.repo_size'
@@ -426,8 +431,7 @@ class RepoRhodeCodeSetting(Base, BaseMod
         UniqueConstraint(
             'app_settings_name', 'repository_id',
             name='uq_repo_rhodecode_setting_name_repo_id'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
 
     repository_id = Column(
@@ -502,8 +506,7 @@ class RepoRhodeCodeUi(Base, BaseModel):
         UniqueConstraint(
             'repository_id', 'ui_section', 'ui_key',
             name='uq_repo_rhodecode_ui_repository_id_section_key'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
 
     repository_id = Column(
@@ -535,9 +538,9 @@ class User(Base, BaseModel):
         UniqueConstraint('username'), UniqueConstraint('email'),
         Index('u_username_idx', 'username'),
         Index('u_email_idx', 'email'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
+
     DEFAULT_USER = 'default'
     DEFAULT_USER_EMAIL = 'anonymous@rhodecode.org'
     DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}'
@@ -686,7 +689,7 @@ class User(Base, BaseModel):
             .filter(UserApiKeys.role == UserApiKeys.ROLE_FEED)
         if cache:
             feed_tokens = feed_tokens.options(
-                FromCache("long_term", "get_user_feed_token_%s" % self.user_id))
+                FromCache("sql_cache_short", "get_user_feed_token_%s" % self.user_id))
 
         feed_tokens = feed_tokens.all()
         if feed_tokens:
@@ -927,12 +930,6 @@ class User(Base, BaseModel):
         Session().add(self)
         log.debug('updated user %s lastlogin', self.username)
 
-    def update_lastactivity(self):
-        """Update user lastactivity"""
-        self.last_activity = datetime.datetime.now()
-        Session().add(self)
-        log.debug('updated user `%s` last activity', self.username)
-
     def update_password(self, new_password):
         from rhodecode.lib.auth import get_crypt_password
 
@@ -1034,8 +1031,7 @@ class UserApiKeys(Base, BaseModel):
     __table_args__ = (
         Index('uak_api_key_idx', 'api_key', unique=True),
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
     __mapper_args__ = {}
 
@@ -1137,8 +1133,7 @@ class UserEmailMap(Base, BaseModel):
     __table_args__ = (
         Index('uem_email_idx', 'email'),
         UniqueConstraint('email'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
     __mapper_args__ = {}
 
@@ -1168,8 +1163,7 @@ class UserIpMap(Base, BaseModel):
     __tablename__ = 'user_ip_map'
     __table_args__ = (
         UniqueConstraint('user_id', 'ip_addr'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
     __mapper_args__ = {}
 
@@ -1208,8 +1202,7 @@ class UserSshKeys(Base, BaseModel):
 
         UniqueConstraint('ssh_key_fingerprint'),
 
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
     __mapper_args__ = {}
 
@@ -1241,9 +1234,9 @@ class UserSshKeys(Base, BaseModel):
 class UserLog(Base, BaseModel):
     __tablename__ = 'user_logs'
     __table_args__ = (
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
+
     VERSION_1 = 'v1'
     VERSION_2 = 'v2'
     VERSIONS = [VERSION_1, VERSION_2]
@@ -1291,8 +1284,7 @@ class UserLog(Base, BaseModel):
 class UserGroup(Base, BaseModel):
     __tablename__ = 'users_groups'
     __table_args__ = (
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
 
     users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ -1384,6 +1376,32 @@ class UserGroup(Base, BaseModel):
         return user_group.get(user_group_id)
 
     def permissions(self, with_admins=True, with_owner=True):
+        """
+        Permissions for user groups
+        """
+        _admin_perm = 'usergroup.admin'
+
+        owner_row = []
+        if with_owner:
+            usr = AttributeDict(self.user.get_dict())
+            usr.owner_row = True
+            usr.permission = _admin_perm
+            owner_row.append(usr)
+
+        super_admin_ids = []
+        super_admin_rows = []
+        if with_admins:
+            for usr in User.get_all_super_admins():
+                super_admin_ids.append(usr.user_id)
+                # if this admin is also owner, don't double the record
+                if usr.user_id == owner_row[0].user_id:
+                    owner_row[0].admin_row = True
+                else:
+                    usr = AttributeDict(usr.get_dict())
+                    usr.admin_row = True
+                    usr.permission = _admin_perm
+                    super_admin_rows.append(usr)
+
         q = UserUserGroupToPerm.query().filter(UserUserGroupToPerm.user_group == self)
         q = q.options(joinedload(UserUserGroupToPerm.user_group),
                       joinedload(UserUserGroupToPerm.user),
@@ -1397,6 +1415,9 @@ class UserGroup(Base, BaseModel):
         perm_rows = []
         for _usr in q.all():
             usr = AttributeDict(_usr.user.get_dict())
+            # if this user is also owner/admin, mark as duplicate record
+            if usr.user_id == owner_row[0].user_id or usr.user_id in super_admin_ids:
+                usr.duplicate_perm = True
             usr.permission = _usr.permission.permission_name
             perm_rows.append(usr)
 
@@ -1405,26 +1426,6 @@ class UserGroup(Base, BaseModel):
         # each group
         perm_rows = sorted(perm_rows, key=display_user_sort)
 
-        _admin_perm = 'usergroup.admin'
-        owner_row = []
-        if with_owner:
-            usr = AttributeDict(self.user.get_dict())
-            usr.owner_row = True
-            usr.permission = _admin_perm
-            owner_row.append(usr)
-
-        super_admin_rows = []
-        if with_admins:
-            for usr in User.get_all_super_admins():
-                # if this admin is also owner, don't double the record
-                if usr.user_id == owner_row[0].user_id:
-                    owner_row[0].admin_row = True
-                else:
-                    usr = AttributeDict(usr.get_dict())
-                    usr.admin_row = True
-                    usr.permission = _admin_perm
-                    super_admin_rows.append(usr)
-
         return super_admin_rows + owner_row + perm_rows
 
     def permission_user_groups(self):
@@ -1479,8 +1480,7 @@ class UserGroup(Base, BaseModel):
 class UserGroupMember(Base, BaseModel):
     __tablename__ = 'users_groups_members'
     __table_args__ = (
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
 
     users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ -1499,9 +1499,9 @@ class RepositoryField(Base, BaseModel):
     __tablename__ = 'repositories_fields'
     __table_args__ = (
         UniqueConstraint('repository_id', 'field_key'),  # no-multi field
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
+
     PREFIX = 'ex_'  # prefix used in form to not conflict with already existing fields
 
     repo_field_id = Column("repo_field_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ -1537,8 +1537,7 @@ class Repository(Base, BaseModel):
     __tablename__ = 'repositories'
     __table_args__ = (
         Index('r_repo_name_idx', 'repo_name', mysql_length=255),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
     DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
     DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}'
@@ -1854,8 +1853,10 @@ class Repository(Base, BaseModel):
         """
         Returns associated cache keys for that repo
         """
+        invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+            repo_id=self.repo_id)
         return CacheKey.query()\
-            .filter(CacheKey.cache_args == self.repo_name)\
+            .filter(CacheKey.cache_args == invalidation_namespace)\
             .order_by(CacheKey.cache_key)\
             .all()
 
@@ -1883,6 +1884,12 @@ class Repository(Base, BaseModel):
             return os.listdir(diff_cache_dir)
         return []
 
+    def shadow_repos(self):
+        shadow_repos_pattern = '.__shadow_repo_{}'.format(self.repo_id)
+        return [
+            x for x in os.listdir(os.path.dirname(self.repo_full_path))
+            if x.startswith(shadow_repos_pattern)]
+
     def get_new_name(self, repo_name):
         """
         returns new full repository name based on assigned group and new new
@@ -1901,6 +1908,34 @@ class Repository(Base, BaseModel):
         return make_db_config(clear_session=False, repo=self)
 
     def permissions(self, with_admins=True, with_owner=True):
+        """
+        Permissions for repositories
+        """
+        _admin_perm = 'repository.admin'
+
+        owner_row = []
+        if with_owner:
+            usr = AttributeDict(self.user.get_dict())
+            usr.owner_row = True
+            usr.permission = _admin_perm
+            usr.permission_id = None
+            owner_row.append(usr)
+
+        super_admin_ids = []
+        super_admin_rows = []
+        if with_admins:
+            for usr in User.get_all_super_admins():
+                super_admin_ids.append(usr.user_id)
+                # if this admin is also owner, don't double the record
+                if usr.user_id == owner_row[0].user_id:
+                    owner_row[0].admin_row = True
+                else:
+                    usr = AttributeDict(usr.get_dict())
+                    usr.admin_row = True
+                    usr.permission = _admin_perm
+                    usr.permission_id = None
+                    super_admin_rows.append(usr)
+
         q = UserRepoToPerm.query().filter(UserRepoToPerm.repository == self)
         q = q.options(joinedload(UserRepoToPerm.repository),
                       joinedload(UserRepoToPerm.user),
@@ -1914,7 +1949,15 @@ class Repository(Base, BaseModel):
         perm_rows = []
         for _usr in q.all():
             usr = AttributeDict(_usr.user.get_dict())
+            # if this user is also owner/admin, mark as duplicate record
+            if usr.user_id == owner_row[0].user_id or usr.user_id in super_admin_ids:
+                usr.duplicate_perm = True
+            # also check if this permission is maybe used by branch_permissions
+            if _usr.branch_perm_entry:
+                usr.branch_rules = [x.branch_rule_id for x in _usr.branch_perm_entry]
+
             usr.permission = _usr.permission.permission_name
+            usr.permission_id = _usr.repo_to_perm_id
             perm_rows.append(usr)
 
         # filter the perm rows by 'default' first and then sort them by
@@ -1922,26 +1965,6 @@ class Repository(Base, BaseModel):
         # each group
         perm_rows = sorted(perm_rows, key=display_user_sort)
 
-        _admin_perm = 'repository.admin'
-        owner_row = []
-        if with_owner:
-            usr = AttributeDict(self.user.get_dict())
-            usr.owner_row = True
-            usr.permission = _admin_perm
-            owner_row.append(usr)
-
-        super_admin_rows = []
-        if with_admins:
-            for usr in User.get_all_super_admins():
-                # if this admin is also owner, don't double the record
-                if usr.user_id == owner_row[0].user_id:
-                    owner_row[0].admin_row = True
-                else:
-                    usr = AttributeDict(usr.get_dict())
-                    usr.admin_row = True
-                    usr.permission = _admin_perm
-                    super_admin_rows.append(usr)
-
         return super_admin_rows + owner_row + perm_rows
 
     def permission_user_groups(self):
@@ -2208,7 +2231,9 @@ class Repository(Base, BaseModel):
         if cs_cache is None:
             # use no-cache version here
             scm_repo = self.scm_instance(cache=False, config=config)
-            if scm_repo:
+
+            empty = scm_repo.is_empty()
+            if not empty:
                 cs_cache = scm_repo.get_commit(
                     pre_load=["author", "date", "message", "parents"])
             else:
@@ -2225,8 +2250,13 @@ class Repository(Base, BaseModel):
 
         # check if we have maybe already latest cached revision
         if is_outdated(cs_cache) or not self.changeset_cache:
-            _default = datetime.datetime.fromtimestamp(0)
+            _default = datetime.datetime.utcnow()
             last_change = cs_cache.get('date') or _default
+            if self.updated_on and self.updated_on > last_change:
+                # we check if last update is newer than the new value
+                # if yes, we use the current timestamp instead. Imagine you get
+                # old commit pushed 1y ago, we'd set last update 1y to ago.
+                last_change = _default
             log.debug('updated repo %s with new cs cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
@@ -2325,18 +2355,34 @@ class Repository(Base, BaseModel):
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
-        @cache_region('long_term')
-        def _get_repo(cache_key):
+        from rhodecode.lib import rc_cache
+
+        cache_namespace_uid = 'cache_repo_instance.{}'.format(self.repo_id)
+        invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+            repo_id=self.repo_id)
+        region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
+
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
+        def get_instance_cached(repo_id, context_id):
             return self._get_instance()
 
-        invalidator_context = CacheKey.repo_context_cache(
-            _get_repo, self.repo_name, None, thread_scoped=True)
-
-        with invalidator_context as context:
-            context.invalidate()
-            repo = context.compute()
-
-        return repo
+        # we must use thread scoped cache here,
+        # because each thread of gevent needs it's own not shared connection and cache
+        # we also alter `args` so the cache key is individual for every green thread.
+        inv_context_manager = rc_cache.InvalidationContext(
+            uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace,
+            thread_scoped=True)
+        with inv_context_manager as invalidation_context:
+            args = (self.repo_id, inv_context_manager.cache_key)
+            # re-compute and store cache if we get invalidate signal
+            if invalidation_context.should_invalidate():
+                instance = get_instance_cached.refresh(*args)
+            else:
+                instance = get_instance_cached(*args)
+
+            log.debug(
+                'Repo instance fetched in %.3fs', inv_context_manager.compute_time)
+            return instance
 
     def _get_instance(self, cache=True, config=None):
         config = config or self._config
@@ -2370,8 +2416,7 @@ class RepoGroup(Base, BaseModel):
     __table_args__ = (
         UniqueConstraint('group_name', 'group_parent_id'),
         CheckConstraint('group_id != group_parent_id'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
     __mapper_args__ = {'order_by': 'group_name'}
 
@@ -2574,6 +2619,32 @@ class RepoGroup(Base, BaseModel):
         return RepoGroup.url_sep().join(path_prefix + [group_name])
 
     def permissions(self, with_admins=True, with_owner=True):
+        """
+        Permissions for repository groups
+        """
+        _admin_perm = 'group.admin'
+
+        owner_row = []
+        if with_owner:
+            usr = AttributeDict(self.user.get_dict())
+            usr.owner_row = True
+            usr.permission = _admin_perm
+            owner_row.append(usr)
+
+        super_admin_ids = []
+        super_admin_rows = []
+        if with_admins:
+            for usr in User.get_all_super_admins():
+                super_admin_ids.append(usr.user_id)
+                # if this admin is also owner, don't double the record
+                if usr.user_id == owner_row[0].user_id:
+                    owner_row[0].admin_row = True
+                else:
+                    usr = AttributeDict(usr.get_dict())
+                    usr.admin_row = True
+                    usr.permission = _admin_perm
+                    super_admin_rows.append(usr)
+
         q = UserRepoGroupToPerm.query().filter(UserRepoGroupToPerm.group == self)
         q = q.options(joinedload(UserRepoGroupToPerm.group),
                       joinedload(UserRepoGroupToPerm.user),
@@ -2587,6 +2658,9 @@ class RepoGroup(Base, BaseModel):
         perm_rows = []
         for _usr in q.all():
             usr = AttributeDict(_usr.user.get_dict())
+            # if this user is also owner/admin, mark as duplicate record
+            if usr.user_id == owner_row[0].user_id or usr.user_id in super_admin_ids:
+                usr.duplicate_perm = True
             usr.permission = _usr.permission.permission_name
             perm_rows.append(usr)
 
@@ -2595,30 +2669,11 @@ class RepoGroup(Base, BaseModel):
         # each group
         perm_rows = sorted(perm_rows, key=display_user_sort)
 
-        _admin_perm = 'group.admin'
-        owner_row = []
-        if with_owner:
-            usr = AttributeDict(self.user.get_dict())
-            usr.owner_row = True
-            usr.permission = _admin_perm
-            owner_row.append(usr)
-
-        super_admin_rows = []
-        if with_admins:
-            for usr in User.get_all_super_admins():
-                # if this admin is also owner, don't double the record
-                if usr.user_id == owner_row[0].user_id:
-                    owner_row[0].admin_row = True
-                else:
-                    usr = AttributeDict(usr.get_dict())
-                    usr.admin_row = True
-                    usr.permission = _admin_perm
-                    super_admin_rows.append(usr)
-
         return super_admin_rows + owner_row + perm_rows
 
     def permission_user_groups(self):
-        q = UserGroupRepoGroupToPerm.query().filter(UserGroupRepoGroupToPerm.group == self)
+        q = UserGroupRepoGroupToPerm.query().filter(
+            UserGroupRepoGroupToPerm.group == self)
         q = q.options(joinedload(UserGroupRepoGroupToPerm.group),
                       joinedload(UserGroupRepoGroupToPerm.users_group),
                       joinedload(UserGroupRepoGroupToPerm.permission),)
@@ -2653,9 +2708,9 @@ class Permission(Base, BaseModel):
     __tablename__ = 'permissions'
     __table_args__ = (
         Index('p_perm_name_idx', 'permission_name'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
+
     PERMS = [
         ('hg.admin', _('RhodeCode Super Administrator')),
 
@@ -2674,6 +2729,11 @@ class Permission(Base, BaseModel):
         ('usergroup.write', _('User group write access')),
         ('usergroup.admin', _('User group admin access')),
 
+        ('branch.none', _('Branch no permissions')),
+        ('branch.merge', _('Branch access by web merge')),
+        ('branch.push', _('Branch access by push')),
+        ('branch.push_force', _('Branch access by push with force')),
+
         ('hg.repogroup.create.false', _('Repository Group creation disabled')),
         ('hg.repogroup.create.true', _('Repository Group creation enabled')),
 
@@ -2703,11 +2763,16 @@ class Permission(Base, BaseModel):
         ('hg.inherit_default_perms.true', _('Inherit object permissions from default user enabled')),
     ]
 
-    # definition of system default permissions for DEFAULT user
+    # definition of system default permissions for DEFAULT user, created on
+    # system setup
     DEFAULT_USER_PERMISSIONS = [
+        # object perms
         'repository.read',
         'group.read',
         'usergroup.read',
+        # branch, for backward compat we need same value as before so forced pushed
+        'branch.push_force',
+        # global
         'hg.create.repository',
         'hg.repogroup.create.false',
         'hg.usergroup.create.false',
@@ -2738,6 +2803,11 @@ class Permission(Base, BaseModel):
         'usergroup.write': 3,
         'usergroup.admin': 4,
 
+        'branch.none': 0,
+        'branch.merge': 1,
+        'branch.push': 3,
+        'branch.push_force': 4,
+
         'hg.repogroup.create.false': 0,
         'hg.repogroup.create.true': 1,
 
@@ -2774,6 +2844,21 @@ class Permission(Base, BaseModel):
         return q.all()
 
     @classmethod
+    def get_default_repo_branch_perms(cls, user_id, repo_id=None):
+        q = Session().query(UserToRepoBranchPermission, UserRepoToPerm, Permission) \
+            .join(
+                Permission,
+                UserToRepoBranchPermission.permission_id == Permission.permission_id) \
+            .join(
+                UserRepoToPerm,
+                UserToRepoBranchPermission.rule_to_perm_id == UserRepoToPerm.repo_to_perm_id) \
+            .filter(UserRepoToPerm.user_id == user_id)
+
+        if repo_id:
+            q = q.filter(UserToRepoBranchPermission.repository_id == repo_id)
+        return q.order_by(UserToRepoBranchPermission.rule_order).all()
+
+    @classmethod
     def get_default_repo_perms_from_user_group(cls, user_id, repo_id=None):
         q = Session().query(UserGroupRepoToPerm, Repository, Permission)\
             .join(
@@ -2798,10 +2883,37 @@ class Permission(Base, BaseModel):
         return q.all()
 
     @classmethod
+    def get_default_repo_branch_perms_from_user_group(cls, user_id, repo_id=None):
+        q = Session().query(UserGroupToRepoBranchPermission, UserGroupRepoToPerm, Permission) \
+            .join(
+                Permission,
+                UserGroupToRepoBranchPermission.permission_id == Permission.permission_id) \
+            .join(
+                UserGroupRepoToPerm,
+                UserGroupToRepoBranchPermission.rule_to_perm_id == UserGroupRepoToPerm.users_group_to_perm_id) \
+            .join(
+                UserGroup,
+                UserGroupRepoToPerm.users_group_id == UserGroup.users_group_id) \
+            .join(
+                UserGroupMember,
+                UserGroupRepoToPerm.users_group_id == UserGroupMember.users_group_id) \
+            .filter(
+                UserGroupMember.user_id == user_id,
+                UserGroup.users_group_active == true())
+
+        if repo_id:
+            q = q.filter(UserGroupToRepoBranchPermission.repository_id == repo_id)
+        return q.order_by(UserGroupToRepoBranchPermission.rule_order).all()
+
+    @classmethod
     def get_default_group_perms(cls, user_id, repo_group_id=None):
         q = Session().query(UserRepoGroupToPerm, RepoGroup, Permission)\
-            .join((Permission, UserRepoGroupToPerm.permission_id == Permission.permission_id))\
-            .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\
+            .join(
+                Permission,
+                UserRepoGroupToPerm.permission_id == Permission.permission_id)\
+            .join(
+                RepoGroup,
+                UserRepoGroupToPerm.group_id == RepoGroup.group_id)\
             .filter(UserRepoGroupToPerm.user_id == user_id)
         if repo_group_id:
             q = q.filter(UserRepoGroupToPerm.group_id == repo_group_id)
@@ -2878,9 +2990,9 @@ class UserRepoToPerm(Base, BaseModel):
     __tablename__ = 'repo_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'repository_id', 'permission_id'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
+
     repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
@@ -2890,6 +3002,8 @@ class UserRepoToPerm(Base, BaseModel):
     repository = relationship('Repository')
     permission = relationship('Permission')
 
+    branch_perm_entry = relationship('UserToRepoBranchPermission', cascade="all, delete, delete-orphan", lazy='joined')
+
     @classmethod
     def create(cls, user, repository, permission):
         n = cls()
@@ -2907,9 +3021,9 @@ class UserUserGroupToPerm(Base, BaseMode
     __tablename__ = 'user_user_group_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'user_group_id', 'permission_id'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
+
     user_user_group_to_perm_id = Column("user_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
@@ -2936,9 +3050,9 @@ class UserToPerm(Base, BaseModel):
     __tablename__ = 'user_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'permission_id'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
+
     user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
@@ -2954,9 +3068,9 @@ class UserGroupRepoToPerm(Base, BaseMode
     __tablename__ = 'users_group_repo_to_perm'
     __table_args__ = (
         UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
+
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
@@ -2965,6 +3079,7 @@ class UserGroupRepoToPerm(Base, BaseMode
     users_group = relationship('UserGroup')
     permission = relationship('Permission')
     repository = relationship('Repository')
+    user_group_branch_perms = relationship('UserGroupToRepoBranchPermission', cascade='all')
 
     @classmethod
     def create(cls, users_group, repository, permission):
@@ -2984,9 +3099,9 @@ class UserGroupUserGroupToPerm(Base, Bas
     __table_args__ = (
         UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
         CheckConstraint('target_user_group_id != user_group_id'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
+
     user_group_user_group_to_perm_id = Column("user_group_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     target_user_group_id = Column("target_user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
@@ -3013,9 +3128,9 @@ class UserGroupToPerm(Base, BaseModel):
     __tablename__ = 'users_group_to_perm'
     __table_args__ = (
         UniqueConstraint('users_group_id', 'permission_id',),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
+
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
@@ -3028,8 +3143,7 @@ class UserRepoGroupToPerm(Base, BaseMode
     __tablename__ = 'user_repo_group_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'group_id', 'permission_id'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
 
     group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ -3055,8 +3169,7 @@ class UserGroupRepoGroupToPerm(Base, Bas
     __tablename__ = 'users_group_repo_group_to_perm'
     __table_args__ = (
         UniqueConstraint('users_group_id', 'group_id'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
 
     users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ -3084,9 +3197,9 @@ class UserGroupRepoGroupToPerm(Base, Bas
 class Statistics(Base, BaseModel):
     __tablename__ = 'statistics'
     __table_args__ = (
-         {'extend_existing': True, 'mysql_engine': 'InnoDB',
-          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+         base_table_args
     )
+
     stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
     stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
@@ -3102,8 +3215,7 @@ class UserFollowing(Base, BaseModel):
     __table_args__ = (
         UniqueConstraint('user_id', 'follows_repository_id'),
         UniqueConstraint('user_id', 'follows_user_id'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
 
     user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ -3127,12 +3239,14 @@ class CacheKey(Base, BaseModel):
     __table_args__ = (
         UniqueConstraint('cache_key'),
         Index('key_idx', 'cache_key'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
-    CACHE_TYPE_ATOM = 'ATOM'
-    CACHE_TYPE_RSS = 'RSS'
+
+    CACHE_TYPE_FEED = 'FEED'
     CACHE_TYPE_README = 'README'
+    # namespaces used to register process/thread aware caches
+    REPO_INVALIDATION_NAMESPACE = 'repo_cache:{repo_id}'
+    SETTINGS_INVALIDATION_NAMESPACE = 'system_settings'
 
     cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     cache_key = Column("cache_key", String(255), nullable=True, unique=None, default=None)
@@ -3181,44 +3295,27 @@ class CacheKey(Base, BaseModel):
         Session().commit()
 
     @classmethod
-    def get_cache_key(cls, repo_name, cache_type):
-        """
-
-        Generate a cache key for this process of RhodeCode instance.
-        Prefix most likely will be process id or maybe explicitly set
-        instance_id from .ini file.
-        """
-        import rhodecode
-        prefix = safe_unicode(rhodecode.CONFIG.get('instance_id') or '')
-
-        repo_as_unicode = safe_unicode(repo_name)
-        key = u'{}_{}'.format(repo_as_unicode, cache_type) \
-            if cache_type else repo_as_unicode
-
-        return u'{}{}'.format(prefix, key)
-
-    @classmethod
-    def set_invalidate(cls, repo_name, delete=False):
+    def set_invalidate(cls, cache_uid, delete=False):
         """
         Mark all caches of a repo as invalid in the database.
         """
 
         try:
-            qry = Session().query(cls).filter(cls.cache_args == repo_name)
+            qry = Session().query(cls).filter(cls.cache_args == cache_uid)
             if delete:
-                log.debug('cache objects deleted for repo %s',
-                          safe_str(repo_name))
                 qry.delete()
+                log.debug('cache objects deleted for cache args %s',
+                          safe_str(cache_uid))
             else:
-                log.debug('cache objects marked as invalid for repo %s',
-                          safe_str(repo_name))
                 qry.update({"cache_active": False})
+                log.debug('cache objects marked as invalid for cache args %s',
+                          safe_str(cache_uid))
 
             Session().commit()
         except Exception:
             log.exception(
-                'Cache key invalidation failed for repository %s',
-                safe_str(repo_name))
+                'Cache key invalidation failed for cache args %s',
+                safe_str(cache_uid))
             Session().rollback()
 
     @classmethod
@@ -3228,34 +3325,12 @@ class CacheKey(Base, BaseModel):
             return inv_obj
         return None
 
-    @classmethod
-    def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                           thread_scoped=False):
-        """
-        @cache_region('long_term')
-        def _heavy_calculation(cache_key):
-            return 'result'
-
-        cache_context = CacheKey.repo_context_cache(
-            _heavy_calculation, repo_name, cache_type)
-
-        with cache_context as context:
-            context.invalidate()
-            computed = context.compute()
-
-        assert computed == 'result'
-        """
-        from rhodecode.lib import caches
-        return caches.InvalidationContext(
-            compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
-
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
     __table_args__ = (
         Index('cc_revision_idx', 'revision'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
 
     COMMENT_OUTDATED = u'comment_outdated'
@@ -3379,9 +3454,9 @@ class ChangesetStatus(Base, BaseModel):
         Index('cs_revision_idx', 'revision'),
         Index('cs_version_idx', 'version'),
         UniqueConstraint('repo_id', 'revision', 'version'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
+
     STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'
     STATUS_APPROVED = 'approved'
     STATUS_REJECTED = 'rejected'
@@ -3451,6 +3526,8 @@ class _PullRequestBase(BaseModel):
     description = Column(
         'description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'),
         nullable=True)
+    description_renderer = Column('description_renderer', Unicode(64), nullable=True)
+
     # new/open/closed status of pull request (not approve/reject/etc)
     status = Column('status', Unicode(255), nullable=False, default=STATUS_NEW)
     created_on = Column(
@@ -3651,8 +3728,7 @@ class _PullRequestBase(BaseModel):
 class PullRequest(Base, _PullRequestBase):
     __tablename__ = 'pull_requests'
     __table_args__ = (
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
 
     pull_request_id = Column(
@@ -3762,15 +3838,15 @@ class PullRequest(Base, _PullRequestBase
         workspace_id = self.workspace_id
         vcs_obj = self.target_repo.scm_instance()
         shadow_repository_path = vcs_obj._get_shadow_repository_path(
-            workspace_id)
-        return vcs_obj._get_shadow_instance(shadow_repository_path)
+            self.target_repo.repo_id, workspace_id)
+        if os.path.isdir(shadow_repository_path):
+            return vcs_obj._get_shadow_instance(shadow_repository_path)
 
 
 class PullRequestVersion(Base, _PullRequestBase):
     __tablename__ = 'pull_request_versions'
     __table_args__ = (
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
 
     pull_request_version_id = Column(
@@ -3808,8 +3884,7 @@ class PullRequestVersion(Base, _PullRequ
 class PullRequestReviewers(Base, BaseModel):
     __tablename__ = 'pull_request_reviewers'
     __table_args__ = (
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
 
     @hybrid_property
@@ -3869,8 +3944,7 @@ class Notification(Base, BaseModel):
     __tablename__ = 'notifications'
     __table_args__ = (
         Index('notification_type_idx', 'type'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
 
     TYPE_CHANGESET_COMMENT = u'cs_comment'
@@ -3909,16 +3983,18 @@ class Notification(Base, BaseModel):
         notification.type_ = type_
         notification.created_on = datetime.datetime.now()
 
+        # For each recipient link the created notification to his account
         for u in recipients:
             assoc = UserNotification()
+            assoc.user_id = u.user_id
             assoc.notification = notification
 
             # if created_by is inside recipients mark his notification
             # as read
             if u.user_id == created_by.user_id:
                 assoc.read = True
-
-            u.notifications.append(assoc)
+            Session().add(assoc)
+
         Session().add(notification)
 
         return notification
@@ -3928,9 +4004,9 @@ class UserNotification(Base, BaseModel):
     __tablename__ = 'user_to_notification'
     __table_args__ = (
         UniqueConstraint('user_id', 'notification_id'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
+
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
     notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), primary_key=True)
     read = Column('read', Boolean, default=False)
@@ -3950,9 +4026,9 @@ class Gist(Base, BaseModel):
     __table_args__ = (
         Index('g_gist_access_id_idx', 'gist_access_id'),
         Index('g_created_on_idx', 'created_on'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
+
     GIST_PUBLIC = u'public'
     GIST_PRIVATE = u'private'
     DEFAULT_FILENAME = u'gistfile1.txt'
@@ -4047,8 +4123,8 @@ class ExternalIdentity(Base, BaseModel):
     __table_args__ = (
         Index('local_user_id_idx', 'local_user_id'),
         Index('external_id_idx', 'external_id'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8'})
+        base_table_args
+    )
 
     external_id = Column('external_id', Unicode(255), default=u'',
                          primary_key=True)
@@ -4109,8 +4185,7 @@ class ExternalIdentity(Base, BaseModel):
 class Integration(Base, BaseModel):
     __tablename__ = 'integrations'
     __table_args__ = (
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+        base_table_args
     )
 
     integration_id = Column('integration_id', Integer(), primary_key=True)
@@ -4153,8 +4228,7 @@ class Integration(Base, BaseModel):
 class RepoReviewRuleUser(Base, BaseModel):
     __tablename__ = 'repo_review_rules_users'
     __table_args__ = (
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+        base_table_args
     )
 
     repo_review_rule_user_id = Column('repo_review_rule_user_id', Integer(), primary_key=True)
@@ -4172,9 +4246,9 @@ class RepoReviewRuleUser(Base, BaseModel
 class RepoReviewRuleUserGroup(Base, BaseModel):
     __tablename__ = 'repo_review_rules_users_groups'
     __table_args__ = (
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+        base_table_args
     )
+
     VOTE_RULE_ALL = -1
 
     repo_review_rule_users_group_id = Column('repo_review_rule_users_group_id', Integer(), primary_key=True)
@@ -4201,8 +4275,7 @@ class RepoReviewRuleUserGroup(Base, Base
 class RepoReviewRule(Base, BaseModel):
     __tablename__ = 'repo_review_rules'
     __table_args__ = (
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+        base_table_args
     )
 
     repo_review_rule_id = Column(
@@ -4224,7 +4297,7 @@ class RepoReviewRule(Base, BaseModel):
     rule_users = relationship('RepoReviewRuleUser')
     rule_user_groups = relationship('RepoReviewRuleUserGroup')
 
-    def _validate_glob(self, value):
+    def _validate_pattern(self, value):
         re.compile('^' + glob2re(value) + '$')
 
     @hybrid_property
@@ -4233,7 +4306,7 @@ class RepoReviewRule(Base, BaseModel):
 
     @source_branch_pattern.setter
     def source_branch_pattern(self, value):
-        self._validate_glob(value)
+        self._validate_pattern(value)
         self._branch_pattern = value or '*'
 
     @hybrid_property
@@ -4242,7 +4315,7 @@ class RepoReviewRule(Base, BaseModel):
 
     @target_branch_pattern.setter
     def target_branch_pattern(self, value):
-        self._validate_glob(value)
+        self._validate_pattern(value)
         self._target_branch_pattern = value or '*'
 
     @hybrid_property
@@ -4251,7 +4324,7 @@ class RepoReviewRule(Base, BaseModel):
 
     @file_pattern.setter
     def file_pattern(self, value):
-        self._validate_glob(value)
+        self._validate_pattern(value)
         self._file_pattern = value or '*'
 
     def matches(self, source_branch, target_branch, files_changed):
@@ -4272,14 +4345,20 @@ class RepoReviewRule(Base, BaseModel):
             if self.source_branch_pattern == '*':
                 source_branch_match = True
             else:
-                source_branch_regex = re.compile(
-                    '^' + glob2re(self.source_branch_pattern) + '$')
+                if self.source_branch_pattern.startswith('re:'):
+                    source_pattern = self.source_branch_pattern[3:]
+                else:
+                    source_pattern = '^' + glob2re(self.source_branch_pattern) + '$'
+                source_branch_regex = re.compile(source_pattern)
                 source_branch_match = bool(source_branch_regex.search(source_branch))
             if self.target_branch_pattern == '*':
                 target_branch_match = True
             else:
-                target_branch_regex = re.compile(
-                    '^' + glob2re(self.target_branch_pattern) + '$')
+                if self.target_branch_pattern.startswith('re:'):
+                    target_pattern = self.target_branch_pattern[3:]
+                else:
+                    target_pattern = '^' + glob2re(self.target_branch_pattern) + '$'
+                target_branch_regex = re.compile(target_pattern)
                 target_branch_match = bool(target_branch_regex.search(target_branch))
 
             branch_matches = source_branch_match and target_branch_match
@@ -4287,7 +4366,11 @@ class RepoReviewRule(Base, BaseModel):
         files_matches = True
         if self.file_pattern != '*':
             files_matches = False
-            file_regex = re.compile(glob2re(self.file_pattern))
+            if self.file_pattern.startswith('re:'):
+                file_pattern = self.file_pattern[3:]
+            else:
+                file_pattern = glob2re(self.file_pattern)
+            file_regex = re.compile(file_pattern)
             for filename in files_changed:
                 if file_regex.search(filename):
                     files_matches = True
@@ -4335,10 +4418,15 @@ class RepoReviewRule(Base, BaseModel):
 
         return users
 
-    def user_group_vote_rule(self):
+    def user_group_vote_rule(self, user_id):
+
         rules = []
-        if self.rule_user_groups:
-            for user_group in self.rule_user_groups:
+        if not self.rule_user_groups:
+            return rules
+
+        for user_group in self.rule_user_groups:
+            user_group_members = [x.user_id for x in user_group.users_group.members]
+            if user_id in user_group_members:
                 rules.append(user_group)
         return rules
 
@@ -4352,9 +4440,9 @@ class ScheduleEntry(Base, BaseModel):
     __table_args__ = (
         UniqueConstraint('schedule_name', name='s_schedule_name_idx'),
         UniqueConstraint('task_uid', name='s_task_uid_idx'),
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
+
     schedule_types = ['crontab', 'timedelta', 'integer']
     schedule_entry_id = Column('schedule_entry_id', Integer(), primary_key=True)
 
@@ -4477,22 +4565,124 @@ def set_task_uid(mapper, connection, tar
     target.task_uid = ScheduleEntry.get_uid(target)
 
 
+class _BaseBranchPerms(BaseModel):
+    @classmethod
+    def compute_hash(cls, value):
+        return sha1_safe(value)
+
+    @hybrid_property
+    def branch_pattern(self):
+        return self._branch_pattern or '*'
+
+    @hybrid_property
+    def branch_hash(self):
+        return self._branch_hash
+
+    def _validate_glob(self, value):
+        re.compile('^' + glob2re(value) + '$')
+
+    @branch_pattern.setter
+    def branch_pattern(self, value):
+        self._validate_glob(value)
+        self._branch_pattern = value or '*'
+        # set the Hash when setting the branch pattern
+        self._branch_hash = self.compute_hash(self._branch_pattern)
+
+    def matches(self, branch):
+        """
+        Check if this the branch matches entry
+
+        :param branch: branch name for the commit
+        """
+
+        branch = branch or ''
+
+        branch_matches = True
+        if branch:
+            branch_regex = re.compile('^' + glob2re(self.branch_pattern) + '$')
+            branch_matches = bool(branch_regex.search(branch))
+
+        return branch_matches
+
+
+class UserToRepoBranchPermission(Base, _BaseBranchPerms):
+    __tablename__ = 'user_to_repo_branch_permissions'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+    )
+
+    branch_rule_id = Column('branch_rule_id', Integer(), primary_key=True)
+
+    repository_id = Column('repository_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+    repo = relationship('Repository', backref='user_branch_perms')
+
+    permission_id = Column('permission_id', Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+    permission = relationship('Permission')
+
+    rule_to_perm_id = Column('rule_to_perm_id', Integer(), ForeignKey('repo_to_perm.repo_to_perm_id'), nullable=False, unique=None, default=None)
+    user_repo_to_perm = relationship('UserRepoToPerm')
+
+    rule_order = Column('rule_order', Integer(), nullable=False)
+    _branch_pattern = Column('branch_pattern', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), default=u'*')  # glob
+    _branch_hash = Column('branch_hash', UnicodeText().with_variant(UnicodeText(2048), 'mysql'))
+
+    def __unicode__(self):
+        return u'<UserBranchPermission(%s => %r)>' % (
+            self.user_repo_to_perm, self.branch_pattern)
+
+
+class UserGroupToRepoBranchPermission(Base, _BaseBranchPerms):
+    __tablename__ = 'user_group_to_repo_branch_permissions'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+    )
+
+    branch_rule_id = Column('branch_rule_id', Integer(), primary_key=True)
+
+    repository_id = Column('repository_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+    repo = relationship('Repository', backref='user_group_branch_perms')
+
+    permission_id = Column('permission_id', Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+    permission = relationship('Permission')
+
+    rule_to_perm_id = Column('rule_to_perm_id', Integer(), ForeignKey('users_group_repo_to_perm.users_group_to_perm_id'), nullable=False, unique=None, default=None)
+    user_group_repo_to_perm = relationship('UserGroupRepoToPerm')
+
+    rule_order = Column('rule_order', Integer(), nullable=False)
+    _branch_pattern = Column('branch_pattern', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), default=u'*')  # glob
+    _branch_hash = Column('branch_hash', UnicodeText().with_variant(UnicodeText(2048), 'mysql'))
+
+    def __unicode__(self):
+        return u'<UserBranchPermission(%s => %r)>' % (
+            self.user_group_repo_to_perm, self.branch_pattern)
+
+
 class DbMigrateVersion(Base, BaseModel):
     __tablename__ = 'db_migrate_version'
     __table_args__ = (
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
+
     repository_id = Column('repository_id', String(250), primary_key=True)
     repository_path = Column('repository_path', Text)
     version = Column('version', Integer)
 
+    @classmethod
+    def set_version(cls, version):
+        """
+        Helper for forcing a different version, usually for debugging purposes via ishell.
+        """
+        ver = DbMigrateVersion.query().first()
+        ver.version = version
+        Session().commit()
+
 
 class DbSession(Base, BaseModel):
     __tablename__ = 'db_session'
     __table_args__ = (
-        {'extend_existing': True, 'mysql_engine': 'InnoDB',
-         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+        base_table_args,
     )
 
     def __repr__(self):
diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py
--- a/rhodecode/model/forms.py
+++ b/rhodecode/model/forms.py
@@ -504,12 +504,26 @@ def ObjectPermissionsForm(localizer, rep
         overwrite_default_repo = v.StringBoolean(if_missing=False)
         overwrite_default_group = v.StringBoolean(if_missing=False)
         overwrite_default_user_group = v.StringBoolean(if_missing=False)
+
         default_repo_perm = v.OneOf(repo_perms_choices)
         default_group_perm = v.OneOf(group_perms_choices)
         default_user_group_perm = v.OneOf(user_group_perms_choices)
+
     return _ObjectPermissionsForm
 
 
+def BranchPermissionsForm(localizer, branch_perms_choices):
+    _ = localizer
+
+    class _BranchPermissionsForm(formencode.Schema):
+        allow_extra_fields = True
+        filter_extra_fields = True
+        overwrite_default_branch = v.StringBoolean(if_missing=False)
+        default_branch_perm = v.OneOf(branch_perms_choices)
+
+    return _BranchPermissionsForm
+
+
 def UserPermissionsForm(localizer, create_choices, create_on_write_choices,
                         repo_group_create_choices, user_group_create_choices,
                         fork_choices, inherit_default_permissions_choices):
@@ -606,6 +620,7 @@ def PullRequestForm(localizer, repo_id):
         review_members = formencode.ForEach(ReviewerForm())
         pullrequest_title = v.UnicodeString(strip=True, required=True, min=3, max=255)
         pullrequest_desc = v.UnicodeString(strip=True, required=False)
+        description_renderer = v.UnicodeString(strip=True, required=False)
 
     return _PullRequestForm
 
diff --git a/rhodecode/model/gist.py b/rhodecode/model/gist.py
--- a/rhodecode/model/gist.py
+++ b/rhodecode/model/gist.py
@@ -33,6 +33,7 @@ from pyramid.threadlocal import get_curr
 from rhodecode.lib.utils2 import (
     safe_unicode, unique_id, safe_int, time_to_datetime, AttributeDict)
 from rhodecode.lib.ext_json import json
+from rhodecode.lib.vcs import VCSError
 from rhodecode.model import BaseModel
 from rhodecode.model.db import Gist
 from rhodecode.model.repo import RepoModel
@@ -98,7 +99,11 @@ class GistModel(BaseModel):
         :param gist_access_id:
         """
         repo = Gist.get_by_access_id(gist_access_id)
-        commit = repo.scm_instance().get_commit(commit_id=revision)
+        vcs_repo = repo.scm_instance()
+        if not vcs_repo:
+            raise VCSError('Failed to load gist repository for {}'.format(repo))
+
+        commit = vcs_repo.get_commit(commit_id=revision)
         return commit, [n for n in commit.get_node('/')]
 
     def create(self, description, owner, gist_mapping,
diff --git a/rhodecode/model/integration.py b/rhodecode/model/integration.py
--- a/rhodecode/model/integration.py
+++ b/rhodecode/model/integration.py
@@ -33,7 +33,7 @@ from rhodecode import events
 from rhodecode.integrations.types.base import EEIntegration
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model import BaseModel
-from rhodecode.model.db import Integration, Repository, RepoGroup
+from rhodecode.model.db import Integration, Repository, RepoGroup, true, false
 from rhodecode.integrations import integration_type_registry
 
 log = logging.getLogger(__name__)
@@ -119,20 +119,20 @@ class IntegrationModel(BaseModel):
 
         if isinstance(scope, Repository):
             query = self.sa.query(Integration).filter(
-                Integration.repo==scope)
+                Integration.repo == scope)
         elif isinstance(scope, RepoGroup):
             query = self.sa.query(Integration).filter(
-                Integration.repo_group==scope)
+                Integration.repo_group == scope)
         elif scope == 'global':
             # global integrations
             query = self.sa.query(Integration).filter(
-                and_(Integration.repo_id==None, Integration.repo_group_id==None)
+                and_(Integration.repo_id == None, Integration.repo_group_id == None)
             )
         elif scope == 'root-repos':
             query = self.sa.query(Integration).filter(
-                and_(Integration.repo_id==None,
-                     Integration.repo_group_id==None,
-                     Integration.child_repos_only==True)
+                and_(Integration.repo_id == None,
+                     Integration.repo_group_id == None,
+                     Integration.child_repos_only == true())
             )
         elif scope == 'all':
             query = self.sa.query(Integration)
@@ -158,20 +158,20 @@ class IntegrationModel(BaseModel):
         query = self.sa.query(
             Integration
         ).filter(
-            Integration.enabled==True
+            Integration.enabled == true()
         )
 
         global_integrations_filter = and_(
-            Integration.repo_id==None,
-            Integration.repo_group_id==None,
-            Integration.child_repos_only==False,
+            Integration.repo_id == None,
+            Integration.repo_group_id == None,
+            Integration.child_repos_only == False,
         )
 
         if isinstance(event, events.RepoEvent):
             root_repos_integrations_filter = and_(
-                Integration.repo_id==None,
-                Integration.repo_group_id==None,
-                Integration.child_repos_only==True,
+                Integration.repo_id == None,
+                Integration.repo_group_id == None,
+                Integration.child_repos_only == true(),
             )
 
             clauses = [
@@ -179,16 +179,16 @@ class IntegrationModel(BaseModel):
             ]
 
             # repo integrations
-            if event.repo.repo_id: # pre create events dont have a repo_id yet
+            if event.repo.repo_id:  # pre create events dont have a repo_id yet
                 clauses.append(
-                    Integration.repo_id==event.repo.repo_id
+                    Integration.repo_id == event.repo.repo_id
                 )
 
             if event.repo.group:
                 clauses.append(
                     and_(
-                        Integration.repo_group_id==event.repo.group.group_id,
-                        Integration.child_repos_only==True
+                        Integration.repo_group_id == event.repo.group.group_id,
+                        Integration.child_repos_only == true()
                     )
                 )
                 # repo group cascade to kids
@@ -196,14 +196,13 @@ class IntegrationModel(BaseModel):
                     and_(
                         Integration.repo_group_id.in_(
                             [group.group_id for group in
-                            event.repo.groups_with_parents]
+                             event.repo.groups_with_parents]
                         ),
-                        Integration.child_repos_only==False
+                        Integration.child_repos_only == false()
                     )
                 )
 
-
-            if not event.repo.group: # root repo
+            if not event.repo.group:  # root repo
                 clauses.append(root_repos_integrations_filter)
 
             query = query.filter(or_(*clauses))
@@ -212,11 +211,11 @@ class IntegrationModel(BaseModel):
                 cache_key = "get_enabled_repo_integrations_%i" % event.repo.repo_id
                 query = query.options(
                     FromCache("sql_cache_short", cache_key))
-        else: # only global integrations
+        else:  # only global integrations
             query = query.filter(global_integrations_filter)
             if cache:
                 query = query.options(
                     FromCache("sql_cache_short", "get_enabled_global_integrations"))
 
         result = query.all()
-        return result
\ No newline at end of file
+        return result
diff --git a/rhodecode/model/meta.py b/rhodecode/model/meta.py
--- a/rhodecode/model/meta.py
+++ b/rhodecode/model/meta.py
@@ -24,27 +24,22 @@ SQLAlchemy Metadata and Session object
 
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import scoped_session, sessionmaker
-from beaker import cache
 
 from rhodecode.lib import caching_query
 
-
-# Beaker CacheManager.  A home base for cache configurations.
-cache_manager = cache.CacheManager()
+__all__ = ['Base', 'Session']
 
-__all__ = ['Base', 'Session']
-#
-# SQLAlchemy session manager. Updated by model.init_model()
-#
+# scoped_session.  Apply our custom CachingQuery class to it,
+# using a callable that will associate the dictionary
+# of regions with the Query.
+# to use cache use this in query
+# .options(FromCache("sqlalchemy_cache_type", "cachekey"))
 Session = scoped_session(
                 sessionmaker(
-                    query_cls=caching_query.query_callable(cache_manager),
+                    query_cls=caching_query.query_callable(),
                     expire_on_commit=True,
                 )
           )
 
 # The declarative Base
 Base = declarative_base()
-
-#to use cache use this in query
-#.options(FromCache("sqlalchemy_cache_type", "cachekey"))
diff --git a/rhodecode/model/permission.py b/rhodecode/model/permission.py
--- a/rhodecode/model/permission.py
+++ b/rhodecode/model/permission.py
@@ -31,7 +31,7 @@ from sqlalchemy.exc import DatabaseError
 from rhodecode.model import BaseModel
 from rhodecode.model.db import (
     User, Permission, UserToPerm, UserRepoToPerm, UserRepoGroupToPerm,
-    UserUserGroupToPerm, UserGroup, UserGroupToPerm)
+    UserUserGroupToPerm, UserGroup, UserGroupToPerm, UserToRepoBranchPermission)
 from rhodecode.lib.utils2 import str2bool, safe_int
 
 log = logging.getLogger(__name__)
@@ -59,6 +59,9 @@ class PermissionModel(BaseModel):
         'default_repo_perm': None,
         'default_group_perm': None,
         'default_user_group_perm': None,
+
+        # branch
+        'default_branch_perm': None,
     }
 
     def set_global_permission_choices(self, c_obj, gettext_translator):
@@ -82,6 +85,12 @@ class PermissionModel(BaseModel):
             ('usergroup.write', _('Write'),),
             ('usergroup.admin', _('Admin'),)]
 
+        c_obj.branch_perms_choices = [
+            ('branch.none', _('Protected/No Access'),),
+            ('branch.merge', _('Web merge'),),
+            ('branch.push', _('Push'),),
+            ('branch.push_force', _('Force Push'),)]
+
         c_obj.register_choices = [
             ('hg.register.none', _('Disabled')),
             ('hg.register.manual_activate', _('Allowed with manual account activation')),
@@ -133,6 +142,10 @@ class PermissionModel(BaseModel):
             if perm.permission.permission_name.startswith('usergroup.'):
                 defaults['default_user_group_perm' + suffix] = perm.permission.permission_name
 
+            # branch
+            if perm.permission.permission_name.startswith('branch.'):
+                defaults['default_branch_perm' + suffix] = perm.permission.permission_name
+
             # creation of objects
             if perm.permission.permission_name.startswith('hg.create.write_on_repogroup'):
                 defaults['default_repo_create_on_write' + suffix] = perm.permission.permission_name
@@ -199,6 +212,9 @@ class PermissionModel(BaseModel):
                 'default_repo_perm': 'repository.',
                 'default_group_perm': 'group.',
                 'default_user_group_perm': 'usergroup.',
+                # branch
+                'default_branch_perm': 'branch.',
+
             }[field_name]
         for field in keep_fields:
             pat = get_pat(field)
@@ -236,8 +252,12 @@ class PermissionModel(BaseModel):
         _global_perms = self.global_perms.copy()
         if obj_type not in ['user', 'user_group']:
             raise ValueError("obj_type must be on of 'user' or 'user_group'")
-        if len(_global_perms) != len(Permission.DEFAULT_USER_PERMISSIONS):
-            raise Exception('Inconsistent permissions definition')
+        global_perms = len(_global_perms)
+        default_user_perms = len(Permission.DEFAULT_USER_PERMISSIONS)
+        if global_perms != default_user_perms:
+            raise Exception(
+                'Inconsistent permissions definition. Got {} vs {}'.format(
+                    global_perms, default_user_perms))
 
         if obj_type == 'user':
             self._clear_user_perms(object.user_id, preserve)
@@ -337,8 +357,8 @@ class PermissionModel(BaseModel):
 
     def create_default_user_group_permissions(self, user_group, force=False):
         """
-        Creates only missing default permissions for user group, if force is set it
-        resets the default permissions for that user group
+        Creates only missing default permissions for user group, if force is
+        set it resets the default permissions for that user group
 
         :param user_group:
         :param force:
@@ -366,6 +386,7 @@ class PermissionModel(BaseModel):
                 'default_repo_perm',
                 'default_group_perm',
                 'default_user_group_perm',
+                'default_branch_perm',
 
                 'default_repo_group_create',
                 'default_user_group_create',
@@ -392,6 +413,7 @@ class PermissionModel(BaseModel):
                 'default_repo_perm',
                 'default_group_perm',
                 'default_user_group_perm',
+                'default_branch_perm',
 
                 'default_register',
                 'default_password_reset',
@@ -414,6 +436,7 @@ class PermissionModel(BaseModel):
                 'default_repo_perm',
                 'default_group_perm',
                 'default_user_group_perm',
+                'default_branch_perm',
 
                 'default_register',
                 'default_password_reset',
@@ -440,6 +463,7 @@ class PermissionModel(BaseModel):
                 'default_repo_create',
                 'default_fork_create',
                 'default_inherit_default_permissions',
+                'default_branch_perm',
 
                 'default_register',
                 'default_password_reset',
@@ -477,8 +501,58 @@ class PermissionModel(BaseModel):
                                .all():
                     g2p.permission = _def
                     self.sa.add(g2p)
+
+            # COMMIT
             self.sa.commit()
         except (DatabaseError,):
             log.exception('Failed to set default object permissions')
             self.sa.rollback()
             raise
+
+    def update_branch_permissions(self, form_result):
+        if 'perm_user_id' in form_result:
+            perm_user = User.get(safe_int(form_result['perm_user_id']))
+        else:
+            # used mostly to do lookup for default user
+            perm_user = User.get_by_username(form_result['perm_user_name'])
+        try:
+
+            # stage 2 reset defaults and set them from form data
+            self._set_new_user_perms(perm_user, form_result, preserve=[
+                'default_repo_perm',
+                'default_group_perm',
+                'default_user_group_perm',
+
+                'default_repo_group_create',
+                'default_user_group_create',
+                'default_repo_create_on_write',
+                'default_repo_create',
+                'default_fork_create',
+                'default_inherit_default_permissions',
+
+                'default_register',
+                'default_password_reset',
+                'default_extern_activate'])
+
+            # overwrite default branch permissions
+            if form_result['overwrite_default_branch']:
+                _def_name = \
+                    form_result['default_branch_perm'].split('branch.')[-1]
+
+                _def = Permission.get_by_key('branch.' + _def_name)
+
+                user_perms = UserToRepoBranchPermission.query()\
+                    .join(UserToRepoBranchPermission.user_repo_to_perm)\
+                    .filter(UserRepoToPerm.user == perm_user).all()
+
+                for g2p in user_perms:
+                    g2p.permission = _def
+                    self.sa.add(g2p)
+
+            # COMMIT
+            self.sa.commit()
+        except (DatabaseError,):
+            log.exception('Failed to set default branch permissions')
+            self.sa.rollback()
+            raise
+
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -444,10 +444,12 @@ class PullRequestModel(BaseModel):
 
     def create(self, created_by, source_repo, source_ref, target_repo,
                target_ref, revisions, reviewers, title, description=None,
-               reviewer_data=None, translator=None):
+               description_renderer=None,
+               reviewer_data=None, translator=None, auth_user=None):
         translator = translator or get_current_request().translate
 
         created_by_user = self._get_user(created_by)
+        auth_user = auth_user or created_by_user.AuthUser()
         source_repo = self._get_repo(source_repo)
         target_repo = self._get_repo(target_repo)
 
@@ -459,6 +461,7 @@ class PullRequestModel(BaseModel):
         pull_request.revisions = revisions
         pull_request.title = title
         pull_request.description = description
+        pull_request.description_renderer = description_renderer
         pull_request.author = created_by_user
         pull_request.reviewer_data = reviewer_data
 
@@ -487,11 +490,12 @@ class PullRequestModel(BaseModel):
             rule_id = list(rules)[0] if rules else None
             rule = RepoReviewRule.get(rule_id) if rule_id else None
             if rule:
-                review_group = rule.user_group_vote_rule()
+                review_group = rule.user_group_vote_rule(user_id)
+                # we check if this particular reviewer is member of a voting group
                 if review_group:
                     # NOTE(marcink):
-                    # again, can be that user is member of more,
-                    # but we pick the first same, as default reviewers algo
+                    # can be that user is member of more but we pick the first same,
+                    # same as default reviewers algo
                     review_group = review_group[0]
 
                     rule_data = {
@@ -503,6 +507,8 @@ class PullRequestModel(BaseModel):
                             review_group.users_group.users_group_name,
                         'rule_user_group_members':
                             [x.user.username for x in review_group.users_group.members],
+                        'rule_user_group_members_id':
+                            [x.user.user_id for x in review_group.users_group.members],
                     }
                     # e.g {'vote_rule': -1, 'mandatory': True}
                     rule_data.update(review_group.rule_data())
@@ -528,7 +534,7 @@ class PullRequestModel(BaseModel):
 
         # prepare workspace, and run initial merge simulation
         MergeCheck.validate(
-            pull_request, user=created_by_user, translator=translator)
+            pull_request, auth_user=auth_user, translator=translator)
 
         self.notify_reviewers(pull_request, reviewer_ids)
         self._trigger_pull_request_hook(
@@ -537,7 +543,7 @@ class PullRequestModel(BaseModel):
         creation_data = pull_request.get_api_data(with_merge_state=False)
         self._log_audit_action(
             'repo.pull_request.create', {'data': creation_data},
-            created_by_user, pull_request)
+            auth_user, pull_request)
 
         return pull_request
 
@@ -582,7 +588,7 @@ class PullRequestModel(BaseModel):
 
         return commit_ids
 
-    def merge(self, pull_request, user, extras):
+    def merge_repo(self, pull_request, user, extras):
         log.debug("Merging pull request %s", pull_request.pull_request_id)
         merge_state = self._merge_pull_request(pull_request, user, extras)
         if merge_state.executed:
@@ -615,11 +621,13 @@ class PullRequestModel(BaseModel):
             }
 
         workspace_id = self._workspace_id(pull_request)
+        repo_id = pull_request.target_repo.repo_id
         use_rebase = self._use_rebase_for_merging(pull_request)
         close_branch = self._close_branch_before_merging(pull_request)
 
         callback_daemon, extras = prepare_callback_daemon(
             extras, protocol=vcs_settings.HOOKS_PROTOCOL,
+            host=vcs_settings.HOOKS_HOST,
             use_direct_calls=vcs_settings.HOOKS_DIRECT_CALLS)
 
         with callback_daemon:
@@ -628,9 +636,10 @@ class PullRequestModel(BaseModel):
             target_vcs.config.set(
                 'rhodecode', 'RC_SCM_DATA', json.dumps(extras))
             merge_state = target_vcs.merge(
-                target_ref, source_vcs, pull_request.source_ref_parts,
-                workspace_id, user_name=user.username,
-                user_email=user.email, message=message, use_rebase=use_rebase,
+                repo_id, workspace_id, target_ref, source_vcs,
+                pull_request.source_ref_parts,
+                user_name=user.username, user_email=user.email,
+                message=message, use_rebase=use_rebase,
                 close_branch=close_branch)
         return merge_state
 
@@ -976,7 +985,7 @@ class PullRequestModel(BaseModel):
         renderer = RstTemplateRenderer()
         return renderer.render('pull_request_update.mako', **params)
 
-    def edit(self, pull_request, title, description, user):
+    def edit(self, pull_request, title, description, description_renderer, user):
         pull_request = self.__get_pull_request(pull_request)
         old_data = pull_request.get_api_data(with_merge_state=False)
         if pull_request.is_closed():
@@ -985,6 +994,7 @@ class PullRequestModel(BaseModel):
             pull_request.title = title
         pull_request.description = description
         pull_request.updated_on = datetime.datetime.now()
+        pull_request.description_renderer = description_renderer
         Session().add(pull_request)
         self._log_audit_action(
             'repo.pull_request.edit', {'old_data': old_data},
@@ -1218,7 +1228,8 @@ class PullRequestModel(BaseModel):
 
         return comment, status
 
-    def merge_status(self, pull_request, translator=None):
+    def merge_status(self, pull_request, translator=None,
+                     force_shadow_repo_refresh=False):
         _ = translator or get_current_request().translate
 
         if not self._is_merge_enabled(pull_request):
@@ -1232,7 +1243,9 @@ class PullRequestModel(BaseModel):
             return merge_possible, msg
 
         try:
-            resp = self._try_merge(pull_request)
+            resp = self._try_merge(
+                pull_request,
+                force_shadow_repo_refresh=force_shadow_repo_refresh)
             log.debug("Merge response: %s", resp)
             status = resp.possible, self.merge_status_message(
                 resp.failure_reason)
@@ -1269,13 +1282,13 @@ class PullRequestModel(BaseModel):
             'extensions', 'largefiles')
         return largefiles_ui and largefiles_ui[0].active
 
-    def _try_merge(self, pull_request):
+    def _try_merge(self, pull_request, force_shadow_repo_refresh=False):
         """
         Try to merge the pull request and return the merge status.
         """
         log.debug(
-            "Trying out if the pull request %s can be merged.",
-            pull_request.pull_request_id)
+            "Trying out if the pull request %s can be merged. Force_refresh=%s",
+            pull_request.pull_request_id, force_shadow_repo_refresh)
         target_vcs = pull_request.target_repo.scm_instance()
 
         # Refresh the target reference.
@@ -1292,7 +1305,8 @@ class PullRequestModel(BaseModel):
             log.debug("The target repository is locked.")
             merge_state = MergeResponse(
                 False, False, None, MergeFailureReason.TARGET_IS_LOCKED)
-        elif self._needs_merge_state_refresh(pull_request, target_ref):
+        elif force_shadow_repo_refresh or self._needs_merge_state_refresh(
+                pull_request, target_ref):
             log.debug("Refreshing the merge status of the repository.")
             merge_state = self._refresh_merge_state(
                 pull_request, target_vcs, target_ref)
@@ -1323,11 +1337,13 @@ class PullRequestModel(BaseModel):
     def _refresh_merge_state(self, pull_request, target_vcs, target_reference):
         workspace_id = self._workspace_id(pull_request)
         source_vcs = pull_request.source_repo.scm_instance()
+        repo_id = pull_request.target_repo.repo_id
         use_rebase = self._use_rebase_for_merging(pull_request)
         close_branch = self._close_branch_before_merging(pull_request)
         merge_state = target_vcs.merge(
+            repo_id, workspace_id,
             target_reference, source_vcs, pull_request.source_ref_parts,
-            workspace_id, dry_run=True, use_rebase=use_rebase,
+            dry_run=True, use_rebase=use_rebase,
             close_branch=close_branch)
 
         # Do not store the response if there was an unknown error.
@@ -1393,11 +1409,12 @@ class PullRequestModel(BaseModel):
 
     def _cleanup_merge_workspace(self, pull_request):
         # Merging related cleanup
+        repo_id = pull_request.target_repo.repo_id
         target_scm = pull_request.target_repo.scm_instance()
-        workspace_id = 'pr-%s' % pull_request.pull_request_id
+        workspace_id = self._workspace_id(pull_request)
 
         try:
-            target_scm.cleanup_merge_workspace(workspace_id)
+            target_scm.cleanup_merge_workspace(repo_id, workspace_id)
         except NotImplementedError:
             pass
 
@@ -1582,18 +1599,38 @@ class MergeCheck(object):
         )
 
     @classmethod
-    def validate(cls, pull_request, user, translator, fail_early=False):
+    def validate(cls, pull_request, auth_user, translator, fail_early=False,
+                 force_shadow_repo_refresh=False):
         _ = translator
         merge_check = cls()
 
         # permissions to merge
         user_allowed_to_merge = PullRequestModel().check_user_merge(
-            pull_request, user)
+            pull_request, auth_user)
         if not user_allowed_to_merge:
             log.debug("MergeCheck: cannot merge, approval is pending.")
 
-            msg = _('User `{}` not allowed to perform merge.').format(user.username)
-            merge_check.push_error('error', msg, cls.PERM_CHECK, user.username)
+            msg = _('User `{}` not allowed to perform merge.').format(auth_user.username)
+            merge_check.push_error('error', msg, cls.PERM_CHECK, auth_user.username)
+            if fail_early:
+                return merge_check
+
+        # permission to merge into the target branch
+        target_commit_id = pull_request.target_ref_parts.commit_id
+        if pull_request.target_ref_parts.type == 'branch':
+            branch_name = pull_request.target_ref_parts.name
+        else:
+            # for mercurial we can always figure out the branch from the commit
+            # in case of bookmark
+            target_commit = pull_request.target_repo.get_commit(target_commit_id)
+            branch_name = target_commit.branch
+
+        rule, branch_perm = auth_user.get_rule_and_branch_permission(
+            pull_request.target_repo.repo_name, branch_name)
+        if branch_perm and branch_perm == 'branch.none':
+            msg = _('Target branch `{}` changes rejected by rule {}.').format(
+                branch_name, rule)
+            merge_check.push_error('error', msg, cls.PERM_CHECK, auth_user.username)
             if fail_early:
                 return merge_check
 
@@ -1633,7 +1670,8 @@ class MergeCheck(object):
 
         # merge possible, here is the filesystem simulation + shadow repo
         merge_status, msg = PullRequestModel().merge_status(
-            pull_request, translator=translator)
+            pull_request, translator=translator,
+            force_shadow_repo_refresh=force_shadow_repo_refresh)
         merge_check.merge_possible = merge_status
         merge_check.merge_msg = msg
         if not merge_status:
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -92,13 +92,10 @@ class RepoModel(BaseModel):
         settings_model = VcsSettingsModel(sa=self.sa)
         return settings_model.get_repos_location()
 
-    def get(self, repo_id, cache=False):
+    def get(self, repo_id):
         repo = self.sa.query(Repository) \
             .filter(Repository.repo_id == repo_id)
 
-        if cache:
-            repo = repo.options(
-                FromCache("sql_cache_short", "get_repo_%s" % repo_id))
         return repo.scalar()
 
     def get_repo(self, repository):
@@ -547,14 +544,16 @@ class RepoModel(BaseModel):
                 # this updates also current one if found
                 self.grant_user_permission(
                     repo=repo, user=member_id, perm=perm)
-            else:  # set for user group
+            elif member_type == 'user_group':
                 # check if we have permissions to alter this usergroup
                 member_name = UserGroup.get(member_id).users_group_name
                 if not check_perms or HasUserGroupPermissionAny(
                         *req_perms)(member_name, user=cur_user):
                     self.grant_user_group_permission(
                         repo=repo, group_name=member_id, perm=perm)
-
+            else:
+                raise ValueError("member_type must be 'user' or 'user_group' "
+                                 "got {} instead".format(member_type))
             changes['updated'].append({'type': member_type, 'id': member_id,
                                        'name': member_name, 'new_perm': perm})
 
@@ -565,13 +564,17 @@ class RepoModel(BaseModel):
                 member_name = User.get(member_id).username
                 self.grant_user_permission(
                     repo=repo, user=member_id, perm=perm)
-            else:  # set for user group
+            elif member_type == 'user_group':
                 # check if we have permissions to alter this usergroup
                 member_name = UserGroup.get(member_id).users_group_name
                 if not check_perms or HasUserGroupPermissionAny(
                         *req_perms)(member_name, user=cur_user):
                     self.grant_user_group_permission(
                         repo=repo, group_name=member_id, perm=perm)
+            else:
+                raise ValueError("member_type must be 'user' or 'user_group' "
+                                 "got {} instead".format(member_type))
+
             changes['added'].append({'type': member_type, 'id': member_id,
                                      'name': member_name, 'new_perm': perm})
         # delete permissions
@@ -580,13 +583,16 @@ class RepoModel(BaseModel):
             if member_type == 'user':
                 member_name = User.get(member_id).username
                 self.revoke_user_permission(repo=repo, user=member_id)
-            else:  # set for user group
+            elif member_type == 'user_group':
                 # check if we have permissions to alter this usergroup
                 member_name = UserGroup.get(member_id).users_group_name
                 if not check_perms or HasUserGroupPermissionAny(
                         *req_perms)(member_name, user=cur_user):
                     self.revoke_user_group_permission(
                         repo=repo, group_name=member_id)
+            else:
+                raise ValueError("member_type must be 'user' or 'user_group' "
+                                 "got {} instead".format(member_type))
 
             changes['deleted'].append({'type': member_type, 'id': member_id,
                                        'name': member_name, 'new_perm': perm})
diff --git a/rhodecode/model/repo_group.py b/rhodecode/model/repo_group.py
--- a/rhodecode/model/repo_group.py
+++ b/rhodecode/model/repo_group.py
@@ -425,11 +425,14 @@ class RepoGroupModel(BaseModel):
                     member_name = User.get(member_id).username
                     # this updates also current one if found
                     _set_perm_user(obj, user=member_id, perm=perm)
-                else:  # set for user group
+                elif member_type == 'user_group':
                     member_name = UserGroup.get(member_id).users_group_name
                     if not check_perms or has_group_perm(member_name,
                                                          user=cur_user):
                         _set_perm_group(obj, users_group=member_id, perm=perm)
+                else:
+                    raise ValueError("member_type must be 'user' or 'user_group' "
+                                     "got {} instead".format(member_type))
 
                 changes['updated'].append(
                     {'change_obj': change_obj, 'type': member_type,
@@ -441,12 +444,15 @@ class RepoGroupModel(BaseModel):
                 if member_type == 'user':
                     member_name = User.get(member_id).username
                     _set_perm_user(obj, user=member_id, perm=perm)
-                else:  # set for user group
+                elif member_type == 'user_group':
                     # check if we have permissions to alter this usergroup
                     member_name = UserGroup.get(member_id).users_group_name
                     if not check_perms or has_group_perm(member_name,
                                                          user=cur_user):
                         _set_perm_group(obj, users_group=member_id, perm=perm)
+                else:
+                    raise ValueError("member_type must be 'user' or 'user_group' "
+                                     "got {} instead".format(member_type))
 
                 changes['added'].append(
                     {'change_obj': change_obj, 'type': member_type,
@@ -458,12 +464,15 @@ class RepoGroupModel(BaseModel):
                 if member_type == 'user':
                     member_name = User.get(member_id).username
                     _revoke_perm_user(obj, user=member_id)
-                else:  # set for user group
+                elif member_type == 'user_group':
                     # check if we have permissions to alter this usergroup
                     member_name = UserGroup.get(member_id).users_group_name
                     if not check_perms or has_group_perm(member_name,
                                                          user=cur_user):
                         _revoke_perm_group(obj, user_group=member_id)
+                else:
+                    raise ValueError("member_type must be 'user' or 'user_group' "
+                                     "got {} instead".format(member_type))
 
                 changes['deleted'].append(
                     {'change_obj': change_obj, 'type': member_type,
diff --git a/rhodecode/model/scm.py b/rhodecode/model/scm.py
--- a/rhodecode/model/scm.py
+++ b/rhodecode/model/scm.py
@@ -38,12 +38,12 @@ from rhodecode.lib.vcs import get_backen
 from rhodecode.lib.vcs.exceptions import RepositoryError, NodeNotChangedError
 from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.lib.vcs.backends.base import EmptyCommit
-from rhodecode.lib import helpers as h
+from rhodecode.lib import helpers as h, rc_cache
 from rhodecode.lib.auth import (
     HasRepoPermissionAny, HasRepoGroupPermissionAny,
     HasUserGroupPermissionAny)
 from rhodecode.lib.exceptions import NonRelativePathError, IMCCommitError
-from rhodecode.lib import hooks_utils, caches
+from rhodecode.lib import hooks_utils
 from rhodecode.lib.utils import (
     get_filesystem_repos, make_db_config)
 from rhodecode.lib.utils2 import (safe_str, safe_unicode)
@@ -267,16 +267,22 @@ class ScmModel(BaseModel):
         :param repo_name: the repo_name for which caches should be marked
             invalid, or deleted
         :param delete: delete the entry keys instead of setting bool
-            flag on them
+            flag on them, and also purge caches used by the dogpile
         """
-        CacheKey.set_invalidate(repo_name, delete=delete)
         repo = Repository.get_by_repo_name(repo_name)
 
         if repo:
+            invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+                repo_id=repo.repo_id)
+            CacheKey.set_invalidate(invalidation_namespace, delete=delete)
+
+            repo_id = repo.repo_id
             config = repo._config
             config.set('extensions', 'largefiles', '')
             repo.update_commit_cache(config=config, cs_cache=None)
-            caches.clear_repo_caches(repo_name)
+            if delete:
+                cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
+                rc_cache.clear_cache_namespace('cache_repo', cache_namespace_uid)
 
     def toggle_following_repo(self, follow_repo_id, user_id):
 
diff --git a/rhodecode/model/settings.py b/rhodecode/model/settings.py
--- a/rhodecode/model/settings.py
+++ b/rhodecode/model/settings.py
@@ -25,13 +25,13 @@ from collections import namedtuple
 from functools import wraps
 import bleach
 
-from rhodecode.lib import caches
+from rhodecode.lib import rc_cache
 from rhodecode.lib.utils2 import (
     Optional, AttributeDict, safe_str, remove_prefix, str2bool)
 from rhodecode.lib.vcs.backends import base
 from rhodecode.model import BaseModel
 from rhodecode.model.db import (
-    RepoRhodeCodeUi, RepoRhodeCodeSetting, RhodeCodeUi, RhodeCodeSetting)
+    RepoRhodeCodeUi, RepoRhodeCodeSetting, RhodeCodeUi, RhodeCodeSetting, CacheKey)
 from rhodecode.model.meta import Session
 
 
@@ -206,13 +206,15 @@ class SettingsModel(BaseModel):
         return res
 
     def invalidate_settings_cache(self):
-        namespace = 'rhodecode_settings'
-        cache_manager = caches.get_cache_manager('sql_cache_short', namespace)
-        caches.clear_cache_manager(cache_manager)
+        invalidation_namespace = CacheKey.SETTINGS_INVALIDATION_NAMESPACE
+        CacheKey.set_invalidate(invalidation_namespace)
 
     def get_all_settings(self, cache=False):
+        region = rc_cache.get_or_create_region('sql_cache_short')
+        invalidation_namespace = CacheKey.SETTINGS_INVALIDATION_NAMESPACE
 
-        def _compute():
+        @region.conditional_cache_on_arguments(condition=cache)
+        def _get_all_settings(name, key):
             q = self._get_settings_query()
             if not q:
                 raise Exception('Could not get application settings !')
@@ -223,20 +225,27 @@ class SettingsModel(BaseModel):
             }
             return settings
 
-        if cache:
-            log.debug('Fetching app settings using cache')
-            repo = self._get_repo(self.repo) if self.repo else None
-            namespace = 'rhodecode_settings'
-            cache_manager = caches.get_cache_manager(
-                'sql_cache_short', namespace)
-            _cache_key = (
-                "get_repo_{}_settings".format(repo.repo_id)
-                if repo else "get_app_settings")
+        repo = self._get_repo(self.repo) if self.repo else None
+        key = "settings_repo.{}".format(repo.repo_id) if repo else "settings_app"
 
-            return cache_manager.get(_cache_key, createfunc=_compute)
+        inv_context_manager = rc_cache.InvalidationContext(
+            uid='cache_settings', invalidation_namespace=invalidation_namespace)
+        with inv_context_manager as invalidation_context:
+            # check for stored invalidation signal, and maybe purge the cache
+            # before computing it again
+            if invalidation_context.should_invalidate():
+                # NOTE:(marcink) we flush the whole sql_cache_short region, because it
+                # reads different settings etc. It's little too much but those caches
+                # are anyway very short lived and it's a safest way.
+                region = rc_cache.get_or_create_region('sql_cache_short')
+                region.invalidate()
 
-        else:
-            return _compute()
+            result = _get_all_settings('rhodecode_settings', key)
+            log.debug(
+                'Fetching app settings for key: %s took: %.3fs', key,
+                inv_context_manager.compute_time)
+
+        return result
 
     def get_auth_settings(self):
         q = self._get_settings_query()
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -377,9 +377,11 @@ class UserModel(BaseModel):
 
             if not edit:
                 # add the RSS token
-                AuthTokenModel().create(username,
-                                        description=u'Generated feed token',
-                                        role=AuthTokenModel.cls.ROLE_FEED)
+                self.add_auth_token(
+                    user=username, lifetime_minutes=-1,
+                    role=self.auth_token_role.ROLE_FEED,
+                    description=u'Generated feed token')
+
                 kwargs = new_user.get_dict()
                 # backward compat, require api_keys present
                 kwargs['api_keys'] = kwargs['auth_tokens']
@@ -830,6 +832,26 @@ class UserModel(BaseModel):
         self.sa.add(obj)
         return obj
 
+    auth_token_role = AuthTokenModel.cls
+
+    def add_auth_token(self, user, lifetime_minutes, role, description=u'',
+                       scope_callback=None):
+        """
+        Add AuthToken for user.
+
+        :param user: username/user_id
+        :param lifetime_minutes: in minutes the lifetime for token, -1 equals no limit
+        :param role: one of AuthTokenModel.cls.ROLE_*
+        :param description: optional string description
+        """
+
+        token = AuthTokenModel().create(
+            user, description, lifetime_minutes, role)
+        if scope_callback and callable(scope_callback):
+            # call the callback if we provide, used to attach scope for EE edition
+            scope_callback(token)
+        return token
+
     def delete_extra_ip(self, user, ip_id):
         """
         Removes ip address from UserIpMap
@@ -891,7 +913,7 @@ class UserModel(BaseModel):
         This way we block only latest created accounts.
 
         :param expected_users: list of users in special order, we deactivate
-            the end N ammoun of users from that list
+            the end N amount of users from that list
         """
 
         list_of_accounts = self.get_accounts_in_creation_order(
diff --git a/rhodecode/model/user_group.py b/rhodecode/model/user_group.py
--- a/rhodecode/model/user_group.py
+++ b/rhodecode/model/user_group.py
@@ -90,13 +90,16 @@ class UserGroupModel(BaseModel):
                 self.grant_user_permission(
                     user_group=user_group, user=member_id, perm=perm
                 )
-            else:
+            elif member_type == 'user_group':
                 # check if we have permissions to alter this usergroup
                 member_name = UserGroup.get(member_id).users_group_name
                 if not check_perms or HasUserGroupPermissionAny(
                         *req_perms)(member_name, user=cur_user):
                     self.grant_user_group_permission(
                         target_user_group=user_group, user_group=member_id, perm=perm)
+            else:
+                raise ValueError("member_type must be 'user' or 'user_group' "
+                                 "got {} instead".format(member_type))
 
             changes['updated'].append({
                 'change_obj': change_obj,
@@ -110,13 +113,16 @@ class UserGroupModel(BaseModel):
                 member_name = User.get(member_id).username
                 self.grant_user_permission(
                     user_group=user_group, user=member_id, perm=perm)
-            else:
+            elif member_type == 'user_group':
                 # check if we have permissions to alter this usergroup
                 member_name = UserGroup.get(member_id).users_group_name
                 if not check_perms or HasUserGroupPermissionAny(
                         *req_perms)(member_name, user=cur_user):
                     self.grant_user_group_permission(
                         target_user_group=user_group, user_group=member_id, perm=perm)
+            else:
+                raise ValueError("member_type must be 'user' or 'user_group' "
+                                 "got {} instead".format(member_type))
 
             changes['added'].append({
                 'change_obj': change_obj,
@@ -129,13 +135,16 @@ class UserGroupModel(BaseModel):
             if member_type == 'user':
                 member_name = User.get(member_id).username
                 self.revoke_user_permission(user_group=user_group, user=member_id)
-            else:
+            elif member_type == 'user_group':
                 # check if we have permissions to alter this usergroup
                 member_name = UserGroup.get(member_id).users_group_name
                 if not check_perms or HasUserGroupPermissionAny(
                         *req_perms)(member_name, user=cur_user):
                     self.revoke_user_group_permission(
                         target_user_group=user_group, user_group=member_id)
+            else:
+                raise ValueError("member_type must be 'user' or 'user_group' "
+                                 "got {} instead".format(member_type))
 
             changes['deleted'].append({
                 'change_obj': change_obj,
@@ -733,7 +742,7 @@ class UserGroupModel(BaseModel):
 
         data = {
             'users_group_id': user_group.users_group_id,
-            'group_name': user_group.users_group_name,
+            'group_name': h.link_to_group(user_group.users_group_name),
             'group_description': user_group.user_group_description,
             'active': user_group.users_group_active,
             "owner": user_group.user.username,
diff --git a/rhodecode/model/validation_schema/schemas/integration_schema.py b/rhodecode/model/validation_schema/schemas/integration_schema.py
--- a/rhodecode/model/validation_schema/schemas/integration_schema.py
+++ b/rhodecode/model/validation_schema/schemas/integration_schema.py
@@ -123,8 +123,6 @@ class IntegrationScopeType(colander.Sche
             else:
                 return 'global'
 
-        raise colander.Invalid(node, '%r is not a valid scope' % appstruct)
-
     def deserialize(self, node, cstruct):
         if cstruct is colander.null:
             return colander.null
diff --git a/rhodecode/model/validators.py b/rhodecode/model/validators.py
--- a/rhodecode/model/validators.py
+++ b/rhodecode/model/validators.py
@@ -797,7 +797,7 @@ def ValidPerms(localizer, type_='repo'):
                     obj_type = k[0]
                     obj_id = k[7:]
                     update_type = {'u': 'user',
-                                   'g': 'users_group'}[obj_type]
+                                   'g': 'user_group'}[obj_type]
 
                     if obj_type == 'u' and safe_int(obj_id) == default_user_id:
                         if str2bool(value.get('repo_private')):
@@ -827,7 +827,7 @@ def ValidPerms(localizer, type_='repo'):
                         User.query()\
                             .filter(User.active == true())\
                             .filter(User.user_id == member_id).one()
-                    if member_type == 'users_group':
+                    if member_type == 'user_group':
                         UserGroup.query()\
                             .filter(UserGroup.users_group_active == true())\
                             .filter(UserGroup.users_group_id == member_id)\
diff --git a/rhodecode/public/css/main-content.less b/rhodecode/public/css/main-content.less
--- a/rhodecode/public/css/main-content.less
+++ b/rhodecode/public/css/main-content.less
@@ -77,6 +77,13 @@
     min-width: 100%;
 }
 
+.main-content-auto-width {
+    .main-content;
+    width: auto;
+    min-width: 100%;
+    max-width: inherit;
+}
+
 .field {
     clear: left;
     margin-bottom: @padding;
@@ -109,6 +116,11 @@
             .label;
             padding-top: 5px;
         }
+        .label-branch-perm {
+            .label;
+            width: 115px;
+        }
+
         // Used to position content on the right side of a .label
         .content,
         .side-by-side-selector {
@@ -128,6 +140,15 @@
             }
         }
 
+        .input-branch-perm {
+            .input;
+            margin-left: 140px;
+        }
+
+        .input-branch-perm-order {
+            width: 40px;
+        }
+
         .checkboxes,
         .input,
         .select {
@@ -162,6 +183,9 @@
         }
 
         .input {
+            .branch-perm {
+                width: 80px;
+            }
             .medium {
                 width: @fields-input-m;
             }
diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -462,7 +462,7 @@ ul.auth_plugins {
 
     .radios {
         position: relative;
-        width: 405px;
+        width: 505px;
     }
 }
 
@@ -1418,9 +1418,6 @@ table.integrations {
     margin-top: @textmargin;
     margin-bottom: @textmargin;
 }
-.pr-description {
-    white-space:pre-wrap;
-}
 
 .pr-reviewer-rules {
    padding: 10px 0px 20px 0px;
@@ -2405,3 +2402,65 @@ input[type=radio] {
   height: 16px;
   width: 16px;
 }
+
+
+.markup-form .clearfix {
+    .border-radius(@border-radius);
+    margin: 0px;
+}
+
+.markup-form-area {
+    padding: 8px 12px;
+    border: 1px solid @grey4;
+    .border-radius(@border-radius);
+}
+
+.markup-form-area-header .nav-links {
+    display: flex;
+    flex-flow: row wrap;
+    -webkit-flex-flow: row wrap;
+    width: 100%;
+}
+
+.markup-form-area-footer {
+    display: flex;
+}
+
+.markup-form-area-footer .toolbar {
+
+}
+
+// markup Form
+div.markup-form {
+    margin-top: 20px;
+}
+
+.markup-form strong {
+    display: block;
+    margin-bottom: 15px;
+}
+
+.markup-form textarea {
+    width: 100%;
+    height: 100px;
+    font-family: 'Monaco', 'Courier', 'Courier New', monospace;
+}
+
+form.markup-form {
+    margin-top: 10px;
+    margin-left: 10px;
+}
+
+.markup-form .comment-block-ta,
+.markup-form .preview-box {
+    .border-radius(@border-radius);
+    .box-sizing(border-box);
+    background-color: white;
+}
+
+.markup-form .preview-box.unloaded {
+    height: 50px;
+    text-align: center;
+    padding: 20px;
+    background-color: white;
+}
diff --git a/rhodecode/public/css/navigation.less b/rhodecode/public/css/navigation.less
--- a/rhodecode/public/css/navigation.less
+++ b/rhodecode/public/css/navigation.less
@@ -281,11 +281,9 @@
 }
 
 .navigation li.open {
-
-   .submenu,
-   .repo_switcher {
-       display: block;
-   }
+    .submenu {
+        display: block;
+    }
 }
 
 .navigation li:last-child .submenu {
@@ -411,6 +409,7 @@
                 display: block;
                 height: 16px;
                 padding: 8px; //must add up to td height (28px)
+                width: 120px; // set width
 
                 &:hover {
                     background-color: @grey5;
@@ -642,3 +641,56 @@ ul#context-pages {
 
     }
 }
+
+.main_filter_help_box {
+    padding: 7px 7px;
+    border-top: 1px solid @grey4;
+    border-right: 1px solid @grey4;
+    border-bottom: 1px solid @grey4;
+    display: inline-block;
+    vertical-align: top;
+    margin-left: -5px;
+    background: @grey3;
+}
+
+.main_filter_input_box {
+    display: inline-block;
+}
+
+.main_filter_box {
+    margin: 9px 0 0 0;
+}
+
+#main_filter_help {
+    background: @grey3;
+    border: 1px solid black;
+    position: absolute;
+    white-space: pre-wrap;
+    z-index: 9999;
+    color: @nav-grey;
+    margin: 1px 7px;
+    padding: 0 2px;
+}
+
+.main_filter_input {
+    padding: 6px;
+    min-width: 220px;
+    color: @nav-grey;
+    background: @grey3;
+}
+
+.main_filter_input::placeholder {
+   color: @nav-grey;
+   opacity: 1;
+}
+
+.notice-box {
+    display:block !important;
+    padding: 9px 0 !important;
+}
+
+.menulabel-notice {
+    border: 1px solid @color5;
+    padding:7px 10px;
+    color: @color5;
+}
diff --git a/rhodecode/public/css/rcicons.less b/rhodecode/public/css/rcicons.less
--- a/rhodecode/public/css/rcicons.less
+++ b/rhodecode/public/css/rcicons.less
@@ -55,6 +55,10 @@
   /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
 
+.icon-no-margin::before {
+    margin: 0;
+
+}
 // -- ICON CLASSES -- //
 
 .icon-bookmark:before { content: '\e803'; } /* '' */
@@ -155,3 +159,9 @@
         &:extend(.icon-svn-transparent:before);
     }
 }
+
+.icon-user-group:before {
+  &:extend(.icon-group:before);
+  margin: 0;
+  font-size: 16px;
+}
diff --git a/rhodecode/public/css/select2.less b/rhodecode/public/css/select2.less
--- a/rhodecode/public/css/select2.less
+++ b/rhodecode/public/css/select2.less
@@ -154,8 +154,8 @@ select.select2{height:28px;visibility:hi
 }
 
 .select2-search input {
-    width: auto !important;
-    margin: .5em;
+    width: 100%;
+    margin: .5em 0;
     padding: .5em;
 }
 
diff --git a/rhodecode/public/css/tags.less b/rhodecode/public/css/tags.less
--- a/rhodecode/public/css/tags.less
+++ b/rhodecode/public/css/tags.less
@@ -109,13 +109,21 @@
     &.read {
         &:extend(.tag1);
     }
-
     &.write {
         &:extend(.tag4);
     }
     &.admin {
         &:extend(.tag5);
     }
+    &.merge {
+        &:extend(.tag1);
+    }
+    &.push {
+        &:extend(.tag4);
+    }
+    &.push_force {
+        &:extend(.tag5);
+    }
 }
 
 .phase-draft {
diff --git a/rhodecode/public/css/type.less b/rhodecode/public/css/type.less
--- a/rhodecode/public/css/type.less
+++ b/rhodecode/public/css/type.less
@@ -228,7 +228,7 @@ mark,
     clear: both;
     float: left;
     width: 100%;
-    margin: @pagepadding 0 @pagepadding;
+    margin: @pagepadding/2 0 @pagepadding;
 
     .breadcrumbs{
         float: left;
diff --git a/rhodecode/public/images/ee_features/admin_branch_permissions.png b/rhodecode/public/images/ee_features/admin_branch_permissions.png
new file mode 100644
index 0000000000000000000000000000000000000000..b51e3c993c58bc95ed489d9df33945c40bbfeaac
GIT binary patch
literal 33196
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

diff --git a/rhodecode/public/images/ee_features/repo_branch_permissions.png b/rhodecode/public/images/ee_features/repo_branch_permissions.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fde18b97a32d45812f213a2710a934881cba5af
GIT binary patch
literal 87555
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
SZTxxx|51`tmo0r}9`aw9h8O_=

diff --git a/rhodecode/public/js/rhodecode/base/keyboard-bindings.js b/rhodecode/public/js/rhodecode/base/keyboard-bindings.js
--- a/rhodecode/public/js/rhodecode/base/keyboard-bindings.js
+++ b/rhodecode/public/js/rhodecode/base/keyboard-bindings.js
@@ -20,7 +20,7 @@ function setRCMouseBindings(repoName, re
 
     // / open the quick filter
     Mousetrap.bind(['/'], function(e) {
-        $('#repo_switcher').select2('open');
+        $('#main_filter').get(0).focus();
 
         // return false to prevent default browser behavior
         // and stop event from bubbling
diff --git a/rhodecode/public/js/rhodecode/i18n/be.js b/rhodecode/public/js/rhodecode/i18n/be.js
--- a/rhodecode/public/js/rhodecode/i18n/be.js
+++ b/rhodecode/public/js/rhodecode/i18n/be.js
@@ -96,6 +96,8 @@ var _TM = {
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
+    '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+    '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
@@ -111,6 +113,8 @@ var _TM = {
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
+    '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+    '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
diff --git a/rhodecode/public/js/rhodecode/i18n/de.js b/rhodecode/public/js/rhodecode/i18n/de.js
--- a/rhodecode/public/js/rhodecode/i18n/de.js
+++ b/rhodecode/public/js/rhodecode/i18n/de.js
@@ -96,6 +96,8 @@ var _TM = {
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
+    '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+    '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
@@ -111,6 +113,8 @@ var _TM = {
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
+    '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+    '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
diff --git a/rhodecode/public/js/rhodecode/i18n/en.js b/rhodecode/public/js/rhodecode/i18n/en.js
--- a/rhodecode/public/js/rhodecode/i18n/en.js
+++ b/rhodecode/public/js/rhodecode/i18n/en.js
@@ -96,6 +96,8 @@ var _TM = {
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
+    '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+    '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
@@ -111,6 +113,8 @@ var _TM = {
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
+    '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+    '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
diff --git a/rhodecode/public/js/rhodecode/i18n/es.js b/rhodecode/public/js/rhodecode/i18n/es.js
--- a/rhodecode/public/js/rhodecode/i18n/es.js
+++ b/rhodecode/public/js/rhodecode/i18n/es.js
@@ -96,6 +96,8 @@ var _TM = {
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
+    '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+    '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
@@ -111,6 +113,8 @@ var _TM = {
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
+    '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+    '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
diff --git a/rhodecode/public/js/rhodecode/i18n/fr.js b/rhodecode/public/js/rhodecode/i18n/fr.js
--- a/rhodecode/public/js/rhodecode/i18n/fr.js
+++ b/rhodecode/public/js/rhodecode/i18n/fr.js
@@ -96,6 +96,8 @@ var _TM = {
     'specify commit': 'Spécifier un commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
+    '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+    '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
@@ -111,6 +113,8 @@ var _TM = {
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
+    '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+    '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} années',
     '{0}, {1} ago': '{0}, {1} ago'
diff --git a/rhodecode/public/js/rhodecode/i18n/it.js b/rhodecode/public/js/rhodecode/i18n/it.js
--- a/rhodecode/public/js/rhodecode/i18n/it.js
+++ b/rhodecode/public/js/rhodecode/i18n/it.js
@@ -96,6 +96,8 @@ var _TM = {
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
+    '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+    '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
@@ -111,6 +113,8 @@ var _TM = {
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
+    '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+    '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
diff --git a/rhodecode/public/js/rhodecode/i18n/ja.js b/rhodecode/public/js/rhodecode/i18n/ja.js
--- a/rhodecode/public/js/rhodecode/i18n/ja.js
+++ b/rhodecode/public/js/rhodecode/i18n/ja.js
@@ -96,6 +96,8 @@ var _TM = {
     'specify commit': 'specify commit',
     'truncated result': '省略された結果',
     'truncated results': '省略された結果',
+    '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+    '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} 前',
     '{0} and {1}': '{0} and {1}',
@@ -111,6 +113,8 @@ var _TM = {
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} 件の結果があります。矢印キーの上下で選択できます。',
     '{0} sec': '{0} 秒',
+    '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+    '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} 年',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
diff --git a/rhodecode/public/js/rhodecode/i18n/js_translations.js b/rhodecode/public/js/rhodecode/i18n/js_translations.js
--- a/rhodecode/public/js/rhodecode/i18n/js_translations.js
+++ b/rhodecode/public/js/rhodecode/i18n/js_translations.js
@@ -90,6 +90,8 @@
 _gettext('specify commit');
 _gettext('truncated result');
 _gettext('truncated results');
+_gettext('{0} ({1} inactive) of {2} user groups ({3} inactive)');
+_gettext('{0} ({1} inactive) of {2} users ({3} inactive)');
 _gettext('{0} active out of {1} users');
 _gettext('{0} ago');
 _gettext('{0} and {1}');
@@ -105,6 +107,8 @@
 _gettext('{0} out of {1} users');
 _gettext('{0} results are available, use up and down arrow keys to navigate.');
 _gettext('{0} sec');
+_gettext('{0} user groups ({1} inactive)');
+_gettext('{0} users ({1} inactive)');
 _gettext('{0} year');
 _gettext('{0} years');
 _gettext('{0}, {1} ago');
diff --git a/rhodecode/public/js/rhodecode/i18n/pl.js b/rhodecode/public/js/rhodecode/i18n/pl.js
--- a/rhodecode/public/js/rhodecode/i18n/pl.js
+++ b/rhodecode/public/js/rhodecode/i18n/pl.js
@@ -96,6 +96,8 @@ var _TM = {
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
+    '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+    '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} aktywnych z {1} użytkowników',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
@@ -111,6 +113,8 @@ var _TM = {
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
+    '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+    '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
diff --git a/rhodecode/public/js/rhodecode/i18n/pt.js b/rhodecode/public/js/rhodecode/i18n/pt.js
--- a/rhodecode/public/js/rhodecode/i18n/pt.js
+++ b/rhodecode/public/js/rhodecode/i18n/pt.js
@@ -96,6 +96,8 @@ var _TM = {
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
+    '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+    '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
@@ -111,6 +113,8 @@ var _TM = {
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
+    '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+    '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
diff --git a/rhodecode/public/js/rhodecode/i18n/ru.js b/rhodecode/public/js/rhodecode/i18n/ru.js
--- a/rhodecode/public/js/rhodecode/i18n/ru.js
+++ b/rhodecode/public/js/rhodecode/i18n/ru.js
@@ -96,6 +96,8 @@ var _TM = {
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
+    '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+    '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
@@ -111,6 +113,8 @@ var _TM = {
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
+    '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+    '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
diff --git a/rhodecode/public/js/rhodecode/i18n/zh.js b/rhodecode/public/js/rhodecode/i18n/zh.js
--- a/rhodecode/public/js/rhodecode/i18n/zh.js
+++ b/rhodecode/public/js/rhodecode/i18n/zh.js
@@ -96,6 +96,8 @@ var _TM = {
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
+    '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+    '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
@@ -111,6 +113,8 @@ var _TM = {
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
+    '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+    '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -45,6 +45,10 @@ function registerRCRoutes() {
     pyroutes.register('admin_settings_vcs_svn_generate_cfg', '/_admin/settings/vcs/svn_generate_cfg', []);
     pyroutes.register('admin_settings_system', '/_admin/settings/system', []);
     pyroutes.register('admin_settings_system_update', '/_admin/settings/system/updates', []);
+    pyroutes.register('admin_settings_exception_tracker', '/_admin/settings/exceptions', []);
+    pyroutes.register('admin_settings_exception_tracker_delete_all', '/_admin/settings/exceptions/delete', []);
+    pyroutes.register('admin_settings_exception_tracker_show', '/_admin/settings/exceptions/%(exception_id)s', ['exception_id']);
+    pyroutes.register('admin_settings_exception_tracker_delete', '/_admin/settings/exceptions/%(exception_id)s/delete', ['exception_id']);
     pyroutes.register('admin_settings_sessions', '/_admin/settings/sessions', []);
     pyroutes.register('admin_settings_sessions_cleanup', '/_admin/settings/sessions/cleanup', []);
     pyroutes.register('admin_settings_process_management', '/_admin/settings/process_management', []);
@@ -76,12 +80,14 @@ function registerRCRoutes() {
     pyroutes.register('admin_settings_search', '/_admin/settings/search', []);
     pyroutes.register('admin_settings_labs', '/_admin/settings/labs', []);
     pyroutes.register('admin_settings_labs_update', '/_admin/settings/labs/update', []);
+    pyroutes.register('admin_settings_automation', '/_admin/_admin/settings/automation', []);
     pyroutes.register('admin_permissions_application', '/_admin/permissions/application', []);
     pyroutes.register('admin_permissions_application_update', '/_admin/permissions/application/update', []);
     pyroutes.register('admin_permissions_global', '/_admin/permissions/global', []);
     pyroutes.register('admin_permissions_global_update', '/_admin/permissions/global/update', []);
     pyroutes.register('admin_permissions_object', '/_admin/permissions/object', []);
     pyroutes.register('admin_permissions_object_update', '/_admin/permissions/object/update', []);
+    pyroutes.register('admin_permissions_branch', '/_admin/permissions/branch', []);
     pyroutes.register('admin_permissions_ips', '/_admin/permissions/ips', []);
     pyroutes.register('admin_permissions_overview', '/_admin/permissions/overview', []);
     pyroutes.register('admin_permissions_auth_token_access', '/_admin/permissions/auth_token_access', []);
@@ -118,6 +124,8 @@ function registerRCRoutes() {
     pyroutes.register('edit_user_groups_management', '/_admin/users/%(user_id)s/edit/groups_management', ['user_id']);
     pyroutes.register('edit_user_groups_management_updates', '/_admin/users/%(user_id)s/edit/edit_user_groups_management/updates', ['user_id']);
     pyroutes.register('edit_user_audit_logs', '/_admin/users/%(user_id)s/edit/audit', ['user_id']);
+    pyroutes.register('edit_user_caches', '/_admin/users/%(user_id)s/edit/caches', ['user_id']);
+    pyroutes.register('edit_user_caches_update', '/_admin/users/%(user_id)s/edit/caches/update', ['user_id']);
     pyroutes.register('user_groups', '/_admin/user_groups', []);
     pyroutes.register('user_groups_data', '/_admin/user_groups_data', []);
     pyroutes.register('user_groups_new', '/_admin/user_groups/new', []);
@@ -141,6 +149,7 @@ function registerRCRoutes() {
     pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
     pyroutes.register('repo_list_data', '/_repos', []);
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
+    pyroutes.register('markup_preview', '/_markup_preview', []);
     pyroutes.register('journal', '/_admin/journal', []);
     pyroutes.register('journal_rss', '/_admin/journal/rss', []);
     pyroutes.register('journal_atom', '/_admin/journal/atom', []);
@@ -222,8 +231,11 @@ function registerRCRoutes() {
     pyroutes.register('edit_repo_advanced_locking', '/%(repo_name)s/settings/advanced/locking', ['repo_name']);
     pyroutes.register('edit_repo_advanced_journal', '/%(repo_name)s/settings/advanced/journal', ['repo_name']);
     pyroutes.register('edit_repo_advanced_fork', '/%(repo_name)s/settings/advanced/fork', ['repo_name']);
+    pyroutes.register('edit_repo_advanced_hooks', '/%(repo_name)s/settings/advanced/hooks', ['repo_name']);
     pyroutes.register('edit_repo_caches', '/%(repo_name)s/settings/caches', ['repo_name']);
     pyroutes.register('edit_repo_perms', '/%(repo_name)s/settings/permissions', ['repo_name']);
+    pyroutes.register('edit_repo_perms_branch', '/%(repo_name)s/settings/branch_permissions', ['repo_name']);
+    pyroutes.register('edit_repo_perms_branch_delete', '/%(repo_name)s/settings/branch_permissions/%(rule_id)s/delete', ['repo_name', 'rule_id']);
     pyroutes.register('edit_repo_maintenance', '/%(repo_name)s/settings/maintenance', ['repo_name']);
     pyroutes.register('edit_repo_maintenance_execute', '/%(repo_name)s/settings/maintenance/execute', ['repo_name']);
     pyroutes.register('edit_repo_fields', '/%(repo_name)s/settings/fields', ['repo_name']);
@@ -275,6 +287,7 @@ function registerRCRoutes() {
     pyroutes.register('search', '/_admin/search', []);
     pyroutes.register('search_repo', '/%(repo_name)s/search', ['repo_name']);
     pyroutes.register('user_profile', '/_profiles/%(username)s', ['username']);
+    pyroutes.register('user_group_profile', '/_profile_user_group/%(user_group_name)s', ['user_group_name']);
     pyroutes.register('my_account_profile', '/_admin/my_account/profile', []);
     pyroutes.register('my_account_edit', '/_admin/my_account/edit', []);
     pyroutes.register('my_account_update', '/_admin/my_account/update', []);
diff --git a/rhodecode/public/js/src/components/rhodecode-app/rhodecode-app.js b/rhodecode/public/js/src/components/rhodecode-app/rhodecode-app.js
--- a/rhodecode/public/js/src/components/rhodecode-app/rhodecode-app.js
+++ b/rhodecode/public/js/src/components/rhodecode-app/rhodecode-app.js
@@ -16,9 +16,25 @@ var rhodeCodeApp = Polymer({
         for (var i = 0; i < alertMessagePayloads.length; i++) {
             $.Topic('/notifications').publish(alertMessagePayloads[i]);
         }
-        this.kickoffChannelstreamPlugin();
+        this.initPlugins();
+        // after rest of application loads and topics get fired, launch connection
+        $(document).ready(function () {
+            this.kickoffChannelstreamPlugin();
+        }.bind(this));
     },
 
+    initPlugins: function(){
+        for (var i = 0; i < window.APPLICATION_PLUGINS.length; i++) {
+            var pluginDef = window.APPLICATION_PLUGINS[i];
+            if (pluginDef.component){
+                var pluginElem = document.createElement(pluginDef.component);
+                this.shadowRoot.appendChild(pluginElem);
+                if (typeof pluginElem.init !== 'undefined'){
+                    pluginElem.init();
+                }
+            }
+        }
+    },
     /** proxy to channelstream connection */
     getChannelStreamConnection: function () {
         return this.$['channelstream-connection'];
@@ -33,7 +49,7 @@ var rhodeCodeApp = Polymer({
     },
 
     faviconUpdate: function (data) {
-        this.$$('rhodecode-favicon').counter = data.count;
+        this.shadowRoot.querySelector('rhodecode-favicon').counter = data.count;
     },
 
     /** opens connection to ws server */
diff --git a/rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.html b/rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.html
--- a/rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.html
+++ b/rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.html
@@ -1,5 +1,4 @@
 <link rel="import" href="../../../../../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../../../../../bower_components/paper-toast/paper-toast.html">
 <link rel="import" href="../../../../../../bower_components/iron-a11y-keys-behavior/iron-a11y-keys-behavior.html">
 <link rel="import" href="../rhodecode-unsafe-html/rhodecode-unsafe-html.html">
 <dom-module id="rhodecode-toast">
diff --git a/rhodecode/public/js/src/components/rhodecode-unsafe-html/rhodecode-unsafe-html.html b/rhodecode/public/js/src/components/rhodecode-unsafe-html/rhodecode-unsafe-html.html
--- a/rhodecode/public/js/src/components/rhodecode-unsafe-html/rhodecode-unsafe-html.html
+++ b/rhodecode/public/js/src/components/rhodecode-unsafe-html/rhodecode-unsafe-html.html
@@ -3,7 +3,7 @@
 <dom-module id="rhodecode-unsafe-html">
     <template>
         <style include="shared-styles"></style>
-        <content></content>
+        <slot></slot>
     </template>
     <script src="rhodecode-unsafe-html.js"></script>
 </dom-module>
diff --git a/rhodecode/public/js/src/rhodecode.js b/rhodecode/public/js/src/rhodecode.js
--- a/rhodecode/public/js/src/rhodecode.js
+++ b/rhodecode/public/js/src/rhodecode.js
@@ -216,7 +216,7 @@ var clipboardActivate = function() {
     *
     * <i class="tooltip icon-plus clipboard-action" data-clipboard-text="${commit.raw_id}" title="${_('Copy the full commit id')}"></i>
     * */
-    var clipboard = new Clipboard('.clipboard-action');
+    var clipboard = new ClipboardJS('.clipboard-action');
 
     clipboard.on('success', function(e) {
         var callback = function () {
diff --git a/rhodecode/public/js/src/rhodecode/codemirror.js b/rhodecode/public/js/src/rhodecode/codemirror.js
--- a/rhodecode/public/js/src/rhodecode/codemirror.js
+++ b/rhodecode/public/js/src/rhodecode/codemirror.js
@@ -231,6 +231,68 @@ var initCodeMirror = function(textAreadI
   return myCodeMirror;
 };
 
+
+var initMarkupCodeMirror = function(textAreadId, focus, options) {
+  var initialHeight = 100;
+
+  var ta = $(textAreadId).get(0);
+  if (focus === undefined) {
+      focus = true;
+  }
+
+  // default options
+  var codeMirrorOptions = {
+    lineNumbers: false,
+    indentUnit: 4,
+    viewportMargin: 30,
+    // this is a trick to trigger some logic behind codemirror placeholder
+    // it influences styling and behaviour.
+    placeholder: " ",
+    lineWrapping: true,
+    autofocus: focus
+  };
+
+  if (options !== undefined) {
+    // extend with custom options
+    codeMirrorOptions = $.extend(true, codeMirrorOptions, options);
+  }
+
+  var cm = CodeMirror.fromTextArea(ta, codeMirrorOptions);
+  cm.setSize(null, initialHeight);
+  cm.setOption("mode", DEFAULT_RENDERER);
+  CodeMirror.autoLoadMode(cm, DEFAULT_RENDERER); // load rst or markdown mode
+  cmLog.debug('Loading codemirror mode', DEFAULT_RENDERER);
+
+  // start listening on changes to make auto-expanded editor
+  cm.on("change", function(instance, changeObj) {
+    var height = initialHeight;
+    var lines = instance.lineCount();
+    if ( lines > 6 && lines < 20) {
+      height = "auto";
+    }
+    else if (lines >= 20){
+      zheight = 20*15;
+    }
+    instance.setSize(null, height);
+
+    // detect if the change was trigger by auto desc, or user input
+    var changeOrigin = changeObj.origin;
+
+    if (changeOrigin === "setValue") {
+        cmLog.debug('Change triggered by setValue');
+    }
+    else {
+        cmLog.debug('user triggered change !');
+        // set special marker to indicate user has created an input.
+        instance._userDefinedValue = true;
+    }
+
+  });
+
+  return cm;
+};
+
+
 var initCommentBoxCodeMirror = function(CommentForm, textAreaId, triggerActions){
   var initialHeight = 100;
 
@@ -593,3 +655,196 @@ var CodeMirrorPreviewEnable = function(e
     }
   }
 };
+
+
+ /* markup form */
+(function(mod) {
+
+    if (typeof exports == "object" && typeof module == "object") {
+        // CommonJS
+        module.exports = mod();
+    }
+    else {
+        // Plain browser env
+        (this || window).MarkupForm = mod();
+    }
+
+})(function() {
+    "use strict";
+
+    function MarkupForm(textareaId) {
+        if (!(this instanceof MarkupForm)) {
+            return new MarkupForm(textareaId);
+        }
+
+        // bind the element instance to our Form
+        $('#' + textareaId).get(0).MarkupForm = this;
+
+        this.withSelectorId = function(selector) {
+            var selectorId = textareaId;
+            return selector + '_' + selectorId;
+        };
+
+        this.previewButton = this.withSelectorId('#preview-btn');
+        this.previewContainer = this.withSelectorId('#preview-container');
+
+        this.previewBoxSelector = this.withSelectorId('#preview-box');
+
+        this.editButton = this.withSelectorId('#edit-btn');
+        this.editContainer = this.withSelectorId('#edit-container');
+
+        this.cmBox = textareaId;
+        this.cm = initMarkupCodeMirror('#' + textareaId);
+
+        this.previewUrl = pyroutes.url('markup_preview');
+
+        // FUNCTIONS and helpers
+        var self = this;
+
+        this.getCmInstance = function(){
+            return this.cm
+        };
+
+        this.setPlaceholder = function(placeholder) {
+            var cm = this.getCmInstance();
+            if (cm){
+                cm.setOption('placeholder', placeholder);
+            }
+        };
+
+        this.initStatusChangeSelector = function(){
+            var formatChangeStatus = function(state, escapeMarkup) {
+                var originalOption = state.element;
+                return '<div class="flag_status ' + $(originalOption).data('status') + ' pull-left"></div>' +
+                       '<span>' + escapeMarkup(state.text) + '</span>';
+            };
+            var formatResult = function(result, container, query, escapeMarkup) {
+                return formatChangeStatus(result, escapeMarkup);
+            };
+
+            var formatSelection = function(data, container, escapeMarkup) {
+                return formatChangeStatus(data, escapeMarkup);
+            };
+
+            $(this.submitForm).find(this.statusChange).select2({
+                placeholder: _gettext('Status Review'),
+                formatResult: formatResult,
+                formatSelection: formatSelection,
+                containerCssClass: "drop-menu status_box_menu",
+                dropdownCssClass: "drop-menu-dropdown",
+                dropdownAutoWidth: true,
+                minimumResultsForSearch: -1
+            });
+            $(this.submitForm).find(this.statusChange).on('change', function() {
+                var status = self.getCommentStatus();
+
+                if (status && !self.isInline()) {
+                    $(self.submitButton).prop('disabled', false);
+                }
+
+                var placeholderText = _gettext('Comment text will be set automatically based on currently selected status ({0}) ...').format(status);
+                self.setPlaceholder(placeholderText)
+            })
+        };
+
+        // reset the text area into it's original state
+        this.resetMarkupFormState = function(content) {
+            content = content || '';
+
+            $(this.editContainer).show();
+            $(this.editButton).parent().addClass('active');
+
+            $(this.previewContainer).hide();
+            $(this.previewButton).parent().removeClass('active');
+
+            this.setActionButtonsDisabled(true);
+            self.cm.setValue(content);
+            self.cm.setOption("readOnly", false);
+        };
+
+        this.previewSuccessCallback = function(o) {
+            $(self.previewBoxSelector).html(o);
+            $(self.previewBoxSelector).removeClass('unloaded');
+
+            // swap buttons, making preview active
+            $(self.previewButton).parent().addClass('active');
+            $(self.editButton).parent().removeClass('active');
+
+            // unlock buttons
+            self.setActionButtonsDisabled(false);
+        };
+
+        this.setActionButtonsDisabled = function(state) {
+            $(this.editButton).prop('disabled', state);
+            $(this.previewButton).prop('disabled', state);
+        };
+
+        // lock preview/edit/submit buttons on load, but exclude cancel button
+        var excludeCancelBtn = true;
+        this.setActionButtonsDisabled(true);
+
+        // anonymous users don't have access to initialized CM instance
+        if (this.cm !== undefined){
+            this.cm.on('change', function(cMirror) {
+                if (cMirror.getValue() === "") {
+                    self.setActionButtonsDisabled(true)
+                } else {
+                    self.setActionButtonsDisabled(false)
+                }
+            });
+        }
+
+        $(this.editButton).on('click', function(e) {
+            e.preventDefault();
+
+            $(self.previewButton).parent().removeClass('active');
+            $(self.previewContainer).hide();
+
+            $(self.editButton).parent().addClass('active');
+            $(self.editContainer).show();
+
+        });
+
+        $(this.previewButton).on('click', function(e) {
+            e.preventDefault();
+            var text = self.cm.getValue();
+
+            if (text === "") {
+                return;
+            }
+
+            var postData = {
+                'text': text,
+                'renderer': templateContext.visual.default_renderer,
+                'csrf_token': CSRF_TOKEN
+            };
+
+            // lock ALL buttons on preview
+            self.setActionButtonsDisabled(true);
+
+            $(self.previewBoxSelector).addClass('unloaded');
+            $(self.previewBoxSelector).html(_gettext('Loading ...'));
+
+            $(self.editContainer).hide();
+            $(self.previewContainer).show();
+
+            // by default we reset state of comment preserving the text
+            var previewFailCallback = function(data){
+                alert(
+                "Error while submitting preview.\n" +
+                "Error code {0} ({1}).".format(data.status, data.statusText)
+                );
+                self.resetMarkupFormState(text)
+            };
+            _submitAjaxPOST(
+                self.previewUrl, postData, self.previewSuccessCallback,
+                previewFailCallback);
+
+            $(self.previewButton).parent().addClass('active');
+            $(self.editButton).parent().removeClass('active');
+        });
+
+    }
+
+    return MarkupForm;
+});
diff --git a/rhodecode/public/js/src/rhodecode/comments.js b/rhodecode/public/js/src/rhodecode/comments.js
--- a/rhodecode/public/js/src/rhodecode/comments.js
+++ b/rhodecode/public/js/src/rhodecode/comments.js
@@ -42,6 +42,29 @@ var bindToggleButtons = function() {
   });
 };
 
+
+
+var _submitAjaxPOST = function(url, postData, successHandler, failHandler) {
+    failHandler = failHandler || function() {};
+    postData = toQueryString(postData);
+    var request = $.ajax({
+        url: url,
+        type: 'POST',
+        data: postData,
+        headers: {'X-PARTIAL-XHR': true}
+    })
+    .done(function (data) {
+        successHandler(data);
+    })
+    .fail(function (data, textStatus, errorThrown) {
+        failHandler(data, textStatus, errorThrown)
+    });
+    return request;
+};
+
+
+
+
 /* Comment form for main and inline comments */
 (function(mod) {
 
@@ -259,24 +282,7 @@ var bindToggleButtons = function() {
         };
 
         this.submitAjaxPOST = function(url, postData, successHandler, failHandler) {
-            failHandler = failHandler || function() {};
-            var postData = toQueryString(postData);
-            var request = $.ajax({
-                    url: url,
-                    type: 'POST',
-                    data: postData,
-                    headers: {'X-PARTIAL-XHR': true}
-                })
-                .done(function(data) {
-                    successHandler(data);
-                })
-                .fail(function(data, textStatus, errorThrown){
-                    alert(
-                        "Error while submitting comment.\n" +
-                        "Error code {0} ({1}).".format(data.status, data.statusText));
-                    failHandler()
-                });
-            return request;
+            return _submitAjaxPOST(url, postData, successHandler, failHandler);
         };
 
         // overwrite a submitHandler, we need to do it for inline comments
@@ -340,7 +346,11 @@ var bindToggleButtons = function() {
                 self.globalSubmitSuccessCallback();
 
             };
-            var submitFailCallback = function(){
+            var submitFailCallback = function(data) {
+                alert(
+                "Error while submitting comment.\n" +
+                "Error code {0} ({1}).".format(data.status, data.statusText)
+                );
                 self.resetCommentFormState(text);
             };
             self.submitAjaxPOST(
@@ -436,7 +446,11 @@ var bindToggleButtons = function() {
             $(self.previewContainer).show();
 
             // by default we reset state of comment preserving the text
-            var previewFailCallback = function(){
+            var previewFailCallback = function(data){
+                alert(
+                "Error while preview of comment.\n" +
+                "Error code {0} ({1}).".format(data.status, data.statusText)
+                );
                 self.resetCommentFormState(text)
             };
             self.submitAjaxPOST(
@@ -763,7 +777,11 @@ var CommentsController = function() {
               commentForm.setActionButtonsDisabled(false);
 
             };
-            var submitFailCallback = function(){
+            var submitFailCallback = function(data){
+                alert(
+                "Error while submitting comment.\n" +
+                "Error code {0} ({1}).".format(data.status, data.statusText)
+                );
                 commentForm.resetCommentFormState(text)
             };
             commentForm.submitAjaxPOST(
diff --git a/rhodecode/public/js/src/rhodecode/permissions.js b/rhodecode/public/js/src/rhodecode/permissions.js
--- a/rhodecode/public/js/src/rhodecode/permissions.js
+++ b/rhodecode/public/js/src/rhodecode/permissions.js
@@ -32,6 +32,7 @@ var addNewPermInput = function(node, per
                 '    </div>'+
                 '</td>'+
                 '<td></td>'+
+                '<td></td>'+
                 '</tr>';
     var _next_id = 'new'+$('.new_members').length;
     _html = _html.format(_next_id, permission_type);
diff --git a/rhodecode/public/js/src/rhodecode/pullrequests.js b/rhodecode/public/js/src/rhodecode/pullrequests.js
--- a/rhodecode/public/js/src/rhodecode/pullrequests.js
+++ b/rhodecode/public/js/src/rhodecode/pullrequests.js
@@ -41,10 +41,10 @@ var prButtonLock = function(lockEnabled,
       }
       var checksMeet = prButtonLockChecks.compare && prButtonLockChecks.reviewers;
       if (lockEnabled) {
-          $('#save').attr('disabled', 'disabled');
+          $('#pr_submit').attr('disabled', 'disabled');
       }
       else if (checksMeet) {
-          $('#save').removeAttr('disabled');
+          $('#pr_submit').removeAttr('disabled');
       }
 
       if (msg) {
@@ -361,7 +361,7 @@ var updateCommits = function(repo_name, 
 /**
  * PULL REQUEST edit info
  */
-var editPullRequest = function(repo_name, pull_request_id, title, description) {
+var editPullRequest = function(repo_name, pull_request_id, title, description, renderer) {
     var url = pyroutes.url(
         'pullrequest_update',
         {"repo_name": repo_name, "pull_request_id": pull_request_id});
@@ -369,6 +369,7 @@ var editPullRequest = function(repo_name
     var postData = {
         'title': title,
         'description': description,
+        'description_renderer': renderer,
         'edit_pull_request': true,
         'csrf_token': CSRF_TOKEN
     };
@@ -378,49 +379,6 @@ var editPullRequest = function(repo_name
     ajaxPOST(url, postData, success);
 };
 
-var initPullRequestsCodeMirror = function (textAreaId) {
-    var ta = $(textAreaId).get(0);
-    var initialHeight = '100px';
-
-    // default options
-    var codeMirrorOptions = {
-        mode: "text",
-        lineNumbers: false,
-        indentUnit: 4,
-        theme: 'rc-input'
-    };
-
-    var codeMirrorInstance = CodeMirror.fromTextArea(ta, codeMirrorOptions);
-    // marker for manually set description
-    codeMirrorInstance._userDefinedDesc = false;
-    codeMirrorInstance.setSize(null, initialHeight);
-    codeMirrorInstance.on("change", function(instance, changeObj) {
-        var height = initialHeight;
-        var lines = instance.lineCount();
-        if (lines > 6 && lines < 20) {
-            height = "auto"
-        }
-        else if (lines >= 20) {
-            height = 20 * 15;
-        }
-        instance.setSize(null, height);
-
-        // detect if the change was trigger by auto desc, or user input
-        changeOrigin = changeObj.origin;
-
-        if (changeOrigin === "setValue") {
-            cmLog.debug('Change triggered by setValue');
-        }
-        else {
-            cmLog.debug('user triggered change !');
-            // set special marker to indicate user has created an input.
-            instance._userDefinedDesc = true;
-        }
-
-    });
-
-    return codeMirrorInstance
-};
 
 /**
  * Reviewer autocomplete
diff --git a/rhodecode/public/js/vendors/webcomponentsjs/webcomponents-lite.js b/rhodecode/public/js/vendors/webcomponentsjs/webcomponents-lite.js
--- a/rhodecode/public/js/vendors/webcomponentsjs/webcomponents-lite.js
+++ b/rhodecode/public/js/vendors/webcomponentsjs/webcomponents-lite.js
@@ -1,2505 +1,230 @@
 /**
- * @license
- * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
- * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
- * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
- * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
- * Code distributed by Google as part of the polymer project is also
- * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
- */
-// @version 0.7.22
-(function() {
-  window.WebComponents = window.WebComponents || {
-    flags: {}
-  };
-  var file = "webcomponents-lite.js";
-  var script = document.querySelector('script[src*="' + file + '"]');
-  var flags = {};
-  if (!flags.noOpts) {
-    location.search.slice(1).split("&").forEach(function(option) {
-      var parts = option.split("=");
-      var match;
-      if (parts[0] && (match = parts[0].match(/wc-(.+)/))) {
-        flags[match[1]] = parts[1] || true;
-      }
-    });
-    if (script) {
-      for (var i = 0, a; a = script.attributes[i]; i++) {
-        if (a.name !== "src") {
-          flags[a.name] = a.value || true;
-        }
-      }
-    }
-    if (flags.log && flags.log.split) {
-      var parts = flags.log.split(",");
-      flags.log = {};
-      parts.forEach(function(f) {
-        flags.log[f] = true;
-      });
-    } else {
-      flags.log = {};
-    }
-  }
-  if (flags.register) {
-    window.CustomElements = window.CustomElements || {
-      flags: {}
-    };
-    window.CustomElements.flags.register = flags.register;
-  }
-  WebComponents.flags = flags;
-})();
-
-(function(scope) {
-  "use strict";
-  var hasWorkingUrl = false;
-  if (!scope.forceJURL) {
-    try {
-      var u = new URL("b", "http://a");
-      u.pathname = "c%20d";
-      hasWorkingUrl = u.href === "http://a/c%20d";
-    } catch (e) {}
-  }
-  if (hasWorkingUrl) return;
-  var relative = Object.create(null);
-  relative["ftp"] = 21;
-  relative["file"] = 0;
-  relative["gopher"] = 70;
-  relative["http"] = 80;
-  relative["https"] = 443;
-  relative["ws"] = 80;
-  relative["wss"] = 443;
-  var relativePathDotMapping = Object.create(null);
-  relativePathDotMapping["%2e"] = ".";
-  relativePathDotMapping[".%2e"] = "..";
-  relativePathDotMapping["%2e."] = "..";
-  relativePathDotMapping["%2e%2e"] = "..";
-  function isRelativeScheme(scheme) {
-    return relative[scheme] !== undefined;
-  }
-  function invalid() {
-    clear.call(this);
-    this._isInvalid = true;
-  }
-  function IDNAToASCII(h) {
-    if ("" == h) {
-      invalid.call(this);
-    }
-    return h.toLowerCase();
-  }
-  function percentEscape(c) {
-    var unicode = c.charCodeAt(0);
-    if (unicode > 32 && unicode < 127 && [ 34, 35, 60, 62, 63, 96 ].indexOf(unicode) == -1) {
-      return c;
-    }
-    return encodeURIComponent(c);
-  }
-  function percentEscapeQuery(c) {
-    var unicode = c.charCodeAt(0);
-    if (unicode > 32 && unicode < 127 && [ 34, 35, 60, 62, 96 ].indexOf(unicode) == -1) {
-      return c;
-    }
-    return encodeURIComponent(c);
-  }
-  var EOF = undefined, ALPHA = /[a-zA-Z]/, ALPHANUMERIC = /[a-zA-Z0-9\+\-\.]/;
-  function parse(input, stateOverride, base) {
-    function err(message) {
-      errors.push(message);
-    }
-    var state = stateOverride || "scheme start", cursor = 0, buffer = "", seenAt = false, seenBracket = false, errors = [];
-    loop: while ((input[cursor - 1] != EOF || cursor == 0) && !this._isInvalid) {
-      var c = input[cursor];
-      switch (state) {
-       case "scheme start":
-        if (c && ALPHA.test(c)) {
-          buffer += c.toLowerCase();
-          state = "scheme";
-        } else if (!stateOverride) {
-          buffer = "";
-          state = "no scheme";
-          continue;
-        } else {
-          err("Invalid scheme.");
-          break loop;
-        }
-        break;
-
-       case "scheme":
-        if (c && ALPHANUMERIC.test(c)) {
-          buffer += c.toLowerCase();
-        } else if (":" == c) {
-          this._scheme = buffer;
-          buffer = "";
-          if (stateOverride) {
-            break loop;
-          }
-          if (isRelativeScheme(this._scheme)) {
-            this._isRelative = true;
-          }
-          if ("file" == this._scheme) {
-            state = "relative";
-          } else if (this._isRelative && base && base._scheme == this._scheme) {
-            state = "relative or authority";
-          } else if (this._isRelative) {
-            state = "authority first slash";
-          } else {
-            state = "scheme data";
-          }
-        } else if (!stateOverride) {
-          buffer = "";
-          cursor = 0;
-          state = "no scheme";
-          continue;
-        } else if (EOF == c) {
-          break loop;
-        } else {
-          err("Code point not allowed in scheme: " + c);
-          break loop;
-        }
-        break;
-
-       case "scheme data":
-        if ("?" == c) {
-          this._query = "?";
-          state = "query";
-        } else if ("#" == c) {
-          this._fragment = "#";
-          state = "fragment";
-        } else {
-          if (EOF != c && "	" != c && "\n" != c && "\r" != c) {
-            this._schemeData += percentEscape(c);
-          }
-        }
-        break;
-
-       case "no scheme":
-        if (!base || !isRelativeScheme(base._scheme)) {
-          err("Missing scheme.");
-          invalid.call(this);
-        } else {
-          state = "relative";
-          continue;
-        }
-        break;
-
-       case "relative or authority":
-        if ("/" == c && "/" == input[cursor + 1]) {
-          state = "authority ignore slashes";
-        } else {
-          err("Expected /, got: " + c);
-          state = "relative";
-          continue;
-        }
-        break;
-
-       case "relative":
-        this._isRelative = true;
-        if ("file" != this._scheme) this._scheme = base._scheme;
-        if (EOF == c) {
-          this._host = base._host;
-          this._port = base._port;
-          this._path = base._path.slice();
-          this._query = base._query;
-          this._username = base._username;
-          this._password = base._password;
-          break loop;
-        } else if ("/" == c || "\\" == c) {
-          if ("\\" == c) err("\\ is an invalid code point.");
-          state = "relative slash";
-        } else if ("?" == c) {
-          this._host = base._host;
-          this._port = base._port;
-          this._path = base._path.slice();
-          this._query = "?";
-          this._username = base._username;
-          this._password = base._password;
-          state = "query";
-        } else if ("#" == c) {
-          this._host = base._host;
-          this._port = base._port;
-          this._path = base._path.slice();
-          this._query = base._query;
-          this._fragment = "#";
-          this._username = base._username;
-          this._password = base._password;
-          state = "fragment";
-        } else {
-          var nextC = input[cursor + 1];
-          var nextNextC = input[cursor + 2];
-          if ("file" != this._scheme || !ALPHA.test(c) || nextC != ":" && nextC != "|" || EOF != nextNextC && "/" != nextNextC && "\\" != nextNextC && "?" != nextNextC && "#" != nextNextC) {
-            this._host = base._host;
-            this._port = base._port;
-            this._username = base._username;
-            this._password = base._password;
-            this._path = base._path.slice();
-            this._path.pop();
-          }
-          state = "relative path";
-          continue;
-        }
-        break;
-
-       case "relative slash":
-        if ("/" == c || "\\" == c) {
-          if ("\\" == c) {
-            err("\\ is an invalid code point.");
-          }
-          if ("file" == this._scheme) {
-            state = "file host";
-          } else {
-            state = "authority ignore slashes";
-          }
-        } else {
-          if ("file" != this._scheme) {
-            this._host = base._host;
-            this._port = base._port;
-            this._username = base._username;
-            this._password = base._password;
-          }
-          state = "relative path";
-          continue;
-        }
-        break;
-
-       case "authority first slash":
-        if ("/" == c) {
-          state = "authority second slash";
-        } else {
-          err("Expected '/', got: " + c);
-          state = "authority ignore slashes";
-          continue;
-        }
-        break;
-
-       case "authority second slash":
-        state = "authority ignore slashes";
-        if ("/" != c) {
-          err("Expected '/', got: " + c);
-          continue;
-        }
-        break;
-
-       case "authority ignore slashes":
-        if ("/" != c && "\\" != c) {
-          state = "authority";
-          continue;
-        } else {
-          err("Expected authority, got: " + c);
-        }
-        break;
-
-       case "authority":
-        if ("@" == c) {
-          if (seenAt) {
-            err("@ already seen.");
-            buffer += "%40";
-          }
-          seenAt = true;
-          for (var i = 0; i < buffer.length; i++) {
-            var cp = buffer[i];
-            if ("	" == cp || "\n" == cp || "\r" == cp) {
-              err("Invalid whitespace in authority.");
-              continue;
-            }
-            if (":" == cp && null === this._password) {
-              this._password = "";
-              continue;
-            }
-            var tempC = percentEscape(cp);
-            null !== this._password ? this._password += tempC : this._username += tempC;
-          }
-          buffer = "";
-        } else if (EOF == c || "/" == c || "\\" == c || "?" == c || "#" == c) {
-          cursor -= buffer.length;
-          buffer = "";
-          state = "host";
-          continue;
-        } else {
-          buffer += c;
-        }
-        break;
-
-       case "file host":
-        if (EOF == c || "/" == c || "\\" == c || "?" == c || "#" == c) {
-          if (buffer.length == 2 && ALPHA.test(buffer[0]) && (buffer[1] == ":" || buffer[1] == "|")) {
-            state = "relative path";
-          } else if (buffer.length == 0) {
-            state = "relative path start";
-          } else {
-            this._host = IDNAToASCII.call(this, buffer);
-            buffer = "";
-            state = "relative path start";
-          }
-          continue;
-        } else if ("	" == c || "\n" == c || "\r" == c) {
-          err("Invalid whitespace in file host.");
-        } else {
-          buffer += c;
-        }
-        break;
-
-       case "host":
-       case "hostname":
-        if (":" == c && !seenBracket) {
-          this._host = IDNAToASCII.call(this, buffer);
-          buffer = "";
-          state = "port";
-          if ("hostname" == stateOverride) {
-            break loop;
-          }
-        } else if (EOF == c || "/" == c || "\\" == c || "?" == c || "#" == c) {
-          this._host = IDNAToASCII.call(this, buffer);
-          buffer = "";
-          state = "relative path start";
-          if (stateOverride) {
-            break loop;
-          }
-          continue;
-        } else if ("	" != c && "\n" != c && "\r" != c) {
-          if ("[" == c) {
-            seenBracket = true;
-          } else if ("]" == c) {
-            seenBracket = false;
-          }
-          buffer += c;
-        } else {
-          err("Invalid code point in host/hostname: " + c);
-        }
-        break;
-
-       case "port":
-        if (/[0-9]/.test(c)) {
-          buffer += c;
-        } else if (EOF == c || "/" == c || "\\" == c || "?" == c || "#" == c || stateOverride) {
-          if ("" != buffer) {
-            var temp = parseInt(buffer, 10);
-            if (temp != relative[this._scheme]) {
-              this._port = temp + "";
-            }
-            buffer = "";
-          }
-          if (stateOverride) {
-            break loop;
-          }
-          state = "relative path start";
-          continue;
-        } else if ("	" == c || "\n" == c || "\r" == c) {
-          err("Invalid code point in port: " + c);
-        } else {
-          invalid.call(this);
-        }
-        break;
-
-       case "relative path start":
-        if ("\\" == c) err("'\\' not allowed in path.");
-        state = "relative path";
-        if ("/" != c && "\\" != c) {
-          continue;
-        }
-        break;
-
-       case "relative path":
-        if (EOF == c || "/" == c || "\\" == c || !stateOverride && ("?" == c || "#" == c)) {
-          if ("\\" == c) {
-            err("\\ not allowed in relative path.");
-          }
-          var tmp;
-          if (tmp = relativePathDotMapping[buffer.toLowerCase()]) {
-            buffer = tmp;
-          }
-          if (".." == buffer) {
-            this._path.pop();
-            if ("/" != c && "\\" != c) {
-              this._path.push("");
-            }
-          } else if ("." == buffer && "/" != c && "\\" != c) {
-            this._path.push("");
-          } else if ("." != buffer) {
-            if ("file" == this._scheme && this._path.length == 0 && buffer.length == 2 && ALPHA.test(buffer[0]) && buffer[1] == "|") {
-              buffer = buffer[0] + ":";
-            }
-            this._path.push(buffer);
-          }
-          buffer = "";
-          if ("?" == c) {
-            this._query = "?";
-            state = "query";
-          } else if ("#" == c) {
-            this._fragment = "#";
-            state = "fragment";
-          }
-        } else if ("	" != c && "\n" != c && "\r" != c) {
-          buffer += percentEscape(c);
-        }
-        break;
-
-       case "query":
-        if (!stateOverride && "#" == c) {
-          this._fragment = "#";
-          state = "fragment";
-        } else if (EOF != c && "	" != c && "\n" != c && "\r" != c) {
-          this._query += percentEscapeQuery(c);
-        }
-        break;
-
-       case "fragment":
-        if (EOF != c && "	" != c && "\n" != c && "\r" != c) {
-          this._fragment += c;
-        }
-        break;
-      }
-      cursor++;
-    }
-  }
-  function clear() {
-    this._scheme = "";
-    this._schemeData = "";
-    this._username = "";
-    this._password = null;
-    this._host = "";
-    this._port = "";
-    this._path = [];
-    this._query = "";
-    this._fragment = "";
-    this._isInvalid = false;
-    this._isRelative = false;
-  }
-  function jURL(url, base) {
-    if (base !== undefined && !(base instanceof jURL)) base = new jURL(String(base));
-    this._url = url;
-    clear.call(this);
-    var input = url.replace(/^[ \t\r\n\f]+|[ \t\r\n\f]+$/g, "");
-    parse.call(this, input, null, base);
-  }
-  jURL.prototype = {
-    toString: function() {
-      return this.href;
-    },
-    get href() {
-      if (this._isInvalid) return this._url;
-      var authority = "";
-      if ("" != this._username || null != this._password) {
-        authority = this._username + (null != this._password ? ":" + this._password : "") + "@";
-      }
-      return this.protocol + (this._isRelative ? "//" + authority + this.host : "") + this.pathname + this._query + this._fragment;
-    },
-    set href(href) {
-      clear.call(this);
-      parse.call(this, href);
-    },
-    get protocol() {
-      return this._scheme + ":";
-    },
-    set protocol(protocol) {
-      if (this._isInvalid) return;
-      parse.call(this, protocol + ":", "scheme start");
-    },
-    get host() {
-      return this._isInvalid ? "" : this._port ? this._host + ":" + this._port : this._host;
-    },
-    set host(host) {
-      if (this._isInvalid || !this._isRelative) return;
-      parse.call(this, host, "host");
-    },
-    get hostname() {
-      return this._host;
-    },
-    set hostname(hostname) {
-      if (this._isInvalid || !this._isRelative) return;
-      parse.call(this, hostname, "hostname");
-    },
-    get port() {
-      return this._port;
-    },
-    set port(port) {
-      if (this._isInvalid || !this._isRelative) return;
-      parse.call(this, port, "port");
-    },
-    get pathname() {
-      return this._isInvalid ? "" : this._isRelative ? "/" + this._path.join("/") : this._schemeData;
-    },
-    set pathname(pathname) {
-      if (this._isInvalid || !this._isRelative) return;
-      this._path = [];
-      parse.call(this, pathname, "relative path start");
-    },
-    get search() {
-      return this._isInvalid || !this._query || "?" == this._query ? "" : this._query;
-    },
-    set search(search) {
-      if (this._isInvalid || !this._isRelative) return;
-      this._query = "?";
-      if ("?" == search[0]) search = search.slice(1);
-      parse.call(this, search, "query");
-    },
-    get hash() {
-      return this._isInvalid || !this._fragment || "#" == this._fragment ? "" : this._fragment;
-    },
-    set hash(hash) {
-      if (this._isInvalid) return;
-      this._fragment = "#";
-      if ("#" == hash[0]) hash = hash.slice(1);
-      parse.call(this, hash, "fragment");
-    },
-    get origin() {
-      var host;
-      if (this._isInvalid || !this._scheme) {
-        return "";
-      }
-      switch (this._scheme) {
-       case "data":
-       case "file":
-       case "javascript":
-       case "mailto":
-        return "null";
-      }
-      host = this.host;
-      if (!host) {
-        return "";
-      }
-      return this._scheme + "://" + host;
-    }
-  };
-  var OriginalURL = scope.URL;
-  if (OriginalURL) {
-    jURL.createObjectURL = function(blob) {
-      return OriginalURL.createObjectURL.apply(OriginalURL, arguments);
-    };
-    jURL.revokeObjectURL = function(url) {
-      OriginalURL.revokeObjectURL(url);
-    };
-  }
-  scope.URL = jURL;
-})(self);
+@license @nocompile
+Copyright (c) 2018 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+(function(){/*
 
-if (typeof WeakMap === "undefined") {
-  (function() {
-    var defineProperty = Object.defineProperty;
-    var counter = Date.now() % 1e9;
-    var WeakMap = function() {
-      this.name = "__st" + (Math.random() * 1e9 >>> 0) + (counter++ + "__");
-    };
-    WeakMap.prototype = {
-      set: function(key, value) {
-        var entry = key[this.name];
-        if (entry && entry[0] === key) entry[1] = value; else defineProperty(key, this.name, {
-          value: [ key, value ],
-          writable: true
-        });
-        return this;
-      },
-      get: function(key) {
-        var entry;
-        return (entry = key[this.name]) && entry[0] === key ? entry[1] : undefined;
-      },
-      "delete": function(key) {
-        var entry = key[this.name];
-        if (!entry || entry[0] !== key) return false;
-        entry[0] = entry[1] = undefined;
-        return true;
-      },
-      has: function(key) {
-        var entry = key[this.name];
-        if (!entry) return false;
-        return entry[0] === key;
-      }
-    };
-    window.WeakMap = WeakMap;
-  })();
-}
+ Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+ This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ Code distributed by Google as part of the polymer project is also
+ subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+'use strict';var p,aa="function"==typeof Object.defineProperties?Object.defineProperty:function(a,b,c){a!=Array.prototype&&a!=Object.prototype&&(a[b]=c.value)},ea="undefined"!=typeof window&&window===this?this:"undefined"!=typeof global&&null!=global?global:this;function ha(){ha=function(){};ea.Symbol||(ea.Symbol=ia)}var ia=function(){var a=0;return function(b){return"jscomp_symbol_"+(b||"")+a++}}();
+function ja(){ha();var a=ea.Symbol.iterator;a||(a=ea.Symbol.iterator=ea.Symbol("iterator"));"function"!=typeof Array.prototype[a]&&aa(Array.prototype,a,{configurable:!0,writable:!0,value:function(){return ka(this)}});ja=function(){}}function ka(a){var b=0;return la(function(){return b<a.length?{done:!1,value:a[b++]}:{done:!0}})}function la(a){ja();a={next:a};a[ea.Symbol.iterator]=function(){return this};return a}function ma(a){ja();var b=a[Symbol.iterator];return b?b.call(a):ka(a)}
+function na(a){for(var b,c=[];!(b=a.next()).done;)c.push(b.value);return c}
+(function(){if(!function(){var a=document.createEvent("Event");a.initEvent("foo",!0,!0);a.preventDefault();return a.defaultPrevented}()){var a=Event.prototype.preventDefault;Event.prototype.preventDefault=function(){this.cancelable&&(a.call(this),Object.defineProperty(this,"defaultPrevented",{get:function(){return!0},configurable:!0}))}}var b=/Trident/.test(navigator.userAgent);if(!window.CustomEvent||b&&"function"!==typeof window.CustomEvent)window.CustomEvent=function(a,b){b=b||{};var c=document.createEvent("CustomEvent");
+c.initCustomEvent(a,!!b.bubbles,!!b.cancelable,b.detail);return c},window.CustomEvent.prototype=window.Event.prototype;if(!window.Event||b&&"function"!==typeof window.Event){var c=window.Event;window.Event=function(a,b){b=b||{};var c=document.createEvent("Event");c.initEvent(a,!!b.bubbles,!!b.cancelable);return c};if(c)for(var d in c)window.Event[d]=c[d];window.Event.prototype=c.prototype}if(!window.MouseEvent||b&&"function"!==typeof window.MouseEvent){b=window.MouseEvent;window.MouseEvent=function(a,
+b){b=b||{};var c=document.createEvent("MouseEvent");c.initMouseEvent(a,!!b.bubbles,!!b.cancelable,b.view||window,b.detail,b.screenX,b.screenY,b.clientX,b.clientY,b.ctrlKey,b.altKey,b.shiftKey,b.metaKey,b.button,b.relatedTarget);return c};if(b)for(d in b)window.MouseEvent[d]=b[d];window.MouseEvent.prototype=b.prototype}Array.from||(Array.from=function(a){return[].slice.call(a)});Object.assign||(Object.assign=function(a,b){for(var c=[].slice.call(arguments,1),d=0,e;d<c.length;d++)if(e=c[d])for(var f=
+a,m=e,n=Object.getOwnPropertyNames(m),t=0;t<n.length;t++)e=n[t],f[e]=m[e];return a})})(window.WebComponents);(function(){function a(){}function b(a,b){if(!a.childNodes.length)return[];switch(a.nodeType){case Node.DOCUMENT_NODE:return ya.call(a,b);case Node.DOCUMENT_FRAGMENT_NODE:return qb.call(a,b);default:return ba.call(a,b)}}var c="undefined"===typeof HTMLTemplateElement,d=!(document.createDocumentFragment().cloneNode()instanceof DocumentFragment),e=!1;/Trident/.test(navigator.userAgent)&&function(){function a(a,b){if(a instanceof DocumentFragment)for(var d;d=a.firstChild;)c.call(this,d,b);else c.call(this,
+a,b);return a}e=!0;var b=Node.prototype.cloneNode;Node.prototype.cloneNode=function(a){a=b.call(this,a);this instanceof DocumentFragment&&(a.__proto__=DocumentFragment.prototype);return a};DocumentFragment.prototype.querySelectorAll=HTMLElement.prototype.querySelectorAll;DocumentFragment.prototype.querySelector=HTMLElement.prototype.querySelector;Object.defineProperties(DocumentFragment.prototype,{nodeType:{get:function(){return Node.DOCUMENT_FRAGMENT_NODE},configurable:!0},localName:{get:function(){},
+configurable:!0},nodeName:{get:function(){return"#document-fragment"},configurable:!0}});var c=Node.prototype.insertBefore;Node.prototype.insertBefore=a;var d=Node.prototype.appendChild;Node.prototype.appendChild=function(b){b instanceof DocumentFragment?a.call(this,b,null):d.call(this,b);return b};var f=Node.prototype.removeChild,h=Node.prototype.replaceChild;Node.prototype.replaceChild=function(b,c){b instanceof DocumentFragment?(a.call(this,b,c),f.call(this,c)):h.call(this,b,c);return c};Document.prototype.createDocumentFragment=
+function(){var a=this.createElement("df");a.__proto__=DocumentFragment.prototype;return a};var g=Document.prototype.importNode;Document.prototype.importNode=function(a,b){b=g.call(this,a,b||!1);a instanceof DocumentFragment&&(b.__proto__=DocumentFragment.prototype);return b}}();var f=Node.prototype.cloneNode,h=Document.prototype.createElement,g=Document.prototype.importNode,k=Node.prototype.removeChild,l=Node.prototype.appendChild,m=Node.prototype.replaceChild,n=DOMParser.prototype.parseFromString,
+t=Object.getOwnPropertyDescriptor(window.HTMLElement.prototype,"innerHTML"),C=Object.getOwnPropertyDescriptor(window.Node.prototype,"childNodes"),ba=Element.prototype.querySelectorAll,ya=Document.prototype.querySelectorAll,qb=DocumentFragment.prototype.querySelectorAll,rb=function(){if(!c){var a=document.createElement("template"),b=document.createElement("template");b.content.appendChild(document.createElement("div"));a.content.appendChild(b);a=a.cloneNode(!0);return 0===a.content.childNodes.length||
+0===a.content.firstChild.content.childNodes.length||d}}();if(c){var V=document.implementation.createHTMLDocument("template"),D=!0,ca=document.createElement("style");ca.textContent="template{display:none;}";var oa=document.head;oa.insertBefore(ca,oa.firstElementChild);a.prototype=Object.create(HTMLElement.prototype);var za=!document.createElement("div").hasOwnProperty("innerHTML");a.I=function(b){if(!b.content&&b.namespaceURI===document.documentElement.namespaceURI){b.content=V.createDocumentFragment();
+for(var c;c=b.firstChild;)l.call(b.content,c);if(za)b.__proto__=a.prototype;else if(b.cloneNode=function(b){return a.a(this,b)},D)try{T(b),da(b)}catch(Gh){D=!1}a.C(b.content)}};var fa={option:["select"],thead:["table"],col:["colgroup","table"],tr:["tbody","table"],th:["tr","tbody","table"],td:["tr","tbody","table"]},T=function(b){Object.defineProperty(b,"innerHTML",{get:function(){return sb(this)},set:function(b){var c=fa[(/<([a-z][^/\0>\x20\t\r\n\f]+)/i.exec(b)||["",""])[1].toLowerCase()];if(c)for(var d=
+0;d<c.length;d++)b="<"+c[d]+">"+b+"</"+c[d]+">";V.body.innerHTML=b;for(a.C(V);this.content.firstChild;)k.call(this.content,this.content.firstChild);b=V.body;if(c)for(d=0;d<c.length;d++)b=b.lastChild;for(;b.firstChild;)l.call(this.content,b.firstChild)},configurable:!0})},da=function(a){Object.defineProperty(a,"outerHTML",{get:function(){return"<template>"+this.innerHTML+"</template>"},set:function(a){if(this.parentNode){V.body.innerHTML=a;for(a=this.ownerDocument.createDocumentFragment();V.body.firstChild;)l.call(a,
+V.body.firstChild);m.call(this.parentNode,a,this)}else throw Error("Failed to set the 'outerHTML' property on 'Element': This element has no parent node.");},configurable:!0})};T(a.prototype);da(a.prototype);a.C=function(c){c=b(c,"template");for(var d=0,e=c.length,f;d<e&&(f=c[d]);d++)a.I(f)};document.addEventListener("DOMContentLoaded",function(){a.C(document)});Document.prototype.createElement=function(){var b=h.apply(this,arguments);"template"===b.localName&&a.I(b);return b};DOMParser.prototype.parseFromString=
+function(){var b=n.apply(this,arguments);a.C(b);return b};Object.defineProperty(HTMLElement.prototype,"innerHTML",{get:function(){return sb(this)},set:function(b){t.set.call(this,b);a.C(this)},configurable:!0,enumerable:!0});var sf=/[&\u00A0"]/g,Kc=/[&\u00A0<>]/g,Lc=function(a){switch(a){case "&":return"&amp;";case "<":return"&lt;";case ">":return"&gt;";case '"':return"&quot;";case "\u00a0":return"&nbsp;"}};ca=function(a){for(var b={},c=0;c<a.length;c++)b[a[c]]=!0;return b};var tf=ca("area base br col command embed hr img input keygen link meta param source track wbr".split(" ")),
+uf=ca("style script xmp iframe noembed noframes plaintext noscript".split(" ")),sb=function(a,b){"template"===a.localName&&(a=a.content);for(var c="",d=b?b(a):C.get.call(a),e=0,f=d.length,h;e<f&&(h=d[e]);e++){a:{var g=h;var k=a;var l=b;switch(g.nodeType){case Node.ELEMENT_NODE:for(var T=g.localName,m="<"+T,da=g.attributes,n=0;k=da[n];n++)m+=" "+k.name+'="'+k.value.replace(sf,Lc)+'"';m+=">";g=tf[T]?m:m+sb(g,l)+"</"+T+">";break a;case Node.TEXT_NODE:g=g.data;g=k&&uf[k.localName]?g:g.replace(Kc,Lc);
+break a;case Node.COMMENT_NODE:g="\x3c!--"+g.data+"--\x3e";break a;default:throw window.console.error(g),Error("not implemented");}}c+=g}return c}}if(c||rb){a.a=function(a,b){var c=f.call(a,!1);this.I&&this.I(c);b&&(l.call(c.content,f.call(a.content,!0)),tb(c.content,a.content));return c};var tb=function(c,d){if(d.querySelectorAll&&(d=b(d,"template"),0!==d.length)){c=b(c,"template");for(var e=0,f=c.length,h,g;e<f;e++)g=d[e],h=c[e],a&&a.I&&a.I(g),m.call(h.parentNode,vf.call(g,!0),h)}},vf=Node.prototype.cloneNode=
+function(b){if(!e&&d&&this instanceof DocumentFragment)if(b)var c=wf.call(this.ownerDocument,this,!0);else return this.ownerDocument.createDocumentFragment();else this.nodeType===Node.ELEMENT_NODE&&"template"===this.localName&&this.namespaceURI==document.documentElement.namespaceURI?c=a.a(this,b):c=f.call(this,b);b&&tb(c,this);return c},wf=Document.prototype.importNode=function(c,d){d=d||!1;if("template"===c.localName)return a.a(c,d);var e=g.call(this,c,d);if(d){tb(e,c);c=b(e,'script:not([type]),script[type="application/javascript"],script[type="text/javascript"]');
+for(var f,k=0;k<c.length;k++){f=c[k];d=h.call(document,"script");d.textContent=f.textContent;for(var l=f.attributes,T=0,da;T<l.length;T++)da=l[T],d.setAttribute(da.name,da.value);m.call(f.parentNode,d,f)}}return e}}c&&(window.HTMLTemplateElement=a)})();var pa;Array.isArray?pa=Array.isArray:pa=function(a){return"[object Array]"===Object.prototype.toString.call(a)};var qa=pa;var ra=0,sa,ta="undefined"!==typeof window?window:void 0,ua=ta||{},va=ua.MutationObserver||ua.WebKitMutationObserver,wa="undefined"!==typeof Uint8ClampedArray&&"undefined"!==typeof importScripts&&"undefined"!==typeof MessageChannel;function xa(){return"undefined"!==typeof sa?function(){sa(Aa)}:Ba()}function Ca(){var a=0,b=new va(Aa),c=document.createTextNode("");b.observe(c,{characterData:!0});return function(){c.data=a=++a%2}}
+function Da(){var a=new MessageChannel;a.port1.onmessage=Aa;return function(){return a.port2.postMessage(0)}}function Ba(){var a=setTimeout;return function(){return a(Aa,1)}}var Ea=Array(1E3);function Aa(){for(var a=0;a<ra;a+=2)(0,Ea[a])(Ea[a+1]),Ea[a]=void 0,Ea[a+1]=void 0;ra=0}var Fa,Ga;
+if("undefined"===typeof self&&"undefined"!==typeof process&&"[object process]"==={}.toString.call(process))Ga=function(){return process.vb(Aa)};else{var Ha;if(va)Ha=Ca();else{var Ia;if(wa)Ia=Da();else{var Ja;if(void 0===ta&&"function"===typeof require)try{var Ka=require("vertx");sa=Ka.xb||Ka.wb;Ja=xa()}catch(a){Ja=Ba()}else Ja=Ba();Ia=Ja}Ha=Ia}Ga=Ha}Fa=Ga;function La(a,b){Ea[ra]=a;Ea[ra+1]=b;ra+=2;2===ra&&Fa()};function Ma(a,b){var c=this,d=new this.constructor(Na);void 0===d[Oa]&&Pa(d);var e=c.h;if(e){var f=arguments[e-1];La(function(){return Qa(e,d,f,c.f)})}else Ra(c,d,a,b);return d};function Sa(a){if(a&&"object"===typeof a&&a.constructor===this)return a;var b=new this(Na);Ta(b,a);return b};var Oa=Math.random().toString(36).substring(16);function Na(){}var Va=new Ua;function Wa(a){try{return a.then}catch(b){return Va.error=b,Va}}function Xa(a,b,c,d){try{a.call(b,c,d)}catch(e){return e}}function Ya(a,b,c){La(function(a){var d=!1,f=Xa(c,b,function(c){d||(d=!0,b!==c?Ta(a,c):q(a,c))},function(b){d||(d=!0,r(a,b))});!d&&f&&(d=!0,r(a,f))},a)}function Za(a,b){1===b.h?q(a,b.f):2===b.h?r(a,b.f):Ra(b,void 0,function(b){return Ta(a,b)},function(b){return r(a,b)})}
+function $a(a,b,c){b.constructor===a.constructor&&c===Ma&&b.constructor.resolve===Sa?Za(a,b):c===Va?(r(a,Va.error),Va.error=null):void 0===c?q(a,b):"function"===typeof c?Ya(a,b,c):q(a,b)}function Ta(a,b){if(a===b)r(a,new TypeError("You cannot resolve a promise with itself"));else{var c=typeof b;null===b||"object"!==c&&"function"!==c?q(a,b):$a(a,b,Wa(b))}}function ab(a){a.va&&a.va(a.f);bb(a)}function q(a,b){void 0===a.h&&(a.f=b,a.h=1,0!==a.M.length&&La(bb,a))}
+function r(a,b){void 0===a.h&&(a.h=2,a.f=b,La(ab,a))}function Ra(a,b,c,d){var e=a.M,f=e.length;a.va=null;e[f]=b;e[f+1]=c;e[f+2]=d;0===f&&a.h&&La(bb,a)}function bb(a){var b=a.M,c=a.h;if(0!==b.length){for(var d,e,f=a.f,h=0;h<b.length;h+=3)d=b[h],e=b[h+c],d?Qa(c,d,e,f):e(f);a.M.length=0}}function Ua(){this.error=null}var cb=new Ua;
+function Qa(a,b,c,d){var e="function"===typeof c;if(e){try{var f=c(d)}catch(l){cb.error=l,f=cb}if(f===cb){var h=!0;var g=f.error;f.error=null}else var k=!0;if(b===f){r(b,new TypeError("A promises callback cannot return that same promise."));return}}else f=d,k=!0;void 0===b.h&&(e&&k?Ta(b,f):h?r(b,g):1===a?q(b,f):2===a&&r(b,f))}function db(a,b){try{b(function(b){Ta(a,b)},function(b){r(a,b)})}catch(c){r(a,c)}}var eb=0;function Pa(a){a[Oa]=eb++;a.h=void 0;a.f=void 0;a.M=[]};function fb(a,b){this.Ka=a;this.F=new a(Na);this.F[Oa]||Pa(this.F);if(qa(b))if(this.V=this.length=b.length,this.f=Array(this.length),0===this.length)q(this.F,this.f);else{this.length=this.length||0;for(a=0;void 0===this.h&&a<b.length;a++)gb(this,b[a],a);0===this.V&&q(this.F,this.f)}else r(this.F,Error("Array Methods must be provided an Array"))}
+function gb(a,b,c){var d=a.Ka,e=d.resolve;e===Sa?(e=Wa(b),e===Ma&&void 0!==b.h?hb(a,b.h,c,b.f):"function"!==typeof e?(a.V--,a.f[c]=b):d===u?(d=new d(Na),$a(d,b,e),ib(a,d,c)):ib(a,new d(function(a){return a(b)}),c)):ib(a,e(b),c)}function hb(a,b,c,d){var e=a.F;void 0===e.h&&(a.V--,2===b?r(e,d):a.f[c]=d);0===a.V&&q(e,a.f)}function ib(a,b,c){Ra(b,void 0,function(b){return hb(a,1,c,b)},function(b){return hb(a,2,c,b)})};function jb(a){return(new fb(this,a)).F};function kb(a){var b=this;return qa(a)?new b(function(c,d){for(var e=a.length,f=0;f<e;f++)b.resolve(a[f]).then(c,d)}):new b(function(a,b){return b(new TypeError("You must pass an array to race."))})};function lb(a){var b=new this(Na);r(b,a);return b};function u(a){this[Oa]=eb++;this.f=this.h=void 0;this.M=[];if(Na!==a){if("function"!==typeof a)throw new TypeError("You must pass a resolver function as the first argument to the promise constructor");if(this instanceof u)db(this,a);else throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.");}}u.prototype={constructor:u,then:Ma,a:function(a){return this.then(null,a)}};/*
 
-(function(global) {
-  if (global.JsMutationObserver) {
-    return;
-  }
-  var registrationsTable = new WeakMap();
-  var setImmediate;
-  if (/Trident|Edge/.test(navigator.userAgent)) {
-    setImmediate = setTimeout;
-  } else if (window.setImmediate) {
-    setImmediate = window.setImmediate;
-  } else {
-    var setImmediateQueue = [];
-    var sentinel = String(Math.random());
-    window.addEventListener("message", function(e) {
-      if (e.data === sentinel) {
-        var queue = setImmediateQueue;
-        setImmediateQueue = [];
-        queue.forEach(function(func) {
-          func();
-        });
-      }
-    });
-    setImmediate = function(func) {
-      setImmediateQueue.push(func);
-      window.postMessage(sentinel, "*");
-    };
-  }
-  var isScheduled = false;
-  var scheduledObservers = [];
-  function scheduleCallback(observer) {
-    scheduledObservers.push(observer);
-    if (!isScheduled) {
-      isScheduled = true;
-      setImmediate(dispatchCallbacks);
-    }
-  }
-  function wrapIfNeeded(node) {
-    return window.ShadowDOMPolyfill && window.ShadowDOMPolyfill.wrapIfNeeded(node) || node;
-  }
-  function dispatchCallbacks() {
-    isScheduled = false;
-    var observers = scheduledObservers;
-    scheduledObservers = [];
-    observers.sort(function(o1, o2) {
-      return o1.uid_ - o2.uid_;
-    });
-    var anyNonEmpty = false;
-    observers.forEach(function(observer) {
-      var queue = observer.takeRecords();
-      removeTransientObserversFor(observer);
-      if (queue.length) {
-        observer.callback_(queue, observer);
-        anyNonEmpty = true;
-      }
-    });
-    if (anyNonEmpty) dispatchCallbacks();
-  }
-  function removeTransientObserversFor(observer) {
-    observer.nodes_.forEach(function(node) {
-      var registrations = registrationsTable.get(node);
-      if (!registrations) return;
-      registrations.forEach(function(registration) {
-        if (registration.observer === observer) registration.removeTransientObservers();
-      });
-    });
-  }
-  function forEachAncestorAndObserverEnqueueRecord(target, callback) {
-    for (var node = target; node; node = node.parentNode) {
-      var registrations = registrationsTable.get(node);
-      if (registrations) {
-        for (var j = 0; j < registrations.length; j++) {
-          var registration = registrations[j];
-          var options = registration.options;
-          if (node !== target && !options.subtree) continue;
-          var record = callback(options);
-          if (record) registration.enqueue(record);
-        }
-      }
-    }
-  }
-  var uidCounter = 0;
-  function JsMutationObserver(callback) {
-    this.callback_ = callback;
-    this.nodes_ = [];
-    this.records_ = [];
-    this.uid_ = ++uidCounter;
-  }
-  JsMutationObserver.prototype = {
-    observe: function(target, options) {
-      target = wrapIfNeeded(target);
-      if (!options.childList && !options.attributes && !options.characterData || options.attributeOldValue && !options.attributes || options.attributeFilter && options.attributeFilter.length && !options.attributes || options.characterDataOldValue && !options.characterData) {
-        throw new SyntaxError();
-      }
-      var registrations = registrationsTable.get(target);
-      if (!registrations) registrationsTable.set(target, registrations = []);
-      var registration;
-      for (var i = 0; i < registrations.length; i++) {
-        if (registrations[i].observer === this) {
-          registration = registrations[i];
-          registration.removeListeners();
-          registration.options = options;
-          break;
-        }
-      }
-      if (!registration) {
-        registration = new Registration(this, target, options);
-        registrations.push(registration);
-        this.nodes_.push(target);
-      }
-      registration.addListeners();
-    },
-    disconnect: function() {
-      this.nodes_.forEach(function(node) {
-        var registrations = registrationsTable.get(node);
-        for (var i = 0; i < registrations.length; i++) {
-          var registration = registrations[i];
-          if (registration.observer === this) {
-            registration.removeListeners();
-            registrations.splice(i, 1);
-            break;
-          }
-        }
-      }, this);
-      this.records_ = [];
-    },
-    takeRecords: function() {
-      var copyOfRecords = this.records_;
-      this.records_ = [];
-      return copyOfRecords;
-    }
-  };
-  function MutationRecord(type, target) {
-    this.type = type;
-    this.target = target;
-    this.addedNodes = [];
-    this.removedNodes = [];
-    this.previousSibling = null;
-    this.nextSibling = null;
-    this.attributeName = null;
-    this.attributeNamespace = null;
-    this.oldValue = null;
-  }
-  function copyMutationRecord(original) {
-    var record = new MutationRecord(original.type, original.target);
-    record.addedNodes = original.addedNodes.slice();
-    record.removedNodes = original.removedNodes.slice();
-    record.previousSibling = original.previousSibling;
-    record.nextSibling = original.nextSibling;
-    record.attributeName = original.attributeName;
-    record.attributeNamespace = original.attributeNamespace;
-    record.oldValue = original.oldValue;
-    return record;
-  }
-  var currentRecord, recordWithOldValue;
-  function getRecord(type, target) {
-    return currentRecord = new MutationRecord(type, target);
-  }
-  function getRecordWithOldValue(oldValue) {
-    if (recordWithOldValue) return recordWithOldValue;
-    recordWithOldValue = copyMutationRecord(currentRecord);
-    recordWithOldValue.oldValue = oldValue;
-    return recordWithOldValue;
-  }
-  function clearRecords() {
-    currentRecord = recordWithOldValue = undefined;
-  }
-  function recordRepresentsCurrentMutation(record) {
-    return record === recordWithOldValue || record === currentRecord;
-  }
-  function selectRecord(lastRecord, newRecord) {
-    if (lastRecord === newRecord) return lastRecord;
-    if (recordWithOldValue && recordRepresentsCurrentMutation(lastRecord)) return recordWithOldValue;
-    return null;
-  }
-  function Registration(observer, target, options) {
-    this.observer = observer;
-    this.target = target;
-    this.options = options;
-    this.transientObservedNodes = [];
-  }
-  Registration.prototype = {
-    enqueue: function(record) {
-      var records = this.observer.records_;
-      var length = records.length;
-      if (records.length > 0) {
-        var lastRecord = records[length - 1];
-        var recordToReplaceLast = selectRecord(lastRecord, record);
-        if (recordToReplaceLast) {
-          records[length - 1] = recordToReplaceLast;
-          return;
-        }
-      } else {
-        scheduleCallback(this.observer);
-      }
-      records[length] = record;
-    },
-    addListeners: function() {
-      this.addListeners_(this.target);
-    },
-    addListeners_: function(node) {
-      var options = this.options;
-      if (options.attributes) node.addEventListener("DOMAttrModified", this, true);
-      if (options.characterData) node.addEventListener("DOMCharacterDataModified", this, true);
-      if (options.childList) node.addEventListener("DOMNodeInserted", this, true);
-      if (options.childList || options.subtree) node.addEventListener("DOMNodeRemoved", this, true);
-    },
-    removeListeners: function() {
-      this.removeListeners_(this.target);
-    },
-    removeListeners_: function(node) {
-      var options = this.options;
-      if (options.attributes) node.removeEventListener("DOMAttrModified", this, true);
-      if (options.characterData) node.removeEventListener("DOMCharacterDataModified", this, true);
-      if (options.childList) node.removeEventListener("DOMNodeInserted", this, true);
-      if (options.childList || options.subtree) node.removeEventListener("DOMNodeRemoved", this, true);
-    },
-    addTransientObserver: function(node) {
-      if (node === this.target) return;
-      this.addListeners_(node);
-      this.transientObservedNodes.push(node);
-      var registrations = registrationsTable.get(node);
-      if (!registrations) registrationsTable.set(node, registrations = []);
-      registrations.push(this);
-    },
-    removeTransientObservers: function() {
-      var transientObservedNodes = this.transientObservedNodes;
-      this.transientObservedNodes = [];
-      transientObservedNodes.forEach(function(node) {
-        this.removeListeners_(node);
-        var registrations = registrationsTable.get(node);
-        for (var i = 0; i < registrations.length; i++) {
-          if (registrations[i] === this) {
-            registrations.splice(i, 1);
-            break;
-          }
-        }
-      }, this);
-    },
-    handleEvent: function(e) {
-      e.stopImmediatePropagation();
-      switch (e.type) {
-       case "DOMAttrModified":
-        var name = e.attrName;
-        var namespace = e.relatedNode.namespaceURI;
-        var target = e.target;
-        var record = new getRecord("attributes", target);
-        record.attributeName = name;
-        record.attributeNamespace = namespace;
-        var oldValue = e.attrChange === MutationEvent.ADDITION ? null : e.prevValue;
-        forEachAncestorAndObserverEnqueueRecord(target, function(options) {
-          if (!options.attributes) return;
-          if (options.attributeFilter && options.attributeFilter.length && options.attributeFilter.indexOf(name) === -1 && options.attributeFilter.indexOf(namespace) === -1) {
-            return;
-          }
-          if (options.attributeOldValue) return getRecordWithOldValue(oldValue);
-          return record;
-        });
-        break;
-
-       case "DOMCharacterDataModified":
-        var target = e.target;
-        var record = getRecord("characterData", target);
-        var oldValue = e.prevValue;
-        forEachAncestorAndObserverEnqueueRecord(target, function(options) {
-          if (!options.characterData) return;
-          if (options.characterDataOldValue) return getRecordWithOldValue(oldValue);
-          return record;
-        });
-        break;
-
-       case "DOMNodeRemoved":
-        this.addTransientObserver(e.target);
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+window.Promise||(window.Promise=u,u.prototype["catch"]=u.prototype.a,u.prototype.then=u.prototype.then,u.all=jb,u.race=kb,u.resolve=Sa,u.reject=lb);(function(a){function b(a,b){if("function"===typeof window.CustomEvent)return new CustomEvent(a,b);var c=document.createEvent("CustomEvent");c.initCustomEvent(a,!!b.bubbles,!!b.cancelable,b.detail);return c}function c(a){if(C)return a.ownerDocument!==document?a.ownerDocument:null;var b=a.__importDoc;if(!b&&a.parentNode){b=a.parentNode;if("function"===typeof b.closest)b=b.closest("link[rel=import]");else for(;!g(b)&&(b=b.parentNode););a.__importDoc=b}return b}function d(a){var b=m(document,"link[rel=import]:not([import-dependency])"),
+c=b.length;c?n(b,function(b){return h(b,function(){0===--c&&a()})}):a()}function e(a){function b(){"loading"!==document.readyState&&document.body&&(document.removeEventListener("readystatechange",b),a())}document.addEventListener("readystatechange",b);b()}function f(a){e(function(){return d(function(){return a&&a()})})}function h(a,b){if(a.__loaded)b&&b();else if("script"===a.localName&&!a.src||"style"===a.localName&&!a.firstChild)a.__loaded=!0,b&&b();else{var c=function(d){a.removeEventListener(d.type,
+c);a.__loaded=!0;b&&b()};a.addEventListener("load",c);oa&&"style"===a.localName||a.addEventListener("error",c)}}function g(a){return a.nodeType===Node.ELEMENT_NODE&&"link"===a.localName&&"import"===a.rel}function k(){var a=this;this.a={};this.b=0;this.c=new MutationObserver(function(b){return a.Va(b)});this.c.observe(document.head,{childList:!0,subtree:!0});this.loadImports(document)}function l(a){n(m(a,"template"),function(a){n(m(a.content,'script:not([type]),script[type="application/javascript"],script[type="text/javascript"],script[type="module"]'),
+function(a){var b=document.createElement("script");n(a.attributes,function(a){return b.setAttribute(a.name,a.value)});b.textContent=a.textContent;a.parentNode.replaceChild(b,a)});l(a.content)})}function m(a,b){return a.childNodes.length?a.querySelectorAll(b):ba}function n(a,b,c){var d=a?a.length:0,e=c?-1:1;for(c=c?d-1:0;c<d&&0<=c;c+=e)b(a[c],c)}var t=document.createElement("link"),C="import"in t,ba=t.querySelectorAll("*"),ya=null;!1==="currentScript"in document&&Object.defineProperty(document,"currentScript",
+{get:function(){return ya||("complete"!==document.readyState?document.scripts[document.scripts.length-1]:null)},configurable:!0});var qb=/(url\()([^)]*)(\))/g,rb=/(@import[\s]+(?!url\())([^;]*)(;)/g,V=/(<link[^>]*)(rel=['|"]?stylesheet['|"]?[^>]*>)/g,D={Pa:function(a,b){a.href&&a.setAttribute("href",D.ba(a.getAttribute("href"),b));a.src&&a.setAttribute("src",D.ba(a.getAttribute("src"),b));if("style"===a.localName){var c=D.za(a.textContent,b,qb);a.textContent=D.za(c,b,rb)}},za:function(a,b,c){return a.replace(c,
+function(a,c,d,e){a=d.replace(/["']/g,"");b&&(a=D.ba(a,b));return c+"'"+a+"'"+e})},ba:function(a,b){if(void 0===D.ha){D.ha=!1;try{var c=new URL("b","http://a");c.pathname="c%20d";D.ha="http://a/c%20d"===c.href}catch(Kc){}}if(D.ha)return(new URL(a,b)).href;c=D.Ha;c||(c=document.implementation.createHTMLDocument("temp"),D.Ha=c,c.ra=c.createElement("base"),c.head.appendChild(c.ra),c.qa=c.createElement("a"));c.ra.href=b;c.qa.href=a;return c.qa.href||a}},ca={async:!0,load:function(a,b,c){if(a)if(a.match(/^data:/)){a=
+a.split(",");var d=a[1];d=-1<a[0].indexOf(";base64")?atob(d):decodeURIComponent(d);b(d)}else{var e=new XMLHttpRequest;e.open("GET",a,ca.async);e.onload=function(){var a=e.responseURL||e.getResponseHeader("Location");a&&0===a.indexOf("/")&&(a=(location.origin||location.protocol+"//"+location.host)+a);var d=e.response||e.responseText;304===e.status||0===e.status||200<=e.status&&300>e.status?b(d,a):c(d)};e.send()}else c("error: href must be specified")}},oa=/Trident/.test(navigator.userAgent)||/Edge\/\d./i.test(navigator.userAgent);
+k.prototype.loadImports=function(a){var b=this;a=m(a,"link[rel=import]");n(a,function(a){return b.o(a)})};k.prototype.o=function(a){var b=this,c=a.href;if(void 0!==this.a[c]){var d=this.a[c];d&&d.__loaded&&(a.__import=d,this.i(a))}else this.b++,this.a[c]="pending",ca.load(c,function(a,d){a=b.Wa(a,d||c);b.a[c]=a;b.b--;b.loadImports(a);b.J()},function(){b.a[c]=null;b.b--;b.J()})};k.prototype.Wa=function(a,b){if(!a)return document.createDocumentFragment();oa&&(a=a.replace(V,function(a,b,c){return-1===
+a.indexOf("type=")?b+" type=import-disable "+c:a}));var c=document.createElement("template");c.innerHTML=a;if(c.content)a=c.content,l(a);else for(a=document.createDocumentFragment();c.firstChild;)a.appendChild(c.firstChild);if(c=a.querySelector("base"))b=D.ba(c.getAttribute("href"),b),c.removeAttribute("href");c=m(a,'link[rel=import],link[rel=stylesheet][href][type=import-disable],style:not([type]),link[rel=stylesheet][href]:not([type]),script:not([type]),script[type="application/javascript"],script[type="text/javascript"],script[type="module"]');
+var d=0;n(c,function(a){h(a);D.Pa(a,b);a.setAttribute("import-dependency","");if("script"===a.localName&&!a.src&&a.textContent){if("module"===a.type)throw Error("Inline module scripts are not supported in HTML Imports.");a.setAttribute("src","data:text/javascript;charset=utf-8,"+encodeURIComponent(a.textContent+("\n//# sourceURL="+b+(d?"-"+d:"")+".js\n")));a.textContent="";d++}});return a};k.prototype.J=function(){var a=this;if(!this.b){this.c.disconnect();this.flatten(document);var b=!1,c=!1,d=function(){c&&
+b&&(a.loadImports(document),a.b||(a.c.observe(document.head,{childList:!0,subtree:!0}),a.Ta()))};this.Ya(function(){c=!0;d()});this.Xa(function(){b=!0;d()})}};k.prototype.flatten=function(a){var b=this;a=m(a,"link[rel=import]");n(a,function(a){var c=b.a[a.href];(a.__import=c)&&c.nodeType===Node.DOCUMENT_FRAGMENT_NODE&&(b.a[a.href]=a,a.readyState="loading",a.__import=a,b.flatten(c),a.appendChild(c))})};k.prototype.Xa=function(a){function b(e){if(e<d){var f=c[e],g=document.createElement("script");f.removeAttribute("import-dependency");
+n(f.attributes,function(a){return g.setAttribute(a.name,a.value)});ya=g;f.parentNode.replaceChild(g,f);h(g,function(){ya=null;b(e+1)})}else a()}var c=m(document,"script[import-dependency]"),d=c.length;b(0)};k.prototype.Ya=function(a){var b=m(document,"style[import-dependency],link[rel=stylesheet][import-dependency]"),d=b.length;if(d){var e=oa&&!!document.querySelector("link[rel=stylesheet][href][type=import-disable]");n(b,function(b){h(b,function(){b.removeAttribute("import-dependency");0===--d&&
+a()});if(e&&b.parentNode!==document.head){var f=document.createElement(b.localName);f.__appliedElement=b;f.setAttribute("type","import-placeholder");b.parentNode.insertBefore(f,b.nextSibling);for(f=c(b);f&&c(f);)f=c(f);f.parentNode!==document.head&&(f=null);document.head.insertBefore(b,f);b.removeAttribute("type")}})}else a()};k.prototype.Ta=function(){var a=this,b=m(document,"link[rel=import]");n(b,function(b){return a.i(b)},!0)};k.prototype.i=function(a){a.__loaded||(a.__loaded=!0,a.import&&(a.import.readyState=
+"complete"),a.dispatchEvent(b(a.import?"load":"error",{bubbles:!1,cancelable:!1,detail:void 0})))};k.prototype.Va=function(a){var b=this;n(a,function(a){return n(a.addedNodes,function(a){a&&a.nodeType===Node.ELEMENT_NODE&&(g(a)?b.o(a):b.loadImports(a))})})};var za=null;if(C)t=m(document,"link[rel=import]"),n(t,function(a){a.import&&"loading"===a.import.readyState||(a.__loaded=!0)}),t=function(a){a=a.target;g(a)&&(a.__loaded=!0)},document.addEventListener("load",t,!0),document.addEventListener("error",
+t,!0);else{var fa=Object.getOwnPropertyDescriptor(Node.prototype,"baseURI");Object.defineProperty((!fa||fa.configurable?Node:Element).prototype,"baseURI",{get:function(){var a=g(this)?this:c(this);return a?a.href:fa&&fa.get?fa.get.call(this):(document.querySelector("base")||window.location).href},configurable:!0,enumerable:!0});Object.defineProperty(HTMLLinkElement.prototype,"import",{get:function(){return this.__import||null},configurable:!0,enumerable:!0});e(function(){za=new k})}f(function(){return document.dispatchEvent(b("HTMLImportsLoaded",
+{cancelable:!0,bubbles:!0,detail:void 0}))});a.useNative=C;a.whenReady=f;a.importForElement=c;a.loadImports=function(a){za&&za.loadImports(a)}})(window.HTMLImports=window.HTMLImports||{});/*
 
-       case "DOMNodeInserted":
-        var changedNode = e.target;
-        var addedNodes, removedNodes;
-        if (e.type === "DOMNodeInserted") {
-          addedNodes = [ changedNode ];
-          removedNodes = [];
-        } else {
-          addedNodes = [];
-          removedNodes = [ changedNode ];
-        }
-        var previousSibling = changedNode.previousSibling;
-        var nextSibling = changedNode.nextSibling;
-        var record = getRecord("childList", e.target.parentNode);
-        record.addedNodes = addedNodes;
-        record.removedNodes = removedNodes;
-        record.previousSibling = previousSibling;
-        record.nextSibling = nextSibling;
-        forEachAncestorAndObserverEnqueueRecord(e.relatedNode, function(options) {
-          if (!options.childList) return;
-          return record;
-        });
-      }
-      clearRecords();
-    }
-  };
-  global.JsMutationObserver = JsMutationObserver;
-  if (!global.MutationObserver) {
-    global.MutationObserver = JsMutationObserver;
-    JsMutationObserver._isPolyfilled = true;
-  }
-})(self);
-
-(function() {
-  var needsTemplate = typeof HTMLTemplateElement === "undefined";
-  if (/Trident/.test(navigator.userAgent)) {
-    (function() {
-      var importNode = document.importNode;
-      document.importNode = function() {
-        var n = importNode.apply(document, arguments);
-        if (n.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-          var f = document.createDocumentFragment();
-          f.appendChild(n);
-          return f;
-        } else {
-          return n;
-        }
-      };
-    })();
-  }
-  var needsCloning = function() {
-    if (!needsTemplate) {
-      var t = document.createElement("template");
-      var t2 = document.createElement("template");
-      t2.content.appendChild(document.createElement("div"));
-      t.content.appendChild(t2);
-      var clone = t.cloneNode(true);
-      return clone.content.childNodes.length === 0 || clone.content.firstChild.content.childNodes.length === 0;
-    }
-  }();
-  var TEMPLATE_TAG = "template";
-  var TemplateImpl = function() {};
-  if (needsTemplate) {
-    var contentDoc = document.implementation.createHTMLDocument("template");
-    var canDecorate = true;
-    var templateStyle = document.createElement("style");
-    templateStyle.textContent = TEMPLATE_TAG + "{display:none;}";
-    var head = document.head;
-    head.insertBefore(templateStyle, head.firstElementChild);
-    TemplateImpl.prototype = Object.create(HTMLElement.prototype);
-    TemplateImpl.decorate = function(template) {
-      if (template.content) {
-        return;
-      }
-      template.content = contentDoc.createDocumentFragment();
-      var child;
-      while (child = template.firstChild) {
-        template.content.appendChild(child);
-      }
-      template.cloneNode = function(deep) {
-        return TemplateImpl.cloneNode(this, deep);
-      };
-      if (canDecorate) {
-        try {
-          Object.defineProperty(template, "innerHTML", {
-            get: function() {
-              var o = "";
-              for (var e = this.content.firstChild; e; e = e.nextSibling) {
-                o += e.outerHTML || escapeData(e.data);
-              }
-              return o;
-            },
-            set: function(text) {
-              contentDoc.body.innerHTML = text;
-              TemplateImpl.bootstrap(contentDoc);
-              while (this.content.firstChild) {
-                this.content.removeChild(this.content.firstChild);
-              }
-              while (contentDoc.body.firstChild) {
-                this.content.appendChild(contentDoc.body.firstChild);
-              }
-            },
-            configurable: true
-          });
-        } catch (err) {
-          canDecorate = false;
-        }
-      }
-      TemplateImpl.bootstrap(template.content);
-    };
-    TemplateImpl.bootstrap = function(doc) {
-      var templates = doc.querySelectorAll(TEMPLATE_TAG);
-      for (var i = 0, l = templates.length, t; i < l && (t = templates[i]); i++) {
-        TemplateImpl.decorate(t);
-      }
-    };
-    document.addEventListener("DOMContentLoaded", function() {
-      TemplateImpl.bootstrap(document);
-    });
-    var createElement = document.createElement;
-    document.createElement = function() {
-      "use strict";
-      var el = createElement.apply(document, arguments);
-      if (el.localName === "template") {
-        TemplateImpl.decorate(el);
-      }
-      return el;
-    };
-    var escapeDataRegExp = /[&\u00A0<>]/g;
-    function escapeReplace(c) {
-      switch (c) {
-       case "&":
-        return "&amp;";
-
-       case "<":
-        return "&lt;";
-
-       case ">":
-        return "&gt;";
-
-       case " ":
-        return "&nbsp;";
-      }
-    }
-    function escapeData(s) {
-      return s.replace(escapeDataRegExp, escapeReplace);
-    }
-  }
-  if (needsTemplate || needsCloning) {
-    var nativeCloneNode = Node.prototype.cloneNode;
-    TemplateImpl.cloneNode = function(template, deep) {
-      var clone = nativeCloneNode.call(template, false);
-      if (this.decorate) {
-        this.decorate(clone);
-      }
-      if (deep) {
-        clone.content.appendChild(nativeCloneNode.call(template.content, true));
-        this.fixClonedDom(clone.content, template.content);
-      }
-      return clone;
-    };
-    TemplateImpl.fixClonedDom = function(clone, source) {
-      if (!source.querySelectorAll) return;
-      var s$ = source.querySelectorAll(TEMPLATE_TAG);
-      var t$ = clone.querySelectorAll(TEMPLATE_TAG);
-      for (var i = 0, l = t$.length, t, s; i < l; i++) {
-        s = s$[i];
-        t = t$[i];
-        if (this.decorate) {
-          this.decorate(s);
-        }
-        t.parentNode.replaceChild(s.cloneNode(true), t);
-      }
-    };
-    var originalImportNode = document.importNode;
-    Node.prototype.cloneNode = function(deep) {
-      var dom = nativeCloneNode.call(this, deep);
-      if (deep) {
-        TemplateImpl.fixClonedDom(dom, this);
-      }
-      return dom;
-    };
-    document.importNode = function(element, deep) {
-      if (element.localName === TEMPLATE_TAG) {
-        return TemplateImpl.cloneNode(element, deep);
-      } else {
-        var dom = originalImportNode.call(document, element, deep);
-        if (deep) {
-          TemplateImpl.fixClonedDom(dom, element);
-        }
-        return dom;
-      }
-    };
-    if (needsCloning) {
-      HTMLTemplateElement.prototype.cloneNode = function(deep) {
-        return TemplateImpl.cloneNode(this, deep);
-      };
-    }
-  }
-  if (needsTemplate) {
-    window.HTMLTemplateElement = TemplateImpl;
-  }
-})();
-
-(function(scope) {
-  "use strict";
-  if (!window.performance) {
-    var start = Date.now();
-    window.performance = {
-      now: function() {
-        return Date.now() - start;
-      }
-    };
-  }
-  if (!window.requestAnimationFrame) {
-    window.requestAnimationFrame = function() {
-      var nativeRaf = window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame;
-      return nativeRaf ? function(callback) {
-        return nativeRaf(function() {
-          callback(performance.now());
-        });
-      } : function(callback) {
-        return window.setTimeout(callback, 1e3 / 60);
-      };
-    }();
-  }
-  if (!window.cancelAnimationFrame) {
-    window.cancelAnimationFrame = function() {
-      return window.webkitCancelAnimationFrame || window.mozCancelAnimationFrame || function(id) {
-        clearTimeout(id);
-      };
-    }();
-  }
-  var workingDefaultPrevented = function() {
-    var e = document.createEvent("Event");
-    e.initEvent("foo", true, true);
-    e.preventDefault();
-    return e.defaultPrevented;
-  }();
-  if (!workingDefaultPrevented) {
-    var origPreventDefault = Event.prototype.preventDefault;
-    Event.prototype.preventDefault = function() {
-      if (!this.cancelable) {
-        return;
-      }
-      origPreventDefault.call(this);
-      Object.defineProperty(this, "defaultPrevented", {
-        get: function() {
-          return true;
-        },
-        configurable: true
-      });
-    };
-  }
-  var isIE = /Trident/.test(navigator.userAgent);
-  if (!window.CustomEvent || isIE && typeof window.CustomEvent !== "function") {
-    window.CustomEvent = function(inType, params) {
-      params = params || {};
-      var e = document.createEvent("CustomEvent");
-      e.initCustomEvent(inType, Boolean(params.bubbles), Boolean(params.cancelable), params.detail);
-      return e;
-    };
-    window.CustomEvent.prototype = window.Event.prototype;
-  }
-  if (!window.Event || isIE && typeof window.Event !== "function") {
-    var origEvent = window.Event;
-    window.Event = function(inType, params) {
-      params = params || {};
-      var e = document.createEvent("Event");
-      e.initEvent(inType, Boolean(params.bubbles), Boolean(params.cancelable));
-      return e;
-    };
-    window.Event.prototype = origEvent.prototype;
-  }
-})(window.WebComponents);
-
-window.HTMLImports = window.HTMLImports || {
-  flags: {}
-};
+ Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ Code distributed by Google as part of the polymer project is also
+ subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+window.WebComponents=window.WebComponents||{flags:{}};var mb=document.querySelector('script[src*="webcomponents-lite.js"]'),nb=/wc-(.+)/,v={};if(!v.noOpts){location.search.slice(1).split("&").forEach(function(a){a=a.split("=");var b;a[0]&&(b=a[0].match(nb))&&(v[b[1]]=a[1]||!0)});if(mb)for(var ob=0,pb;pb=mb.attributes[ob];ob++)"src"!==pb.name&&(v[pb.name]=pb.value||!0);if(v.log&&v.log.split){var ub=v.log.split(",");v.log={};ub.forEach(function(a){v.log[a]=!0})}else v.log={}}
+window.WebComponents.flags=v;var vb=v.shadydom;vb&&(window.ShadyDOM=window.ShadyDOM||{},window.ShadyDOM.force=vb);var wb=v.register||v.ce;wb&&window.customElements&&(window.customElements.forcePolyfill=wb);/*
 
-(function(scope) {
-  var IMPORT_LINK_TYPE = "import";
-  var useNative = Boolean(IMPORT_LINK_TYPE in document.createElement("link"));
-  var hasShadowDOMPolyfill = Boolean(window.ShadowDOMPolyfill);
-  var wrap = function(node) {
-    return hasShadowDOMPolyfill ? window.ShadowDOMPolyfill.wrapIfNeeded(node) : node;
-  };
-  var rootDocument = wrap(document);
-  var currentScriptDescriptor = {
-    get: function() {
-      var script = window.HTMLImports.currentScript || document.currentScript || (document.readyState !== "complete" ? document.scripts[document.scripts.length - 1] : null);
-      return wrap(script);
-    },
-    configurable: true
-  };
-  Object.defineProperty(document, "_currentScript", currentScriptDescriptor);
-  Object.defineProperty(rootDocument, "_currentScript", currentScriptDescriptor);
-  var isIE = /Trident/.test(navigator.userAgent);
-  function whenReady(callback, doc) {
-    doc = doc || rootDocument;
-    whenDocumentReady(function() {
-      watchImportsLoad(callback, doc);
-    }, doc);
-  }
-  var requiredReadyState = isIE ? "complete" : "interactive";
-  var READY_EVENT = "readystatechange";
-  function isDocumentReady(doc) {
-    return doc.readyState === "complete" || doc.readyState === requiredReadyState;
-  }
-  function whenDocumentReady(callback, doc) {
-    if (!isDocumentReady(doc)) {
-      var checkReady = function() {
-        if (doc.readyState === "complete" || doc.readyState === requiredReadyState) {
-          doc.removeEventListener(READY_EVENT, checkReady);
-          whenDocumentReady(callback, doc);
-        }
-      };
-      doc.addEventListener(READY_EVENT, checkReady);
-    } else if (callback) {
-      callback();
-    }
-  }
-  function markTargetLoaded(event) {
-    event.target.__loaded = true;
-  }
-  function watchImportsLoad(callback, doc) {
-    var imports = doc.querySelectorAll("link[rel=import]");
-    var parsedCount = 0, importCount = imports.length, newImports = [], errorImports = [];
-    function checkDone() {
-      if (parsedCount == importCount && callback) {
-        callback({
-          allImports: imports,
-          loadedImports: newImports,
-          errorImports: errorImports
-        });
-      }
-    }
-    function loadedImport(e) {
-      markTargetLoaded(e);
-      newImports.push(this);
-      parsedCount++;
-      checkDone();
-    }
-    function errorLoadingImport(e) {
-      errorImports.push(this);
-      parsedCount++;
-      checkDone();
-    }
-    if (importCount) {
-      for (var i = 0, imp; i < importCount && (imp = imports[i]); i++) {
-        if (isImportLoaded(imp)) {
-          newImports.push(this);
-          parsedCount++;
-          checkDone();
-        } else {
-          imp.addEventListener("load", loadedImport);
-          imp.addEventListener("error", errorLoadingImport);
-        }
-      }
-    } else {
-      checkDone();
-    }
-  }
-  function isImportLoaded(link) {
-    return useNative ? link.__loaded || link.import && link.import.readyState !== "loading" : link.__importParsed;
-  }
-  if (useNative) {
-    new MutationObserver(function(mxns) {
-      for (var i = 0, l = mxns.length, m; i < l && (m = mxns[i]); i++) {
-        if (m.addedNodes) {
-          handleImports(m.addedNodes);
-        }
-      }
-    }).observe(document.head, {
-      childList: true
-    });
-    function handleImports(nodes) {
-      for (var i = 0, l = nodes.length, n; i < l && (n = nodes[i]); i++) {
-        if (isImport(n)) {
-          handleImport(n);
-        }
-      }
-    }
-    function isImport(element) {
-      return element.localName === "link" && element.rel === "import";
-    }
-    function handleImport(element) {
-      var loaded = element.import;
-      if (loaded) {
-        markTargetLoaded({
-          target: element
-        });
-      } else {
-        element.addEventListener("load", markTargetLoaded);
-        element.addEventListener("error", markTargetLoaded);
-      }
-    }
-    (function() {
-      if (document.readyState === "loading") {
-        var imports = document.querySelectorAll("link[rel=import]");
-        for (var i = 0, l = imports.length, imp; i < l && (imp = imports[i]); i++) {
-          handleImport(imp);
-        }
-      }
-    })();
-  }
-  whenReady(function(detail) {
-    window.HTMLImports.ready = true;
-    window.HTMLImports.readyTime = new Date().getTime();
-    var evt = rootDocument.createEvent("CustomEvent");
-    evt.initCustomEvent("HTMLImportsLoaded", true, true, detail);
-    rootDocument.dispatchEvent(evt);
-  });
-  scope.IMPORT_LINK_TYPE = IMPORT_LINK_TYPE;
-  scope.useNative = useNative;
-  scope.rootDocument = rootDocument;
-  scope.whenReady = whenReady;
-  scope.isIE = isIE;
-})(window.HTMLImports);
-
-(function(scope) {
-  var modules = [];
-  var addModule = function(module) {
-    modules.push(module);
-  };
-  var initializeModules = function() {
-    modules.forEach(function(module) {
-      module(scope);
-    });
-  };
-  scope.addModule = addModule;
-  scope.initializeModules = initializeModules;
-})(window.HTMLImports);
-
-window.HTMLImports.addModule(function(scope) {
-  var CSS_URL_REGEXP = /(url\()([^)]*)(\))/g;
-  var CSS_IMPORT_REGEXP = /(@import[\s]+(?!url\())([^;]*)(;)/g;
-  var path = {
-    resolveUrlsInStyle: function(style, linkUrl) {
-      var doc = style.ownerDocument;
-      var resolver = doc.createElement("a");
-      style.textContent = this.resolveUrlsInCssText(style.textContent, linkUrl, resolver);
-      return style;
-    },
-    resolveUrlsInCssText: function(cssText, linkUrl, urlObj) {
-      var r = this.replaceUrls(cssText, urlObj, linkUrl, CSS_URL_REGEXP);
-      r = this.replaceUrls(r, urlObj, linkUrl, CSS_IMPORT_REGEXP);
-      return r;
-    },
-    replaceUrls: function(text, urlObj, linkUrl, regexp) {
-      return text.replace(regexp, function(m, pre, url, post) {
-        var urlPath = url.replace(/["']/g, "");
-        if (linkUrl) {
-          urlPath = new URL(urlPath, linkUrl).href;
-        }
-        urlObj.href = urlPath;
-        urlPath = urlObj.href;
-        return pre + "'" + urlPath + "'" + post;
-      });
-    }
-  };
-  scope.path = path;
-});
-
-window.HTMLImports.addModule(function(scope) {
-  var xhr = {
-    async: true,
-    ok: function(request) {
-      return request.status >= 200 && request.status < 300 || request.status === 304 || request.status === 0;
-    },
-    load: function(url, next, nextContext) {
-      var request = new XMLHttpRequest();
-      if (scope.flags.debug || scope.flags.bust) {
-        url += "?" + Math.random();
-      }
-      request.open("GET", url, xhr.async);
-      request.addEventListener("readystatechange", function(e) {
-        if (request.readyState === 4) {
-          var redirectedUrl = null;
-          try {
-            var locationHeader = request.getResponseHeader("Location");
-            if (locationHeader) {
-              redirectedUrl = locationHeader.substr(0, 1) === "/" ? location.origin + locationHeader : locationHeader;
-            }
-          } catch (e) {
-            console.error(e.message);
-          }
-          next.call(nextContext, !xhr.ok(request) && request, request.response || request.responseText, redirectedUrl);
-        }
-      });
-      request.send();
-      return request;
-    },
-    loadDocument: function(url, next, nextContext) {
-      this.load(url, next, nextContext).responseType = "document";
-    }
-  };
-  scope.xhr = xhr;
-});
-
-window.HTMLImports.addModule(function(scope) {
-  var xhr = scope.xhr;
-  var flags = scope.flags;
-  var Loader = function(onLoad, onComplete) {
-    this.cache = {};
-    this.onload = onLoad;
-    this.oncomplete = onComplete;
-    this.inflight = 0;
-    this.pending = {};
-  };
-  Loader.prototype = {
-    addNodes: function(nodes) {
-      this.inflight += nodes.length;
-      for (var i = 0, l = nodes.length, n; i < l && (n = nodes[i]); i++) {
-        this.require(n);
-      }
-      this.checkDone();
-    },
-    addNode: function(node) {
-      this.inflight++;
-      this.require(node);
-      this.checkDone();
-    },
-    require: function(elt) {
-      var url = elt.src || elt.href;
-      elt.__nodeUrl = url;
-      if (!this.dedupe(url, elt)) {
-        this.fetch(url, elt);
-      }
-    },
-    dedupe: function(url, elt) {
-      if (this.pending[url]) {
-        this.pending[url].push(elt);
-        return true;
-      }
-      var resource;
-      if (this.cache[url]) {
-        this.onload(url, elt, this.cache[url]);
-        this.tail();
-        return true;
-      }
-      this.pending[url] = [ elt ];
-      return false;
-    },
-    fetch: function(url, elt) {
-      flags.load && console.log("fetch", url, elt);
-      if (!url) {
-        setTimeout(function() {
-          this.receive(url, elt, {
-            error: "href must be specified"
-          }, null);
-        }.bind(this), 0);
-      } else if (url.match(/^data:/)) {
-        var pieces = url.split(",");
-        var header = pieces[0];
-        var body = pieces[1];
-        if (header.indexOf(";base64") > -1) {
-          body = atob(body);
-        } else {
-          body = decodeURIComponent(body);
-        }
-        setTimeout(function() {
-          this.receive(url, elt, null, body);
-        }.bind(this), 0);
-      } else {
-        var receiveXhr = function(err, resource, redirectedUrl) {
-          this.receive(url, elt, err, resource, redirectedUrl);
-        }.bind(this);
-        xhr.load(url, receiveXhr);
-      }
-    },
-    receive: function(url, elt, err, resource, redirectedUrl) {
-      this.cache[url] = resource;
-      var $p = this.pending[url];
-      for (var i = 0, l = $p.length, p; i < l && (p = $p[i]); i++) {
-        this.onload(url, p, resource, err, redirectedUrl);
-        this.tail();
-      }
-      this.pending[url] = null;
-    },
-    tail: function() {
-      --this.inflight;
-      this.checkDone();
-    },
-    checkDone: function() {
-      if (!this.inflight) {
-        this.oncomplete();
-      }
-    }
-  };
-  scope.Loader = Loader;
-});
-
-window.HTMLImports.addModule(function(scope) {
-  var Observer = function(addCallback) {
-    this.addCallback = addCallback;
-    this.mo = new MutationObserver(this.handler.bind(this));
-  };
-  Observer.prototype = {
-    handler: function(mutations) {
-      for (var i = 0, l = mutations.length, m; i < l && (m = mutations[i]); i++) {
-        if (m.type === "childList" && m.addedNodes.length) {
-          this.addedNodes(m.addedNodes);
-        }
-      }
-    },
-    addedNodes: function(nodes) {
-      if (this.addCallback) {
-        this.addCallback(nodes);
-      }
-      for (var i = 0, l = nodes.length, n, loading; i < l && (n = nodes[i]); i++) {
-        if (n.children && n.children.length) {
-          this.addedNodes(n.children);
-        }
-      }
-    },
-    observe: function(root) {
-      this.mo.observe(root, {
-        childList: true,
-        subtree: true
-      });
-    }
-  };
-  scope.Observer = Observer;
-});
-
-window.HTMLImports.addModule(function(scope) {
-  var path = scope.path;
-  var rootDocument = scope.rootDocument;
-  var flags = scope.flags;
-  var isIE = scope.isIE;
-  var IMPORT_LINK_TYPE = scope.IMPORT_LINK_TYPE;
-  var IMPORT_SELECTOR = "link[rel=" + IMPORT_LINK_TYPE + "]";
-  var importParser = {
-    documentSelectors: IMPORT_SELECTOR,
-    importsSelectors: [ IMPORT_SELECTOR, "link[rel=stylesheet]:not([type])", "style:not([type])", "script:not([type])", 'script[type="application/javascript"]', 'script[type="text/javascript"]' ].join(","),
-    map: {
-      link: "parseLink",
-      script: "parseScript",
-      style: "parseStyle"
-    },
-    dynamicElements: [],
-    parseNext: function() {
-      var next = this.nextToParse();
-      if (next) {
-        this.parse(next);
-      }
-    },
-    parse: function(elt) {
-      if (this.isParsed(elt)) {
-        flags.parse && console.log("[%s] is already parsed", elt.localName);
-        return;
-      }
-      var fn = this[this.map[elt.localName]];
-      if (fn) {
-        this.markParsing(elt);
-        fn.call(this, elt);
-      }
-    },
-    parseDynamic: function(elt, quiet) {
-      this.dynamicElements.push(elt);
-      if (!quiet) {
-        this.parseNext();
-      }
-    },
-    markParsing: function(elt) {
-      flags.parse && console.log("parsing", elt);
-      this.parsingElement = elt;
-    },
-    markParsingComplete: function(elt) {
-      elt.__importParsed = true;
-      this.markDynamicParsingComplete(elt);
-      if (elt.__importElement) {
-        elt.__importElement.__importParsed = true;
-        this.markDynamicParsingComplete(elt.__importElement);
-      }
-      this.parsingElement = null;
-      flags.parse && console.log("completed", elt);
-    },
-    markDynamicParsingComplete: function(elt) {
-      var i = this.dynamicElements.indexOf(elt);
-      if (i >= 0) {
-        this.dynamicElements.splice(i, 1);
-      }
-    },
-    parseImport: function(elt) {
-      elt.import = elt.__doc;
-      if (window.HTMLImports.__importsParsingHook) {
-        window.HTMLImports.__importsParsingHook(elt);
-      }
-      if (elt.import) {
-        elt.import.__importParsed = true;
-      }
-      this.markParsingComplete(elt);
-      if (elt.__resource && !elt.__error) {
-        elt.dispatchEvent(new CustomEvent("load", {
-          bubbles: false
-        }));
-      } else {
-        elt.dispatchEvent(new CustomEvent("error", {
-          bubbles: false
-        }));
-      }
-      if (elt.__pending) {
-        var fn;
-        while (elt.__pending.length) {
-          fn = elt.__pending.shift();
-          if (fn) {
-            fn({
-              target: elt
-            });
-          }
-        }
-      }
-      this.parseNext();
-    },
-    parseLink: function(linkElt) {
-      if (nodeIsImport(linkElt)) {
-        this.parseImport(linkElt);
-      } else {
-        linkElt.href = linkElt.href;
-        this.parseGeneric(linkElt);
-      }
-    },
-    parseStyle: function(elt) {
-      var src = elt;
-      elt = cloneStyle(elt);
-      src.__appliedElement = elt;
-      elt.__importElement = src;
-      this.parseGeneric(elt);
-    },
-    parseGeneric: function(elt) {
-      this.trackElement(elt);
-      this.addElementToDocument(elt);
-    },
-    rootImportForElement: function(elt) {
-      var n = elt;
-      while (n.ownerDocument.__importLink) {
-        n = n.ownerDocument.__importLink;
-      }
-      return n;
-    },
-    addElementToDocument: function(elt) {
-      var port = this.rootImportForElement(elt.__importElement || elt);
-      port.parentNode.insertBefore(elt, port);
-    },
-    trackElement: function(elt, callback) {
-      var self = this;
-      var done = function(e) {
-        elt.removeEventListener("load", done);
-        elt.removeEventListener("error", done);
-        if (callback) {
-          callback(e);
-        }
-        self.markParsingComplete(elt);
-        self.parseNext();
-      };
-      elt.addEventListener("load", done);
-      elt.addEventListener("error", done);
-      if (isIE && elt.localName === "style") {
-        var fakeLoad = false;
-        if (elt.textContent.indexOf("@import") == -1) {
-          fakeLoad = true;
-        } else if (elt.sheet) {
-          fakeLoad = true;
-          var csr = elt.sheet.cssRules;
-          var len = csr ? csr.length : 0;
-          for (var i = 0, r; i < len && (r = csr[i]); i++) {
-            if (r.type === CSSRule.IMPORT_RULE) {
-              fakeLoad = fakeLoad && Boolean(r.styleSheet);
-            }
-          }
-        }
-        if (fakeLoad) {
-          setTimeout(function() {
-            elt.dispatchEvent(new CustomEvent("load", {
-              bubbles: false
-            }));
-          });
-        }
-      }
-    },
-    parseScript: function(scriptElt) {
-      var script = document.createElement("script");
-      script.__importElement = scriptElt;
-      script.src = scriptElt.src ? scriptElt.src : generateScriptDataUrl(scriptElt);
-      scope.currentScript = scriptElt;
-      this.trackElement(script, function(e) {
-        if (script.parentNode) {
-          script.parentNode.removeChild(script);
-        }
-        scope.currentScript = null;
-      });
-      this.addElementToDocument(script);
-    },
-    nextToParse: function() {
-      this._mayParse = [];
-      return !this.parsingElement && (this.nextToParseInDoc(rootDocument) || this.nextToParseDynamic());
-    },
-    nextToParseInDoc: function(doc, link) {
-      if (doc && this._mayParse.indexOf(doc) < 0) {
-        this._mayParse.push(doc);
-        var nodes = doc.querySelectorAll(this.parseSelectorsForNode(doc));
-        for (var i = 0, l = nodes.length, n; i < l && (n = nodes[i]); i++) {
-          if (!this.isParsed(n)) {
-            if (this.hasResource(n)) {
-              return nodeIsImport(n) ? this.nextToParseInDoc(n.__doc, n) : n;
-            } else {
-              return;
-            }
-          }
-        }
-      }
-      return link;
-    },
-    nextToParseDynamic: function() {
-      return this.dynamicElements[0];
-    },
-    parseSelectorsForNode: function(node) {
-      var doc = node.ownerDocument || node;
-      return doc === rootDocument ? this.documentSelectors : this.importsSelectors;
-    },
-    isParsed: function(node) {
-      return node.__importParsed;
-    },
-    needsDynamicParsing: function(elt) {
-      return this.dynamicElements.indexOf(elt) >= 0;
-    },
-    hasResource: function(node) {
-      if (nodeIsImport(node) && node.__doc === undefined) {
-        return false;
-      }
-      return true;
-    }
-  };
-  function nodeIsImport(elt) {
-    return elt.localName === "link" && elt.rel === IMPORT_LINK_TYPE;
-  }
-  function generateScriptDataUrl(script) {
-    var scriptContent = generateScriptContent(script);
-    return "data:text/javascript;charset=utf-8," + encodeURIComponent(scriptContent);
-  }
-  function generateScriptContent(script) {
-    return script.textContent + generateSourceMapHint(script);
-  }
-  function generateSourceMapHint(script) {
-    var owner = script.ownerDocument;
-    owner.__importedScripts = owner.__importedScripts || 0;
-    var moniker = script.ownerDocument.baseURI;
-    var num = owner.__importedScripts ? "-" + owner.__importedScripts : "";
-    owner.__importedScripts++;
-    return "\n//# sourceURL=" + moniker + num + ".js\n";
-  }
-  function cloneStyle(style) {
-    var clone = style.ownerDocument.createElement("style");
-    clone.textContent = style.textContent;
-    path.resolveUrlsInStyle(clone);
-    return clone;
-  }
-  scope.parser = importParser;
-  scope.IMPORT_SELECTOR = IMPORT_SELECTOR;
-});
+Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+function xb(){this.ya=this.root=null;this.Z=!1;this.D=this.U=this.la=this.assignedSlot=this.assignedNodes=this.K=null;this.childNodes=this.nextSibling=this.previousSibling=this.lastChild=this.firstChild=this.parentNode=this.N=void 0;this.Da=this.ta=!1;this.S={}}xb.prototype.toJSON=function(){return{}};function w(a){a.fa||(a.fa=new xb);return a.fa}function x(a){return a&&a.fa};var y=window.ShadyDOM||{};y.Ra=!(!Element.prototype.attachShadow||!Node.prototype.getRootNode);var yb=Object.getOwnPropertyDescriptor(Node.prototype,"firstChild");y.w=!!(yb&&yb.configurable&&yb.get);y.na=y.force||!y.Ra;var zb=navigator.userAgent.match("Trident"),Ab=navigator.userAgent.match("Edge");void 0===y.Ba&&(y.Ba=y.w&&(zb||Ab));function Bb(a){return(a=x(a))&&void 0!==a.firstChild}function z(a){return"ShadyRoot"===a.La}function Cb(a){a=a.getRootNode();if(z(a))return a}
+var Db=Element.prototype,Eb=Db.matches||Db.matchesSelector||Db.mozMatchesSelector||Db.msMatchesSelector||Db.oMatchesSelector||Db.webkitMatchesSelector;function Fb(a,b){if(a&&b)for(var c=Object.getOwnPropertyNames(b),d=0,e;d<c.length&&(e=c[d]);d++){var f=Object.getOwnPropertyDescriptor(b,e);f&&Object.defineProperty(a,e,f)}}function Gb(a,b){for(var c=[],d=1;d<arguments.length;++d)c[d-1]=arguments[d];for(d=0;d<c.length;d++)Fb(a,c[d]);return a}function Hb(a,b){for(var c in b)a[c]=b[c]}
+var Ib=document.createTextNode(""),Jb=0,Kb=[];(new MutationObserver(function(){for(;Kb.length;)try{Kb.shift()()}catch(a){throw Ib.textContent=Jb++,a;}})).observe(Ib,{characterData:!0});function Lb(a){Kb.push(a);Ib.textContent=Jb++}var Mb=!!document.contains;function Nb(a,b){for(;b;){if(b==a)return!0;b=b.parentNode}return!1}
+function Ob(a){for(var b=a.length-1;0<=b;b--){var c=a[b],d=c.getAttribute("id")||c.getAttribute("name");d&&"length"!==d&&isNaN(d)&&(a[d]=c)}a.item=function(b){return a[b]};a.namedItem=function(b){if("length"!==b&&isNaN(b)&&a[b])return a[b];for(var c=ma(a),d=c.next();!d.done;d=c.next())if(d=d.value,(d.getAttribute("id")||d.getAttribute("name"))==b)return d;return null};return a};var Pb=[],Qb;function Rb(a){Qb||(Qb=!0,Lb(Sb));Pb.push(a)}function Sb(){Qb=!1;for(var a=!!Pb.length;Pb.length;)Pb.shift()();return a}Sb.list=Pb;function Tb(){this.a=!1;this.addedNodes=[];this.removedNodes=[];this.Y=new Set}function Ub(a){a.a||(a.a=!0,Lb(function(){Vb(a)}))}function Vb(a){if(a.a){a.a=!1;var b=a.takeRecords();b.length&&a.Y.forEach(function(a){a(b)})}}Tb.prototype.takeRecords=function(){if(this.addedNodes.length||this.removedNodes.length){var a=[{addedNodes:this.addedNodes,removedNodes:this.removedNodes}];this.addedNodes=[];this.removedNodes=[];return a}return[]};
+function Wb(a,b){var c=w(a);c.K||(c.K=new Tb);c.K.Y.add(b);var d=c.K;return{Ia:b,H:d,Ma:a,takeRecords:function(){return d.takeRecords()}}}function Xb(a){var b=a&&a.H;b&&(b.Y.delete(a.Ia),b.Y.size||(w(a.Ma).K=null))}
+function Yb(a,b){var c=b.getRootNode();return a.map(function(a){var b=c===a.target.getRootNode();if(b&&a.addedNodes){if(b=Array.from(a.addedNodes).filter(function(a){return c===a.getRootNode()}),b.length)return a=Object.create(a),Object.defineProperty(a,"addedNodes",{value:b,configurable:!0}),a}else if(b)return a}).filter(function(a){return a})};var A={},Zb=Element.prototype.insertBefore,$b=Element.prototype.replaceChild,ac=Element.prototype.removeChild,bc=Element.prototype.setAttribute,cc=Element.prototype.removeAttribute,dc=Element.prototype.cloneNode,ec=Document.prototype.importNode,fc=Element.prototype.addEventListener,gc=Element.prototype.removeEventListener,hc=Window.prototype.addEventListener,ic=Window.prototype.removeEventListener,jc=Element.prototype.dispatchEvent,kc=Node.prototype.contains||HTMLElement.prototype.contains,lc=Document.prototype.getElementById,
+mc=Element.prototype.querySelector,nc=DocumentFragment.prototype.querySelector,oc=Document.prototype.querySelector,pc=Element.prototype.querySelectorAll,qc=DocumentFragment.prototype.querySelectorAll,rc=Document.prototype.querySelectorAll;A.appendChild=Element.prototype.appendChild;A.insertBefore=Zb;A.replaceChild=$b;A.removeChild=ac;A.setAttribute=bc;A.removeAttribute=cc;A.cloneNode=dc;A.importNode=ec;A.addEventListener=fc;A.removeEventListener=gc;A.fb=hc;A.gb=ic;A.dispatchEvent=jc;A.contains=kc;
+A.getElementById=lc;A.pb=mc;A.sb=nc;A.nb=oc;A.querySelector=function(a){switch(this.nodeType){case Node.ELEMENT_NODE:return mc.call(this,a);case Node.DOCUMENT_NODE:return oc.call(this,a);default:return nc.call(this,a)}};A.qb=pc;A.tb=qc;A.ob=rc;A.querySelectorAll=function(a){switch(this.nodeType){case Node.ELEMENT_NODE:return pc.call(this,a);case Node.DOCUMENT_NODE:return rc.call(this,a);default:return qc.call(this,a)}};var sc=/[&\u00A0"]/g,tc=/[&\u00A0<>]/g;function uc(a){switch(a){case "&":return"&amp;";case "<":return"&lt;";case ">":return"&gt;";case '"':return"&quot;";case "\u00a0":return"&nbsp;"}}function vc(a){for(var b={},c=0;c<a.length;c++)b[a[c]]=!0;return b}var wc=vc("area base br col command embed hr img input keygen link meta param source track wbr".split(" ")),xc=vc("style script xmp iframe noembed noframes plaintext noscript".split(" "));
+function yc(a,b){"template"===a.localName&&(a=a.content);for(var c="",d=b?b(a):a.childNodes,e=0,f=d.length,h;e<f&&(h=d[e]);e++){a:{var g=h;var k=a;var l=b;switch(g.nodeType){case Node.ELEMENT_NODE:for(var m=g.localName,n="<"+m,t=g.attributes,C=0;k=t[C];C++)n+=" "+k.name+'="'+k.value.replace(sc,uc)+'"';n+=">";g=wc[m]?n:n+yc(g,l)+"</"+m+">";break a;case Node.TEXT_NODE:g=g.data;g=k&&xc[k.localName]?g:g.replace(tc,uc);break a;case Node.COMMENT_NODE:g="\x3c!--"+g.data+"--\x3e";break a;default:throw window.console.error(g),
+Error("not implemented");}}c+=g}return c};var B={},E=document.createTreeWalker(document,NodeFilter.SHOW_ALL,null,!1),F=document.createTreeWalker(document,NodeFilter.SHOW_ELEMENT,null,!1);function zc(a){var b=[];E.currentNode=a;for(a=E.firstChild();a;)b.push(a),a=E.nextSibling();return b}B.parentNode=function(a){E.currentNode=a;return E.parentNode()};B.firstChild=function(a){E.currentNode=a;return E.firstChild()};B.lastChild=function(a){E.currentNode=a;return E.lastChild()};B.previousSibling=function(a){E.currentNode=a;return E.previousSibling()};
+B.nextSibling=function(a){E.currentNode=a;return E.nextSibling()};B.childNodes=zc;B.parentElement=function(a){F.currentNode=a;return F.parentNode()};B.firstElementChild=function(a){F.currentNode=a;return F.firstChild()};B.lastElementChild=function(a){F.currentNode=a;return F.lastChild()};B.previousElementSibling=function(a){F.currentNode=a;return F.previousSibling()};B.nextElementSibling=function(a){F.currentNode=a;return F.nextSibling()};
+B.children=function(a){var b=[];F.currentNode=a;for(a=F.firstChild();a;)b.push(a),a=F.nextSibling();return Ob(b)};B.innerHTML=function(a){return yc(a,function(a){return zc(a)})};B.textContent=function(a){switch(a.nodeType){case Node.ELEMENT_NODE:case Node.DOCUMENT_FRAGMENT_NODE:a=document.createTreeWalker(a,NodeFilter.SHOW_TEXT,null,!1);for(var b="",c;c=a.nextNode();)b+=c.nodeValue;return b;default:return a.nodeValue}};var G={},Ac=y.w,Bc=[Node.prototype,Element.prototype,HTMLElement.prototype];function H(a){var b;a:{for(b=0;b<Bc.length;b++){var c=Bc[b];if(c.hasOwnProperty(a)){b=c;break a}}b=void 0}if(!b)throw Error("Could not find descriptor for "+a);return Object.getOwnPropertyDescriptor(b,a)}
+var I=Ac?{parentNode:H("parentNode"),firstChild:H("firstChild"),lastChild:H("lastChild"),previousSibling:H("previousSibling"),nextSibling:H("nextSibling"),childNodes:H("childNodes"),parentElement:H("parentElement"),previousElementSibling:H("previousElementSibling"),nextElementSibling:H("nextElementSibling"),innerHTML:H("innerHTML"),textContent:H("textContent"),firstElementChild:H("firstElementChild"),lastElementChild:H("lastElementChild"),children:H("children")}:{},Cc=Ac?{firstElementChild:Object.getOwnPropertyDescriptor(DocumentFragment.prototype,
+"firstElementChild"),lastElementChild:Object.getOwnPropertyDescriptor(DocumentFragment.prototype,"lastElementChild"),children:Object.getOwnPropertyDescriptor(DocumentFragment.prototype,"children")}:{},Dc=Ac?{firstElementChild:Object.getOwnPropertyDescriptor(Document.prototype,"firstElementChild"),lastElementChild:Object.getOwnPropertyDescriptor(Document.prototype,"lastElementChild"),children:Object.getOwnPropertyDescriptor(Document.prototype,"children")}:{};G.xa=I;G.rb=Cc;G.mb=Dc;G.parentNode=function(a){return I.parentNode.get.call(a)};
+G.firstChild=function(a){return I.firstChild.get.call(a)};G.lastChild=function(a){return I.lastChild.get.call(a)};G.previousSibling=function(a){return I.previousSibling.get.call(a)};G.nextSibling=function(a){return I.nextSibling.get.call(a)};G.childNodes=function(a){return Array.prototype.slice.call(I.childNodes.get.call(a))};G.parentElement=function(a){return I.parentElement.get.call(a)};G.previousElementSibling=function(a){return I.previousElementSibling.get.call(a)};G.nextElementSibling=function(a){return I.nextElementSibling.get.call(a)};
+G.innerHTML=function(a){return I.innerHTML.get.call(a)};G.textContent=function(a){return I.textContent.get.call(a)};G.children=function(a){switch(a.nodeType){case Node.DOCUMENT_FRAGMENT_NODE:return Cc.children.get.call(a);case Node.DOCUMENT_NODE:return Dc.children.get.call(a);default:return I.children.get.call(a)}};
+G.firstElementChild=function(a){switch(a.nodeType){case Node.DOCUMENT_FRAGMENT_NODE:return Cc.firstElementChild.get.call(a);case Node.DOCUMENT_NODE:return Dc.firstElementChild.get.call(a);default:return I.firstElementChild.get.call(a)}};G.lastElementChild=function(a){switch(a.nodeType){case Node.DOCUMENT_FRAGMENT_NODE:return Cc.lastElementChild.get.call(a);case Node.DOCUMENT_NODE:return Dc.lastElementChild.get.call(a);default:return I.lastElementChild.get.call(a)}};var J=y.Ba?G:B;function Ec(a){for(;a.firstChild;)a.removeChild(a.firstChild)}
+var Fc=y.w,Gc=document.implementation.createHTMLDocument("inert"),Hc=Object.getOwnPropertyDescriptor(Node.prototype,"isConnected"),Ic=Hc&&Hc.get,Jc=Object.getOwnPropertyDescriptor(Document.prototype,"activeElement"),Mc={parentElement:{get:function(){var a=x(this);(a=a&&a.parentNode)&&a.nodeType!==Node.ELEMENT_NODE&&(a=null);return void 0!==a?a:J.parentElement(this)},configurable:!0},parentNode:{get:function(){var a=x(this);a=a&&a.parentNode;return void 0!==a?a:J.parentNode(this)},configurable:!0},
+nextSibling:{get:function(){var a=x(this);a=a&&a.nextSibling;return void 0!==a?a:J.nextSibling(this)},configurable:!0},previousSibling:{get:function(){var a=x(this);a=a&&a.previousSibling;return void 0!==a?a:J.previousSibling(this)},configurable:!0},nextElementSibling:{get:function(){var a=x(this);if(a&&void 0!==a.nextSibling){for(a=this.nextSibling;a&&a.nodeType!==Node.ELEMENT_NODE;)a=a.nextSibling;return a}return J.nextElementSibling(this)},configurable:!0},previousElementSibling:{get:function(){var a=
+x(this);if(a&&void 0!==a.previousSibling){for(a=this.previousSibling;a&&a.nodeType!==Node.ELEMENT_NODE;)a=a.previousSibling;return a}return J.previousElementSibling(this)},configurable:!0}},Nc={className:{get:function(){return this.getAttribute("class")||""},set:function(a){this.setAttribute("class",a)},configurable:!0}},Oc={childNodes:{get:function(){if(Bb(this)){var a=x(this);if(!a.childNodes){a.childNodes=[];for(var b=this.firstChild;b;b=b.nextSibling)a.childNodes.push(b)}var c=a.childNodes}else c=
+J.childNodes(this);c.item=function(a){return c[a]};return c},configurable:!0},childElementCount:{get:function(){return this.children.length},configurable:!0},firstChild:{get:function(){var a=x(this);a=a&&a.firstChild;return void 0!==a?a:J.firstChild(this)},configurable:!0},lastChild:{get:function(){var a=x(this);a=a&&a.lastChild;return void 0!==a?a:J.lastChild(this)},configurable:!0},textContent:{get:function(){if(Bb(this)){for(var a=[],b=0,c=this.childNodes,d;d=c[b];b++)d.nodeType!==Node.COMMENT_NODE&&
+a.push(d.textContent);return a.join("")}return J.textContent(this)},set:function(a){if("undefined"===typeof a||null===a)a="";switch(this.nodeType){case Node.ELEMENT_NODE:case Node.DOCUMENT_FRAGMENT_NODE:if(!Bb(this)&&Fc){var b=this.firstChild;(b!=this.lastChild||b&&b.nodeType!=Node.TEXT_NODE)&&Ec(this);G.xa.textContent.set.call(this,a)}else Ec(this),(0<a.length||this.nodeType===Node.ELEMENT_NODE)&&this.appendChild(document.createTextNode(a));break;default:this.nodeValue=a}},configurable:!0},firstElementChild:{get:function(){var a=
+x(this);if(a&&void 0!==a.firstChild){for(a=this.firstChild;a&&a.nodeType!==Node.ELEMENT_NODE;)a=a.nextSibling;return a}return J.firstElementChild(this)},configurable:!0},lastElementChild:{get:function(){var a=x(this);if(a&&void 0!==a.lastChild){for(a=this.lastChild;a&&a.nodeType!==Node.ELEMENT_NODE;)a=a.previousSibling;return a}return J.lastElementChild(this)},configurable:!0},children:{get:function(){return Bb(this)?Ob(Array.prototype.filter.call(this.childNodes,function(a){return a.nodeType===Node.ELEMENT_NODE})):
+J.children(this)},configurable:!0},innerHTML:{get:function(){return Bb(this)?yc("template"===this.localName?this.content:this):J.innerHTML(this)},set:function(a){var b="template"===this.localName?this.content:this;Ec(b);var c=this.localName||"div";c=this.namespaceURI&&this.namespaceURI!==Gc.namespaceURI?Gc.createElementNS(this.namespaceURI,c):Gc.createElement(c);Fc?G.xa.innerHTML.set.call(c,a):c.innerHTML=a;for(a="template"===this.localName?c.content:c;a.firstChild;)b.appendChild(a.firstChild)},configurable:!0}},
+Pc={shadowRoot:{get:function(){var a=x(this);return a&&a.ya||null},configurable:!0}},Qc={activeElement:{get:function(){var a=Jc&&Jc.get?Jc.get.call(document):y.w?void 0:document.activeElement;if(a&&a.nodeType){var b=!!z(this);if(this===document||b&&this.host!==a&&A.contains.call(this.host,a)){for(b=Cb(a);b&&b!==this;)a=b.host,b=Cb(a);a=this===document?b?null:a:b===this?a:null}else a=null}else a=null;return a},set:function(){},configurable:!0}};
+function K(a,b,c){for(var d in b){var e=Object.getOwnPropertyDescriptor(a,d);e&&e.configurable||!e&&c?Object.defineProperty(a,d,b[d]):c&&console.warn("Could not define",d,"on",a)}}function Rc(a){K(a,Mc);K(a,Nc);K(a,Oc);K(a,Qc)}
+function Sc(){var a=Tc.prototype;a.__proto__=DocumentFragment.prototype;K(a,Mc,!0);K(a,Oc,!0);K(a,Qc,!0);Object.defineProperties(a,{nodeType:{value:Node.DOCUMENT_FRAGMENT_NODE,configurable:!0},nodeName:{value:"#document-fragment",configurable:!0},nodeValue:{value:null,configurable:!0}});["localName","namespaceURI","prefix"].forEach(function(b){Object.defineProperty(a,b,{value:void 0,configurable:!0})});["ownerDocument","baseURI","isConnected"].forEach(function(b){Object.defineProperty(a,b,{get:function(){return this.host[b]},
+configurable:!0})})}var Uc=y.w?function(){}:function(a){var b=w(a);b.ta||(b.ta=!0,K(a,Mc,!0),K(a,Nc,!0))},Vc=y.w?function(){}:function(a){w(a).Da||(K(a,Oc,!0),K(a,Pc,!0))};var Wc=J.childNodes;function Xc(a,b,c){Uc(a);c=c||null;var d=w(a),e=w(b),f=c?w(c):null;d.previousSibling=c?f.previousSibling:b.lastChild;if(f=x(d.previousSibling))f.nextSibling=a;if(f=x(d.nextSibling=c))f.previousSibling=a;d.parentNode=b;c?c===e.firstChild&&(e.firstChild=a):(e.lastChild=a,e.firstChild||(e.firstChild=a));e.childNodes=null}
+function Yc(a){var b=w(a);if(void 0===b.firstChild){b.childNodes=null;var c=Wc(a);b.firstChild=c[0]||null;b.lastChild=c[c.length-1]||null;Vc(a);for(b=0;b<c.length;b++){var d=c[b],e=w(d);e.parentNode=a;e.nextSibling=c[b+1]||null;e.previousSibling=c[b-1]||null;Uc(d)}}};var Zc=J.parentNode;
+function $c(a,b,c){if(b===a)throw Error("Failed to execute 'appendChild' on 'Node': The new child element contains the parent.");if(c){var d=x(c);d=d&&d.parentNode;if(void 0!==d&&d!==a||void 0===d&&Zc(c)!==a)throw Error("Failed to execute 'insertBefore' on 'Node': The node before which the new node is to be inserted is not a child of this node.");}if(c===b)return b;b.parentNode&&ad(b.parentNode,b);var e,f;if(!b.__noInsertionPoint){if(f=e=Cb(a)){var h;"slot"===b.localName?h=[b]:b.querySelectorAll&&
+(h=b.querySelectorAll("slot"));f=h&&h.length?h:void 0}f&&(h=e,d=f,h.a=h.a||[],h.g=h.g||[],h.j=h.j||{},h.a.push.apply(h.a,[].concat(d instanceof Array?d:na(ma(d)))))}("slot"===a.localName||f)&&(e=e||Cb(a))&&bd(e);if(Bb(a)){e=c;Vc(a);f=w(a);void 0!==f.firstChild&&(f.childNodes=null);if(b.nodeType===Node.DOCUMENT_FRAGMENT_NODE){f=b.childNodes;for(h=0;h<f.length;h++)Xc(f[h],a,e);e=w(b);f=void 0!==e.firstChild?null:void 0;e.firstChild=e.lastChild=f;e.childNodes=f}else Xc(b,a,e);e=x(a);if(cd(a)){bd(e.root);
+var g=!0}else e.root&&(g=!0)}g||(g=z(a)?a.host:a,c?(c=dd(c),A.insertBefore.call(g,b,c)):A.appendChild.call(g,b));ed(a,b);return b}
+function ad(a,b){if(b.parentNode!==a)throw Error("The node to be removed is not a child of this node: "+b);var c=Cb(b),d=x(a);if(Bb(a)){var e=w(b),f=w(a);b===f.firstChild&&(f.firstChild=e.nextSibling);b===f.lastChild&&(f.lastChild=e.previousSibling);var h=e.previousSibling,g=e.nextSibling;h&&(w(h).nextSibling=g);g&&(w(g).previousSibling=h);e.parentNode=e.previousSibling=e.nextSibling=void 0;void 0!==f.childNodes&&(f.childNodes=null);if(cd(a)){bd(d.root);var k=!0}}fd(b);if(c){(e=a&&"slot"===a.localName)&&
+(k=!0);if(c.g){gd(c);f=c.j;for(ba in f)for(h=f[ba],g=0;g<h.length;g++){var l=h[g];if(Nb(b,l)){h.splice(g,1);var m=c.g.indexOf(l);0<=m&&c.g.splice(m,1);g--;m=x(l);if(l=m.D)for(var n=0;n<l.length;n++){var t=l[n],C=hd(t);C&&A.removeChild.call(C,t)}m.D=[];m.assignedNodes=[];m=!0}}var ba=m}else ba=void 0;(ba||e)&&bd(c)}k||(k=z(a)?a.host:a,(!d.root&&"slot"!==b.localName||k===Zc(b))&&A.removeChild.call(k,b));ed(a,null,b);return b}
+function fd(a){var b=x(a);if(b&&void 0!==b.N){b=a.childNodes;for(var c=0,d=b.length,e;c<d&&(e=b[c]);c++)fd(e)}if(a=x(a))a.N=void 0}function dd(a){var b=a;a&&"slot"===a.localName&&(b=(b=(b=x(a))&&b.D)&&b.length?b[0]:dd(a.nextSibling));return b}function cd(a){return(a=(a=x(a))&&a.root)&&id(a)}
+function jd(a,b){if("slot"===b)a=a.parentNode,cd(a)&&bd(x(a).root);else if("slot"===a.localName&&"name"===b&&(b=Cb(a))){if(b.g){gd(b);var c=a.Ga,d=kd(a);if(d!==c){c=b.j[c];var e=c.indexOf(a);0<=e&&c.splice(e,1);c=b.j[d]||(b.j[d]=[]);c.push(a);1<c.length&&(b.j[d]=ld(c))}}bd(b)}}function ed(a,b,c){if(a=(a=x(a))&&a.K)b&&a.addedNodes.push(b),c&&a.removedNodes.push(c),Ub(a)}
+function md(a){if(a&&a.nodeType){var b=w(a),c=b.N;void 0===c&&(z(a)?(c=a,b.N=c):(c=(c=a.parentNode)?md(c):a,A.contains.call(document.documentElement,a)&&(b.N=c)));return c}}function nd(a,b,c){var d=[];od(a.childNodes,b,c,d);return d}function od(a,b,c,d){for(var e=0,f=a.length,h;e<f&&(h=a[e]);e++){var g;if(g=h.nodeType===Node.ELEMENT_NODE){g=h;var k=b,l=c,m=d,n=k(g);n&&m.push(g);l&&l(n)?g=n:(od(g.childNodes,k,l,m),g=void 0)}if(g)break}}var pd=null;
+function qd(a,b,c){pd||(pd=window.ShadyCSS&&window.ShadyCSS.ScopingShim);pd&&"class"===b?pd.setElementClass(a,c):(A.setAttribute.call(a,b,c),jd(a,b))}function rd(a,b){if(a.ownerDocument!==document||"template"===a.localName)return A.importNode.call(document,a,b);var c=A.importNode.call(document,a,!1);if(b){a=a.childNodes;b=0;for(var d;b<a.length;b++)d=rd(a[b],!0),c.appendChild(d)}return c};var sd="__eventWrappers"+Date.now(),td=function(){var a=Object.getOwnPropertyDescriptor(Event.prototype,"composed");return a?function(b){return a.get.call(b)}:null}(),ud={blur:!0,focus:!0,focusin:!0,focusout:!0,click:!0,dblclick:!0,mousedown:!0,mouseenter:!0,mouseleave:!0,mousemove:!0,mouseout:!0,mouseover:!0,mouseup:!0,wheel:!0,beforeinput:!0,input:!0,keydown:!0,keyup:!0,compositionstart:!0,compositionupdate:!0,compositionend:!0,touchstart:!0,touchend:!0,touchmove:!0,touchcancel:!0,pointerover:!0,
+pointerenter:!0,pointerdown:!0,pointermove:!0,pointerup:!0,pointercancel:!0,pointerout:!0,pointerleave:!0,gotpointercapture:!0,lostpointercapture:!0,dragstart:!0,drag:!0,dragenter:!0,dragleave:!0,dragover:!0,drop:!0,dragend:!0,DOMActivate:!0,DOMFocusIn:!0,DOMFocusOut:!0,keypress:!0},vd={DOMAttrModified:!0,DOMAttributeNameChanged:!0,DOMCharacterDataModified:!0,DOMElementNameChanged:!0,DOMNodeInserted:!0,DOMNodeInsertedIntoDocument:!0,DOMNodeRemoved:!0,DOMNodeRemovedFromDocument:!0,DOMSubtreeModified:!0};
+function wd(a,b){var c=[],d=a;for(a=a===window?window:a.getRootNode();d;)c.push(d),d=d.assignedSlot?d.assignedSlot:d.nodeType===Node.DOCUMENT_FRAGMENT_NODE&&d.host&&(b||d!==a)?d.host:d.parentNode;c[c.length-1]===document&&c.push(window);return c}function xd(a,b){if(!z)return a;a=wd(a,!0);for(var c=0,d,e,f,h;c<b.length;c++)if(d=b[c],f=d===window?window:d.getRootNode(),f!==e&&(h=a.indexOf(f),e=f),!z(f)||-1<h)return d}
+var yd={get composed(){void 0===this.R&&(td?this.R=td(this):!1!==this.isTrusted&&(this.R=ud[this.type]));return this.R||!1},composedPath:function(){this.sa||(this.sa=wd(this.__target,this.composed));return this.sa},get target(){return xd(this.currentTarget||this.__previousCurrentTarget,this.composedPath())},get relatedTarget(){if(!this.ea)return null;this.ua||(this.ua=wd(this.ea,!0));return xd(this.currentTarget,this.ua)},stopPropagation:function(){Event.prototype.stopPropagation.call(this);this.da=
+!0},stopImmediatePropagation:function(){Event.prototype.stopImmediatePropagation.call(this);this.da=this.Ca=!0}};function zd(a){function b(b,d){b=new a(b,d);b.R=d&&!!d.composed;return b}Hb(b,a);b.prototype=a.prototype;return b}var Ad={focus:!0,blur:!0};function Bd(a){return a.__target!==a.target||a.ea!==a.relatedTarget}function Cd(a,b,c){if(c=b.__handlers&&b.__handlers[a.type]&&b.__handlers[a.type][c])for(var d=0,e;(e=c[d])&&(!Bd(a)||a.target!==a.relatedTarget)&&(e.call(b,a),!a.Ca);d++);}
+function Dd(a){var b=a.composedPath();Object.defineProperty(a,"currentTarget",{get:function(){return d},configurable:!0});for(var c=b.length-1;0<=c;c--){var d=b[c];Cd(a,d,"capture");if(a.da)return}Object.defineProperty(a,"eventPhase",{get:function(){return Event.AT_TARGET}});var e;for(c=0;c<b.length;c++){d=b[c];var f=x(d);f=f&&f.root;if(0===c||f&&f===e)if(Cd(a,d,"bubble"),d!==window&&(e=d.getRootNode()),a.da)break}}
+function Ed(a,b,c,d,e,f){for(var h=0;h<a.length;h++){var g=a[h],k=g.type,l=g.capture,m=g.once,n=g.passive;if(b===g.node&&c===k&&d===l&&e===m&&f===n)return h}return-1}
+function Fd(a,b,c){if(b){var d=typeof b;if("function"===d||"object"===d)if("object"!==d||b.handleEvent&&"function"===typeof b.handleEvent){var e=this instanceof Window?A.fb:A.addEventListener;if(vd[a])return e.call(this,a,b,c);if(c&&"object"===typeof c){var f=!!c.capture;var h=!!c.once;var g=!!c.passive}else f=!!c,g=h=!1;var k=c&&c.ga||this,l=b[sd];if(l){if(-1<Ed(l,k,a,f,h,g))return}else b[sd]=[];l=function(e){h&&this.removeEventListener(a,b,c);e.__target||Gd(e);if(k!==this){var f=Object.getOwnPropertyDescriptor(e,
+"currentTarget");Object.defineProperty(e,"currentTarget",{get:function(){return k},configurable:!0})}e.__previousCurrentTarget=e.currentTarget;if(!z(k)||-1!=e.composedPath().indexOf(k))if(e.composed||-1<e.composedPath().indexOf(k))if(Bd(e)&&e.target===e.relatedTarget)e.eventPhase===Event.BUBBLING_PHASE&&e.stopImmediatePropagation();else if(e.eventPhase===Event.CAPTURING_PHASE||e.bubbles||e.target===k||k instanceof Window){var g="function"===d?b.call(k,e):b.handleEvent&&b.handleEvent(e);k!==this&&
+(f?(Object.defineProperty(e,"currentTarget",f),f=null):delete e.currentTarget);return g}};b[sd].push({node:k,type:a,capture:f,once:h,passive:g,hb:l});Ad[a]?(this.__handlers=this.__handlers||{},this.__handlers[a]=this.__handlers[a]||{capture:[],bubble:[]},this.__handlers[a][f?"capture":"bubble"].push(l)):e.call(this,a,l,c)}}}
+function Hd(a,b,c){if(b){var d=this instanceof Window?A.gb:A.removeEventListener;if(vd[a])return d.call(this,a,b,c);if(c&&"object"===typeof c){var e=!!c.capture;var f=!!c.once;var h=!!c.passive}else e=!!c,h=f=!1;var g=c&&c.ga||this,k=void 0;var l=null;try{l=b[sd]}catch(m){}l&&(f=Ed(l,g,a,e,f,h),-1<f&&(k=l.splice(f,1)[0].hb,l.length||(b[sd]=void 0)));d.call(this,a,k||b,c);k&&Ad[a]&&this.__handlers&&this.__handlers[a]&&(a=this.__handlers[a][e?"capture":"bubble"],k=a.indexOf(k),-1<k&&a.splice(k,1))}}
+function Id(){for(var a in Ad)window.addEventListener(a,function(a){a.__target||(Gd(a),Dd(a))},!0)}function Gd(a){a.__target=a.target;a.ea=a.relatedTarget;if(y.w){var b=Object.getPrototypeOf(a);if(!b.hasOwnProperty("__patchProto")){var c=Object.create(b);c.jb=b;Fb(c,yd);b.__patchProto=c}a.__proto__=b.__patchProto}else Fb(a,yd)}var Jd=zd(window.Event),Kd=zd(window.CustomEvent),Ld=zd(window.MouseEvent);
+function Md(){window.Event=Jd;window.CustomEvent=Kd;window.MouseEvent=Ld;Id();if(!td&&Object.getOwnPropertyDescriptor(Event.prototype,"isTrusted")){var a=function(){var a=new MouseEvent("click",{bubbles:!0,cancelable:!0,composed:!0});this.dispatchEvent(a)};Element.prototype.click?Element.prototype.click=a:HTMLElement.prototype.click&&(HTMLElement.prototype.click=a)}};function Nd(a,b){return{index:a,O:[],X:b}}
+function Od(a,b,c,d){var e=0,f=0,h=0,g=0,k=Math.min(b-e,d-f);if(0==e&&0==f)a:{for(h=0;h<k;h++)if(a[h]!==c[h])break a;h=k}if(b==a.length&&d==c.length){g=a.length;for(var l=c.length,m=0;m<k-h&&Pd(a[--g],c[--l]);)m++;g=m}e+=h;f+=h;b-=g;d-=g;if(0==b-e&&0==d-f)return[];if(e==b){for(b=Nd(e,0);f<d;)b.O.push(c[f++]);return[b]}if(f==d)return[Nd(e,b-e)];k=e;h=f;d=d-h+1;g=b-k+1;b=Array(d);for(l=0;l<d;l++)b[l]=Array(g),b[l][0]=l;for(l=0;l<g;l++)b[0][l]=l;for(l=1;l<d;l++)for(m=1;m<g;m++)if(a[k+m-1]===c[h+l-1])b[l][m]=
+b[l-1][m-1];else{var n=b[l-1][m]+1,t=b[l][m-1]+1;b[l][m]=n<t?n:t}k=b.length-1;h=b[0].length-1;d=b[k][h];for(a=[];0<k||0<h;)0==k?(a.push(2),h--):0==h?(a.push(3),k--):(g=b[k-1][h-1],l=b[k-1][h],m=b[k][h-1],n=l<m?l<g?l:g:m<g?m:g,n==g?(g==d?a.push(0):(a.push(1),d=g),k--,h--):n==l?(a.push(3),k--,d=l):(a.push(2),h--,d=m));a.reverse();b=void 0;k=[];for(h=0;h<a.length;h++)switch(a[h]){case 0:b&&(k.push(b),b=void 0);e++;f++;break;case 1:b||(b=Nd(e,0));b.X++;e++;b.O.push(c[f]);f++;break;case 2:b||(b=Nd(e,0));
+b.X++;e++;break;case 3:b||(b=Nd(e,0)),b.O.push(c[f]),f++}b&&k.push(b);return k}function Pd(a,b){return a===b};var hd=J.parentNode,Qd=J.childNodes,Rd={},Sd=y.deferConnectionCallbacks&&"loading"===document.readyState,Td;function Ud(a){var b=[];do b.unshift(a);while(a=a.parentNode);return b}
+function Tc(a,b,c){if(a!==Rd)throw new TypeError("Illegal constructor");this.La="ShadyRoot";this.host=b;this.c=c&&c.mode;Yc(b);a=w(b);a.root=this;a.ya="closed"!==this.c?this:null;a=w(this);a.firstChild=a.lastChild=a.parentNode=a.nextSibling=a.previousSibling=null;a.childNodes=[];this.b=this.W=!1;this.a=this.j=this.g=null;bd(this)}function bd(a){a.W||(a.W=!0,Rb(function(){return Vd(a)}))}
+function Vd(a){for(var b;a;){a.W&&(b=a);a:{var c=a;a=c.host.getRootNode();if(z(a))for(var d=c.host.childNodes,e=0;e<d.length;e++)if(c=d[e],"slot"==c.localName)break a;a=void 0}}b&&b._renderRoot()}
+Tc.prototype._renderRoot=function(){var a=Sd;Sd=!0;this.W=!1;if(this.g){gd(this);for(var b=0,c;b<this.g.length;b++){c=this.g[b];var d=x(c),e=d.assignedNodes;d.assignedNodes=[];d.D=[];if(d.la=e)for(d=0;d<e.length;d++){var f=x(e[d]);f.U=f.assignedSlot;f.assignedSlot===c&&(f.assignedSlot=null)}}for(c=this.host.firstChild;c;c=c.nextSibling)Wd(this,c);for(b=0;b<this.g.length;b++){c=this.g[b];e=x(c);if(!e.assignedNodes.length)for(d=c.firstChild;d;d=d.nextSibling)Wd(this,d,c);(d=(d=x(c.parentNode))&&d.root)&&
+id(d)&&d._renderRoot();Xd(this,e.D,e.assignedNodes);if(d=e.la){for(f=0;f<d.length;f++)x(d[f]).U=null;e.la=null;d.length>e.assignedNodes.length&&(e.Z=!0)}e.Z&&(e.Z=!1,Yd(this,c))}b=this.g;c=[];for(e=0;e<b.length;e++)d=b[e].parentNode,(f=x(d))&&f.root||!(0>c.indexOf(d))||c.push(d);for(b=0;b<c.length;b++){e=c[b];d=e===this?this.host:e;f=[];e=e.childNodes;for(var h=0;h<e.length;h++){var g=e[h];if("slot"==g.localName){g=x(g).D;for(var k=0;k<g.length;k++)f.push(g[k])}else f.push(g)}e=void 0;h=Qd(d);g=Od(f,
+f.length,h,h.length);for(var l=k=0;k<g.length&&(e=g[k]);k++){for(var m=0,n;m<e.O.length&&(n=e.O[m]);m++)hd(n)===d&&A.removeChild.call(d,n),h.splice(e.index+l,1);l-=e.X}for(l=0;l<g.length&&(e=g[l]);l++)for(k=h[e.index],m=e.index;m<e.index+e.X;m++)n=f[m],A.insertBefore.call(d,n,k),h.splice(m,0,n)}}if(!this.b)for(n=this.host.childNodes,c=0,b=n.length;c<b;c++)e=n[c],d=x(e),hd(e)!==this.host||"slot"!==e.localName&&d.assignedSlot||A.removeChild.call(this.host,e);this.b=!0;Sd=a;Td&&Td()};
+function Wd(a,b,c){var d=w(b),e=d.U;d.U=null;c||(c=(a=a.j[b.slot||"__catchall"])&&a[0]);c?(w(c).assignedNodes.push(b),d.assignedSlot=c):d.assignedSlot=void 0;e!==d.assignedSlot&&d.assignedSlot&&(w(d.assignedSlot).Z=!0)}function Xd(a,b,c){for(var d=0,e;d<c.length&&(e=c[d]);d++)if("slot"==e.localName){var f=x(e).assignedNodes;f&&f.length&&Xd(a,b,f)}else b.push(c[d])}function Yd(a,b){A.dispatchEvent.call(b,new Event("slotchange"));b=x(b);b.assignedSlot&&Yd(a,b.assignedSlot)}
+function gd(a){if(a.a&&a.a.length){for(var b=a.a,c,d=0;d<b.length;d++){var e=b[d];Yc(e);Yc(e.parentNode);var f=kd(e);a.j[f]?(c=c||{},c[f]=!0,a.j[f].push(e)):a.j[f]=[e];a.g.push(e)}if(c)for(var h in c)a.j[h]=ld(a.j[h]);a.a=[]}}function kd(a){var b=a.name||a.getAttribute("name")||"__catchall";return a.Ga=b}function ld(a){return a.sort(function(a,c){a=Ud(a);for(var b=Ud(c),e=0;e<a.length;e++){c=a[e];var f=b[e];if(c!==f)return a=Array.from(c.parentNode.childNodes),a.indexOf(c)-a.indexOf(f)}})}
+function id(a){gd(a);return!(!a.g||!a.g.length)}
+if(window.customElements&&y.na){var Zd=new Map;Td=function(){var a=Array.from(Zd);Zd.clear();a=ma(a);for(var b=a.next();!b.done;b=a.next()){b=ma(b.value);var c=b.next().value;b.next().value?c.Ea():c.Fa()}};Sd&&document.addEventListener("readystatechange",function(){Sd=!1;Td()},{once:!0});var $d=function(a,b,c){var d=0,e="__isConnected"+d++;if(b||c)a.prototype.connectedCallback=a.prototype.Ea=function(){Sd?Zd.set(this,!0):this[e]||(this[e]=!0,b&&b.call(this))},a.prototype.disconnectedCallback=a.prototype.Fa=
+function(){Sd?this.isConnected||Zd.set(this,!1):this[e]&&(this[e]=!1,c&&c.call(this))};return a},define=window.customElements.define;Object.defineProperty(window.CustomElementRegistry.prototype,"define",{value:function(a,b){var c=b.prototype.connectedCallback,d=b.prototype.disconnectedCallback;define.call(window.customElements,a,$d(b,c,d));b.prototype.connectedCallback=c;b.prototype.disconnectedCallback=d}})};function ae(a){var b=a.getRootNode();z(b)&&Vd(b);return(a=x(a))&&a.assignedSlot||null}
+var be={addEventListener:Fd.bind(window),removeEventListener:Hd.bind(window)},ce={addEventListener:Fd,removeEventListener:Hd,appendChild:function(a){return $c(this,a)},insertBefore:function(a,b){return $c(this,a,b)},removeChild:function(a){return ad(this,a)},replaceChild:function(a,b){$c(this,a,b);ad(this,b);return a},cloneNode:function(a){if("template"==this.localName)var b=A.cloneNode.call(this,a);else if(b=A.cloneNode.call(this,!1),a&&b.nodeType!==Node.ATTRIBUTE_NODE){a=this.childNodes;for(var c=
+0,d;c<a.length;c++)d=a[c].cloneNode(!0),b.appendChild(d)}return b},getRootNode:function(){return md(this)},contains:function(a){return Nb(this,a)},dispatchEvent:function(a){Sb();return A.dispatchEvent.call(this,a)}};
+Object.defineProperties(ce,{isConnected:{get:function(){if(Ic&&Ic.call(this))return!0;if(this.nodeType==Node.DOCUMENT_FRAGMENT_NODE)return!1;var a=this.ownerDocument;if(Mb){if(A.contains.call(a,this))return!0}else if(a.documentElement&&A.contains.call(a.documentElement,this))return!0;for(a=this;a&&!(a instanceof Document);)a=a.parentNode||(z(a)?a.host:void 0);return!!(a&&a instanceof Document)},configurable:!0}});
+var de={get assignedSlot(){return ae(this)}},ee={querySelector:function(a){return nd(this,function(b){return Eb.call(b,a)},function(a){return!!a})[0]||null},querySelectorAll:function(a,b){if(b){b=Array.prototype.slice.call(A.querySelectorAll.call(this,a));var c=this.getRootNode();return b.filter(function(a){return a.getRootNode()==c})}return nd(this,function(b){return Eb.call(b,a)})}},fe={assignedNodes:function(a){if("slot"===this.localName){var b=this.getRootNode();z(b)&&Vd(b);return(b=x(this))?
+(a&&a.flatten?b.D:b.assignedNodes)||[]:[]}}},ge=Gb({setAttribute:function(a,b){qd(this,a,b)},removeAttribute:function(a){A.removeAttribute.call(this,a);jd(this,a)},attachShadow:function(a){if(!this)throw"Must provide a host.";if(!a)throw"Not enough arguments.";return new Tc(Rd,this,a)},get slot(){return this.getAttribute("slot")},set slot(a){qd(this,"slot",a)},get assignedSlot(){return ae(this)}},ee,fe);Object.defineProperties(ge,Pc);
+var he=Gb({importNode:function(a,b){return rd(a,b)},getElementById:function(a){return nd(this,function(b){return b.id==a},function(a){return!!a})[0]||null}},ee);Object.defineProperties(he,{_activeElement:Qc.activeElement});
+for(var ie=HTMLElement.prototype.blur,je={blur:function(){var a=x(this);(a=(a=a&&a.root)&&a.activeElement)?a.blur():ie.call(this)}},ke={},le=ma(Object.getOwnPropertyNames(Document.prototype)),me=le.next();!me.done;ke={u:ke.u},me=le.next())ke.u=me.value,"on"===ke.u.substring(0,2)&&Object.defineProperty(je,ke.u,{set:function(a){return function(b){var c=w(this),d=a.u.substring(2);c.S[a.u]&&this.removeEventListener(d,c.S[a.u]);this.addEventListener(d,b,{});c.S[a.u]=b}}(ke),get:function(a){return function(){var b=
+x(this);return b&&b.S[a.u]}}(ke),configurable:!0});var ne={addEventListener:function(a,b,c){"object"!==typeof c&&(c={capture:!!c});c.ga=this;this.host.addEventListener(a,b,c)},removeEventListener:function(a,b,c){"object"!==typeof c&&(c={capture:!!c});c.ga=this;this.host.removeEventListener(a,b,c)},getElementById:function(a){return nd(this,function(b){return b.id==a},function(a){return!!a})[0]||null}};
+function L(a,b){for(var c=Object.getOwnPropertyNames(b),d=0;d<c.length;d++){var e=c[d],f=Object.getOwnPropertyDescriptor(b,e);f.value?a[e]=f.value:Object.defineProperty(a,e,f)}};if(y.na){var ShadyDOM={inUse:y.na,patch:function(a){Vc(a);Uc(a);return a},isShadyRoot:z,enqueue:Rb,flush:Sb,settings:y,filterMutations:Yb,observeChildren:Wb,unobserveChildren:Xb,nativeMethods:A,nativeTree:J,deferConnectionCallbacks:y.deferConnectionCallbacks};window.ShadyDOM=ShadyDOM;Md();var oe=window.customElements&&window.customElements.nativeHTMLElement||HTMLElement;L(Tc.prototype,ne);L(window.Node.prototype,ce);L(window.Window.prototype,be);L(window.Text.prototype,de);L(window.DocumentFragment.prototype,
+ee);L(window.Element.prototype,ge);L(window.Document.prototype,he);window.HTMLSlotElement&&L(window.HTMLSlotElement.prototype,fe);L(oe.prototype,je);y.w&&(Rc(window.Node.prototype),Rc(window.Text.prototype),Rc(window.DocumentFragment.prototype),Rc(window.Element.prototype),Rc(oe.prototype),Rc(window.Document.prototype),window.HTMLSlotElement&&Rc(window.HTMLSlotElement.prototype));Sc();window.ShadowRoot=Tc};var pe=new Set("annotation-xml color-profile font-face font-face-src font-face-uri font-face-format font-face-name missing-glyph".split(" "));function qe(a){var b=pe.has(a);a=/^[a-z][.0-9_a-z]*-[\-.0-9_a-z]*$/.test(a);return!b&&a}function M(a){var b=a.isConnected;if(void 0!==b)return b;for(;a&&!(a.__CE_isImportDocument||a instanceof Document);)a=a.parentNode||(window.ShadowRoot&&a instanceof ShadowRoot?a.host:void 0);return!(!a||!(a.__CE_isImportDocument||a instanceof Document))}
+function re(a,b){for(;b&&b!==a&&!b.nextSibling;)b=b.parentNode;return b&&b!==a?b.nextSibling:null}
+function se(a,b,c){c=void 0===c?new Set:c;for(var d=a;d;){if(d.nodeType===Node.ELEMENT_NODE){var e=d;b(e);var f=e.localName;if("link"===f&&"import"===e.getAttribute("rel")){d=e.import;if(d instanceof Node&&!c.has(d))for(c.add(d),d=d.firstChild;d;d=d.nextSibling)se(d,b,c);d=re(a,e);continue}else if("template"===f){d=re(a,e);continue}if(e=e.__CE_shadowRoot)for(e=e.firstChild;e;e=e.nextSibling)se(e,b,c)}d=d.firstChild?d.firstChild:re(a,d)}}function N(a,b,c){a[b]=c};function te(){this.a=new Map;this.o=new Map;this.i=[];this.c=!1}function ue(a,b,c){a.a.set(b,c);a.o.set(c.constructor,c)}function ve(a,b){a.c=!0;a.i.push(b)}function we(a,b){a.c&&se(b,function(b){return a.b(b)})}te.prototype.b=function(a){if(this.c&&!a.__CE_patched){a.__CE_patched=!0;for(var b=0;b<this.i.length;b++)this.i[b](a)}};function O(a,b){var c=[];se(b,function(a){return c.push(a)});for(b=0;b<c.length;b++){var d=c[b];1===d.__CE_state?a.connectedCallback(d):xe(a,d)}}
+function P(a,b){var c=[];se(b,function(a){return c.push(a)});for(b=0;b<c.length;b++){var d=c[b];1===d.__CE_state&&a.disconnectedCallback(d)}}
+function Q(a,b,c){c=void 0===c?{}:c;var d=c.eb||new Set,e=c.ca||function(b){return xe(a,b)},f=[];se(b,function(b){if("link"===b.localName&&"import"===b.getAttribute("rel")){var c=b.import;c instanceof Node&&(c.__CE_isImportDocument=!0,c.__CE_hasRegistry=!0);c&&"complete"===c.readyState?c.__CE_documentLoadHandled=!0:b.addEventListener("load",function(){var c=b.import;if(!c.__CE_documentLoadHandled){c.__CE_documentLoadHandled=!0;var f=new Set(d);f.delete(c);Q(a,c,{eb:f,ca:e})}})}else f.push(b)},d);
+if(a.c)for(b=0;b<f.length;b++)a.b(f[b]);for(b=0;b<f.length;b++)e(f[b])}
+function xe(a,b){if(void 0===b.__CE_state){var c=b.ownerDocument;if(c.defaultView||c.__CE_isImportDocument&&c.__CE_hasRegistry)if(c=a.a.get(b.localName)){c.constructionStack.push(b);var d=c.constructor;try{try{if(new d!==b)throw Error("The custom element constructor did not produce the element being upgraded.");}finally{c.constructionStack.pop()}}catch(h){throw b.__CE_state=2,h;}b.__CE_state=1;b.__CE_definition=c;if(c.attributeChangedCallback)for(c=c.observedAttributes,d=0;d<c.length;d++){var e=c[d],
+f=b.getAttribute(e);null!==f&&a.attributeChangedCallback(b,e,null,f,null)}M(b)&&a.connectedCallback(b)}}}te.prototype.connectedCallback=function(a){var b=a.__CE_definition;b.connectedCallback&&b.connectedCallback.call(a)};te.prototype.disconnectedCallback=function(a){var b=a.__CE_definition;b.disconnectedCallback&&b.disconnectedCallback.call(a)};
+te.prototype.attributeChangedCallback=function(a,b,c,d,e){var f=a.__CE_definition;f.attributeChangedCallback&&-1<f.observedAttributes.indexOf(b)&&f.attributeChangedCallback.call(a,b,c,d,e)};function ye(a){var b=document;this.l=a;this.a=b;this.H=void 0;Q(this.l,this.a);"loading"===this.a.readyState&&(this.H=new MutationObserver(this.b.bind(this)),this.H.observe(this.a,{childList:!0,subtree:!0}))}function ze(a){a.H&&a.H.disconnect()}ye.prototype.b=function(a){var b=this.a.readyState;"interactive"!==b&&"complete"!==b||ze(this);for(b=0;b<a.length;b++)for(var c=a[b].addedNodes,d=0;d<c.length;d++)Q(this.l,c[d])};function Ae(){var a=this;this.b=this.a=void 0;this.c=new Promise(function(b){a.b=b;a.a&&b(a.a)})}Ae.prototype.resolve=function(a){if(this.a)throw Error("Already resolved.");this.a=a;this.b&&this.b(a)};function R(a){this.ia=!1;this.l=a;this.ma=new Map;this.ja=function(a){return a()};this.T=!1;this.ka=[];this.Ja=new ye(a)}p=R.prototype;
+p.define=function(a,b){var c=this;if(!(b instanceof Function))throw new TypeError("Custom element constructors must be functions.");if(!qe(a))throw new SyntaxError("The element name '"+a+"' is not valid.");if(this.l.a.get(a))throw Error("A custom element with name '"+a+"' has already been defined.");if(this.ia)throw Error("A custom element is already being defined.");this.ia=!0;try{var d=function(a){var b=e[a];if(void 0!==b&&!(b instanceof Function))throw Error("The '"+a+"' callback must be a function.");
+return b},e=b.prototype;if(!(e instanceof Object))throw new TypeError("The custom element constructor's prototype is not an object.");var f=d("connectedCallback");var h=d("disconnectedCallback");var g=d("adoptedCallback");var k=d("attributeChangedCallback");var l=b.observedAttributes||[]}catch(m){return}finally{this.ia=!1}b={localName:a,constructor:b,connectedCallback:f,disconnectedCallback:h,adoptedCallback:g,attributeChangedCallback:k,observedAttributes:l,constructionStack:[]};ue(this.l,a,b);this.ka.push(b);
+this.T||(this.T=!0,this.ja(function(){return Be(c)}))};p.ca=function(a){Q(this.l,a)};
+function Be(a){if(!1!==a.T){a.T=!1;for(var b=a.ka,c=[],d=new Map,e=0;e<b.length;e++)d.set(b[e].localName,[]);Q(a.l,document,{ca:function(b){if(void 0===b.__CE_state){var e=b.localName,f=d.get(e);f?f.push(b):a.l.a.get(e)&&c.push(b)}}});for(e=0;e<c.length;e++)xe(a.l,c[e]);for(;0<b.length;){var f=b.shift();e=f.localName;f=d.get(f.localName);for(var h=0;h<f.length;h++)xe(a.l,f[h]);(e=a.ma.get(e))&&e.resolve(void 0)}}}p.get=function(a){if(a=this.l.a.get(a))return a.constructor};
+p.whenDefined=function(a){if(!qe(a))return Promise.reject(new SyntaxError("'"+a+"' is not a valid custom element name."));var b=this.ma.get(a);if(b)return b.c;b=new Ae;this.ma.set(a,b);this.l.a.get(a)&&!this.ka.some(function(b){return b.localName===a})&&b.resolve(void 0);return b.c};p.Za=function(a){ze(this.Ja);var b=this.ja;this.ja=function(c){return a(function(){return b(c)})}};window.CustomElementRegistry=R;R.prototype.define=R.prototype.define;R.prototype.upgrade=R.prototype.ca;
+R.prototype.get=R.prototype.get;R.prototype.whenDefined=R.prototype.whenDefined;R.prototype.polyfillWrapFlushCallback=R.prototype.Za;var Ce=window.Document.prototype.createElement,De=window.Document.prototype.createElementNS,Ee=window.Document.prototype.importNode,Fe=window.Document.prototype.prepend,Ge=window.Document.prototype.append,He=window.DocumentFragment.prototype.prepend,Ie=window.DocumentFragment.prototype.append,Je=window.Node.prototype.cloneNode,Ke=window.Node.prototype.appendChild,Le=window.Node.prototype.insertBefore,Me=window.Node.prototype.removeChild,Ne=window.Node.prototype.replaceChild,Oe=Object.getOwnPropertyDescriptor(window.Node.prototype,
+"textContent"),Pe=window.Element.prototype.attachShadow,Qe=Object.getOwnPropertyDescriptor(window.Element.prototype,"innerHTML"),Re=window.Element.prototype.getAttribute,Se=window.Element.prototype.setAttribute,Te=window.Element.prototype.removeAttribute,Ue=window.Element.prototype.getAttributeNS,Ve=window.Element.prototype.setAttributeNS,We=window.Element.prototype.removeAttributeNS,Xe=window.Element.prototype.insertAdjacentElement,Ye=window.Element.prototype.insertAdjacentHTML,Ze=window.Element.prototype.prepend,
+$e=window.Element.prototype.append,af=window.Element.prototype.before,bf=window.Element.prototype.after,cf=window.Element.prototype.replaceWith,df=window.Element.prototype.remove,ef=window.HTMLElement,ff=Object.getOwnPropertyDescriptor(window.HTMLElement.prototype,"innerHTML"),gf=window.HTMLElement.prototype.insertAdjacentElement,hf=window.HTMLElement.prototype.insertAdjacentHTML;var jf=new function(){};function kf(){var a=lf;window.HTMLElement=function(){function b(){var b=this.constructor,d=a.o.get(b);if(!d)throw Error("The custom element being constructed was not registered with `customElements`.");var e=d.constructionStack;if(0===e.length)return e=Ce.call(document,d.localName),Object.setPrototypeOf(e,b.prototype),e.__CE_state=1,e.__CE_definition=d,a.b(e),e;d=e.length-1;var f=e[d];if(f===jf)throw Error("The HTMLElement constructor was either called reentrantly for this constructor or called multiple times.");
+e[d]=jf;Object.setPrototypeOf(f,b.prototype);a.b(f);return f}b.prototype=ef.prototype;Object.defineProperty(b.prototype,"constructor",{writable:!0,configurable:!0,enumerable:!1,value:b});return b}()};function mf(a,b,c){function d(b){return function(c){for(var d=[],e=0;e<arguments.length;++e)d[e-0]=arguments[e];e=[];for(var f=[],l=0;l<d.length;l++){var m=d[l];m instanceof Element&&M(m)&&f.push(m);if(m instanceof DocumentFragment)for(m=m.firstChild;m;m=m.nextSibling)e.push(m);else e.push(m)}b.apply(this,d);for(d=0;d<f.length;d++)P(a,f[d]);if(M(this))for(d=0;d<e.length;d++)f=e[d],f instanceof Element&&O(a,f)}}void 0!==c.aa&&(b.prepend=d(c.aa));void 0!==c.append&&(b.append=d(c.append))};function nf(){var a=lf;N(Document.prototype,"createElement",function(b){if(this.__CE_hasRegistry){var c=a.a.get(b);if(c)return new c.constructor}b=Ce.call(this,b);a.b(b);return b});N(Document.prototype,"importNode",function(b,c){b=Ee.call(this,b,c);this.__CE_hasRegistry?Q(a,b):we(a,b);return b});N(Document.prototype,"createElementNS",function(b,c){if(this.__CE_hasRegistry&&(null===b||"http://www.w3.org/1999/xhtml"===b)){var d=a.a.get(c);if(d)return new d.constructor}b=De.call(this,b,c);a.b(b);return b});
+mf(a,Document.prototype,{aa:Fe,append:Ge})};function of(){var a=lf;function b(b,d){Object.defineProperty(b,"textContent",{enumerable:d.enumerable,configurable:!0,get:d.get,set:function(b){if(this.nodeType===Node.TEXT_NODE)d.set.call(this,b);else{var c=void 0;if(this.firstChild){var e=this.childNodes,g=e.length;if(0<g&&M(this)){c=Array(g);for(var k=0;k<g;k++)c[k]=e[k]}}d.set.call(this,b);if(c)for(b=0;b<c.length;b++)P(a,c[b])}}})}N(Node.prototype,"insertBefore",function(b,d){if(b instanceof DocumentFragment){var c=Array.prototype.slice.apply(b.childNodes);
+b=Le.call(this,b,d);if(M(this))for(d=0;d<c.length;d++)O(a,c[d]);return b}c=M(b);d=Le.call(this,b,d);c&&P(a,b);M(this)&&O(a,b);return d});N(Node.prototype,"appendChild",function(b){if(b instanceof DocumentFragment){var c=Array.prototype.slice.apply(b.childNodes);b=Ke.call(this,b);if(M(this))for(var e=0;e<c.length;e++)O(a,c[e]);return b}c=M(b);e=Ke.call(this,b);c&&P(a,b);M(this)&&O(a,b);return e});N(Node.prototype,"cloneNode",function(b){b=Je.call(this,b);this.ownerDocument.__CE_hasRegistry?Q(a,b):
+we(a,b);return b});N(Node.prototype,"removeChild",function(b){var c=M(b),e=Me.call(this,b);c&&P(a,b);return e});N(Node.prototype,"replaceChild",function(b,d){if(b instanceof DocumentFragment){var c=Array.prototype.slice.apply(b.childNodes);b=Ne.call(this,b,d);if(M(this))for(P(a,d),d=0;d<c.length;d++)O(a,c[d]);return b}c=M(b);var f=Ne.call(this,b,d),h=M(this);h&&P(a,d);c&&P(a,b);h&&O(a,b);return f});Oe&&Oe.get?b(Node.prototype,Oe):ve(a,function(a){b(a,{enumerable:!0,configurable:!0,get:function(){for(var a=
+[],b=0;b<this.childNodes.length;b++)a.push(this.childNodes[b].textContent);return a.join("")},set:function(a){for(;this.firstChild;)Me.call(this,this.firstChild);Ke.call(this,document.createTextNode(a))}})})};function pf(a){var b=Element.prototype;function c(b){return function(c){for(var d=[],e=0;e<arguments.length;++e)d[e-0]=arguments[e];e=[];for(var g=[],k=0;k<d.length;k++){var l=d[k];l instanceof Element&&M(l)&&g.push(l);if(l instanceof DocumentFragment)for(l=l.firstChild;l;l=l.nextSibling)e.push(l);else e.push(l)}b.apply(this,d);for(d=0;d<g.length;d++)P(a,g[d]);if(M(this))for(d=0;d<e.length;d++)g=e[d],g instanceof Element&&O(a,g)}}void 0!==af&&(b.before=c(af));void 0!==af&&(b.after=c(bf));void 0!==
+cf&&N(b,"replaceWith",function(b){for(var c=[],d=0;d<arguments.length;++d)c[d-0]=arguments[d];d=[];for(var h=[],g=0;g<c.length;g++){var k=c[g];k instanceof Element&&M(k)&&h.push(k);if(k instanceof DocumentFragment)for(k=k.firstChild;k;k=k.nextSibling)d.push(k);else d.push(k)}g=M(this);cf.apply(this,c);for(c=0;c<h.length;c++)P(a,h[c]);if(g)for(P(a,this),c=0;c<d.length;c++)h=d[c],h instanceof Element&&O(a,h)});void 0!==df&&N(b,"remove",function(){var b=M(this);df.call(this);b&&P(a,this)})};function qf(){var a=lf;function b(b,c){Object.defineProperty(b,"innerHTML",{enumerable:c.enumerable,configurable:!0,get:c.get,set:function(b){var d=this,e=void 0;M(this)&&(e=[],se(this,function(a){a!==d&&e.push(a)}));c.set.call(this,b);if(e)for(var f=0;f<e.length;f++){var h=e[f];1===h.__CE_state&&a.disconnectedCallback(h)}this.ownerDocument.__CE_hasRegistry?Q(a,this):we(a,this);return b}})}function c(b,c){N(b,"insertAdjacentElement",function(b,d){var e=M(d);b=c.call(this,b,d);e&&P(a,d);M(b)&&O(a,
+d);return b})}function d(b,c){function d(b,c){for(var d=[];b!==c;b=b.nextSibling)d.push(b);for(c=0;c<d.length;c++)Q(a,d[c])}N(b,"insertAdjacentHTML",function(a,b){a=a.toLowerCase();if("beforebegin"===a){var e=this.previousSibling;c.call(this,a,b);d(e||this.parentNode.firstChild,this)}else if("afterbegin"===a)e=this.firstChild,c.call(this,a,b),d(this.firstChild,e);else if("beforeend"===a)e=this.lastChild,c.call(this,a,b),d(e||this.firstChild,null);else if("afterend"===a)e=this.nextSibling,c.call(this,
+a,b),d(this.nextSibling,e);else throw new SyntaxError("The value provided ("+String(a)+") is not one of 'beforebegin', 'afterbegin', 'beforeend', or 'afterend'.");})}Pe&&N(Element.prototype,"attachShadow",function(a){return this.__CE_shadowRoot=a=Pe.call(this,a)});Qe&&Qe.get?b(Element.prototype,Qe):ff&&ff.get?b(HTMLElement.prototype,ff):ve(a,function(a){b(a,{enumerable:!0,configurable:!0,get:function(){return Je.call(this,!0).innerHTML},set:function(a){var b="template"===this.localName,c=b?this.content:
+this,d=De.call(document,this.namespaceURI,this.localName);for(d.innerHTML=a;0<c.childNodes.length;)Me.call(c,c.childNodes[0]);for(a=b?d.content:d;0<a.childNodes.length;)Ke.call(c,a.childNodes[0])}})});N(Element.prototype,"setAttribute",function(b,c){if(1!==this.__CE_state)return Se.call(this,b,c);var d=Re.call(this,b);Se.call(this,b,c);c=Re.call(this,b);a.attributeChangedCallback(this,b,d,c,null)});N(Element.prototype,"setAttributeNS",function(b,c,d){if(1!==this.__CE_state)return Ve.call(this,b,c,
+d);var e=Ue.call(this,b,c);Ve.call(this,b,c,d);d=Ue.call(this,b,c);a.attributeChangedCallback(this,c,e,d,b)});N(Element.prototype,"removeAttribute",function(b){if(1!==this.__CE_state)return Te.call(this,b);var c=Re.call(this,b);Te.call(this,b);null!==c&&a.attributeChangedCallback(this,b,c,null,null)});N(Element.prototype,"removeAttributeNS",function(b,c){if(1!==this.__CE_state)return We.call(this,b,c);var d=Ue.call(this,b,c);We.call(this,b,c);var e=Ue.call(this,b,c);d!==e&&a.attributeChangedCallback(this,
+c,d,e,b)});gf?c(HTMLElement.prototype,gf):Xe?c(Element.prototype,Xe):console.warn("Custom Elements: `Element#insertAdjacentElement` was not patched.");hf?d(HTMLElement.prototype,hf):Ye?d(Element.prototype,Ye):console.warn("Custom Elements: `Element#insertAdjacentHTML` was not patched.");mf(a,Element.prototype,{aa:Ze,append:$e});pf(a)};var rf=window.customElements;if(!rf||rf.forcePolyfill||"function"!=typeof rf.define||"function"!=typeof rf.get){var lf=new te;kf();nf();mf(lf,DocumentFragment.prototype,{aa:He,append:Ie});of();qf();document.__CE_hasRegistry=!0;var customElements=new R(lf);Object.defineProperty(window,"customElements",{configurable:!0,enumerable:!0,value:customElements})};function xf(){this.end=this.start=0;this.rules=this.parent=this.previous=null;this.cssText=this.parsedCssText="";this.atRule=!1;this.type=0;this.parsedSelector=this.selector=this.keyframesName=""}
+function yf(a){a=a.replace(zf,"").replace(Af,"");var b=Bf,c=a,d=new xf;d.start=0;d.end=c.length;for(var e=d,f=0,h=c.length;f<h;f++)if("{"===c[f]){e.rules||(e.rules=[]);var g=e,k=g.rules[g.rules.length-1]||null;e=new xf;e.start=f+1;e.parent=g;e.previous=k;g.rules.push(e)}else"}"===c[f]&&(e.end=f+1,e=e.parent||d);return b(d,a)}
+function Bf(a,b){var c=b.substring(a.start,a.end-1);a.parsedCssText=a.cssText=c.trim();a.parent&&(c=b.substring(a.previous?a.previous.end:a.parent.start,a.start-1),c=Cf(c),c=c.replace(Df," "),c=c.substring(c.lastIndexOf(";")+1),c=a.parsedSelector=a.selector=c.trim(),a.atRule=0===c.indexOf("@"),a.atRule?0===c.indexOf("@media")?a.type=Ef:c.match(Ff)&&(a.type=Gf,a.keyframesName=a.selector.split(Df).pop()):a.type=0===c.indexOf("--")?Hf:If);if(c=a.rules)for(var d=0,e=c.length,f;d<e&&(f=c[d]);d++)Bf(f,
+b);return a}function Cf(a){return a.replace(/\\([0-9a-f]{1,6})\s/gi,function(a,c){a=c;for(c=6-a.length;c--;)a="0"+a;return"\\"+a})}
+function Jf(a,b,c){c=void 0===c?"":c;var d="";if(a.cssText||a.rules){var e=a.rules,f;if(f=e)f=e[0],f=!(f&&f.selector&&0===f.selector.indexOf("--"));if(f){f=0;for(var h=e.length,g;f<h&&(g=e[f]);f++)d=Jf(g,b,d)}else b?b=a.cssText:(b=a.cssText,b=b.replace(Kf,"").replace(Lf,""),b=b.replace(Mf,"").replace(Nf,"")),(d=b.trim())&&(d="  "+d+"\n")}d&&(a.selector&&(c+=a.selector+" {\n"),c+=d,a.selector&&(c+="}\n\n"));return c}
+var If=1,Gf=7,Ef=4,Hf=1E3,zf=/\/\*[^*]*\*+([^/*][^*]*\*+)*\//gim,Af=/@import[^;]*;/gim,Kf=/(?:^[^;\-\s}]+)?--[^;{}]*?:[^{};]*?(?:[;\n]|$)/gim,Lf=/(?:^[^;\-\s}]+)?--[^;{}]*?:[^{};]*?{[^}]*?}(?:[;\n]|$)?/gim,Mf=/@apply\s*\(?[^);]*\)?\s*(?:[;\n]|$)?/gim,Nf=/[^;:]*?:[^;]*?var\([^;]*\)(?:[;\n]|$)?/gim,Ff=/^@[^\s]*keyframes/,Df=/\s+/g;var S=!(window.ShadyDOM&&window.ShadyDOM.inUse),Of;function Pf(a){Of=a&&a.shimcssproperties?!1:S||!(navigator.userAgent.match(/AppleWebKit\/601|Edge\/15/)||!window.CSS||!CSS.supports||!CSS.supports("box-shadow","0 0 0 var(--foo)"))}window.ShadyCSS&&void 0!==window.ShadyCSS.nativeCss?Of=window.ShadyCSS.nativeCss:window.ShadyCSS?(Pf(window.ShadyCSS),window.ShadyCSS=void 0):Pf(window.WebComponents&&window.WebComponents.flags);var U=Of;var Qf=/(?:^|[;\s{]\s*)(--[\w-]*?)\s*:\s*(?:((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^)]*?\)|[^};{])+)|\{([^}]*)\}(?:(?=[;\s}])|$))/gi,Rf=/(?:^|\W+)@apply\s*\(?([^);\n]*)\)?/gi,Sf=/(--[\w-]+)\s*([:,;)]|$)/gi,Tf=/(animation\s*:)|(animation-name\s*:)/,Uf=/@media\s(.*)/,Vf=/\{[^}]*\}/g;var Wf=new Set;function Xf(a,b){if(!a)return"";"string"===typeof a&&(a=yf(a));b&&Yf(a,b);return Jf(a,U)}function Zf(a){!a.__cssRules&&a.textContent&&(a.__cssRules=yf(a.textContent));return a.__cssRules||null}function $f(a){return!!a.parent&&a.parent.type===Gf}function Yf(a,b,c,d){if(a){var e=!1,f=a.type;if(d&&f===Ef){var h=a.selector.match(Uf);h&&(window.matchMedia(h[1]).matches||(e=!0))}f===If?b(a):c&&f===Gf?c(a):f===Hf&&(e=!0);if((a=a.rules)&&!e){e=0;f=a.length;for(var g;e<f&&(g=a[e]);e++)Yf(g,b,c,d)}}}
+function ag(a,b,c,d){var e=document.createElement("style");b&&e.setAttribute("scope",b);e.textContent=a;bg(e,c,d);return e}var cg=null;function bg(a,b,c){b=b||document.head;b.insertBefore(a,c&&c.nextSibling||b.firstChild);cg?a.compareDocumentPosition(cg)===Node.DOCUMENT_POSITION_PRECEDING&&(cg=a):cg=a}
+function dg(a,b){var c=a.indexOf("var(");if(-1===c)return b(a,"","","");a:{var d=0;var e=c+3;for(var f=a.length;e<f;e++)if("("===a[e])d++;else if(")"===a[e]&&0===--d)break a;e=-1}d=a.substring(c+4,e);c=a.substring(0,c);a=dg(a.substring(e+1),b);e=d.indexOf(",");return-1===e?b(c,d.trim(),"",a):b(c,d.substring(0,e).trim(),d.substring(e+1).trim(),a)}function eg(a,b){S?a.setAttribute("class",b):window.ShadyDOM.nativeMethods.setAttribute.call(a,"class",b)}
+function fg(a){var b=a.localName,c="";b?-1<b.indexOf("-")||(c=b,b=a.getAttribute&&a.getAttribute("is")||""):(b=a.is,c=a.extends);return{is:b,P:c}};function gg(){}function hg(a,b){var c=W;a.__styleScoped?a.__styleScoped=null:ig(c,a,function(a){jg(a,b||"")})}function ig(a,b,c){b.nodeType===Node.ELEMENT_NODE&&c(b);if(b="template"===b.localName?(b.content||b.kb||b).childNodes:b.children||b.childNodes)for(var d=0;d<b.length;d++)ig(a,b[d],c)}
+function jg(a,b,c){if(b)if(a.classList)c?(a.classList.remove("style-scope"),a.classList.remove(b)):(a.classList.add("style-scope"),a.classList.add(b));else if(a.getAttribute){var d=a.getAttribute(kg);c?d&&(b=d.replace("style-scope","").replace(b,""),eg(a,b)):eg(a,(d?d+" ":"")+"style-scope "+b)}}function lg(a,b,c){var d=W;a.__styleScoped?a.__styleScoped=null:ig(d,a,function(a){jg(a,b,!0);jg(a,c)})}function mg(a,b){var c=W;a.__styleScoped?a.__styleScoped=null:ig(c,a,function(a){jg(a,b||"",!0)})}
+function ng(a,b,c){var d=W,e=a.__cssBuild;S||"shady"===e?b=Xf(b,c):(a=fg(a),b=og(d,b,a.is,a.P,c)+"\n\n");return b.trim()}function og(a,b,c,d,e){var f=pg(c,d);c=c?qg+c:"";return Xf(b,function(b){b.c||(b.selector=b.s=rg(a,b,a.b,c,f),b.c=!0);e&&e(b,c,f)})}function pg(a,b){return b?"[is="+a+"]":a}function rg(a,b,c,d,e){var f=b.selector.split(sg);if(!$f(b)){b=0;for(var h=f.length,g;b<h&&(g=f[b]);b++)f[b]=c.call(a,g,d,e)}return f.join(sg)}
+function tg(a){return a.replace(ug,function(a,c,d){-1<d.indexOf("+")?d=d.replace(/\+/g,"___"):-1<d.indexOf("___")&&(d=d.replace(/___/g,"+"));return":"+c+"("+d+")"})}gg.prototype.b=function(a,b,c){var d=!1;a=a.trim();var e=ug.test(a);e&&(a=a.replace(ug,function(a,b,c){return":"+b+"("+c.replace(/\s/g,"")+")"}),a=tg(a));a=a.replace(vg,wg+" $1");a=a.replace(xg,function(a,e,g){d||(a=yg(g,e,b,c),d=d||a.stop,e=a.Oa,g=a.value);return e+g});e&&(a=tg(a));return a};
+function yg(a,b,c,d){var e=a.indexOf(zg);0<=a.indexOf(wg)?a=Ag(a,d):0!==e&&(a=c?Bg(a,c):a);c=!1;0<=e&&(b="",c=!0);if(c){var f=!0;c&&(a=a.replace(Cg,function(a,b){return" > "+b}))}a=a.replace(Dg,function(a,b,c){return'[dir="'+c+'"] '+b+", "+b+'[dir="'+c+'"]'});return{value:a,Oa:b,stop:f}}function Bg(a,b){a=a.split(Eg);a[0]+=b;return a.join(Eg)}
+function Ag(a,b){var c=a.match(Fg);return(c=c&&c[2].trim()||"")?c[0].match(Gg)?a.replace(Fg,function(a,c,f){return b+f}):c.split(Gg)[0]===b?c:Hg:a.replace(wg,b)}function Ig(a){a.selector===Jg&&(a.selector="html")}gg.prototype.c=function(a){return a.match(zg)?this.b(a,Kg):Bg(a.trim(),Kg)};ea.Object.defineProperties(gg.prototype,{a:{configurable:!0,enumerable:!0,get:function(){return"style-scope"}}});
+var ug=/:(nth[-\w]+)\(([^)]+)\)/,Kg=":not(.style-scope)",sg=",",xg=/(^|[\s>+~]+)((?:\[.+?\]|[^\s>+~=[])+)/g,Gg=/[[.:#*]/,wg=":host",Jg=":root",zg="::slotted",vg=new RegExp("^("+zg+")"),Fg=/(:host)(?:\(((?:\([^)(]*\)|[^)(]*)+?)\))/,Cg=/(?:::slotted)(?:\(((?:\([^)(]*\)|[^)(]*)+?)\))/,Dg=/(.*):dir\((?:(ltr|rtl))\)/,qg=".",Eg=":",kg="class",Hg="should_not_match",W=new gg;function Lg(a,b,c,d){this.B=a||null;this.b=b||null;this.oa=c||[];this.L=null;this.P=d||"";this.a=this.v=this.G=null}function X(a){return a?a.__styleInfo:null}function Mg(a,b){return a.__styleInfo=b}Lg.prototype.c=function(){return this.B};Lg.prototype._getStyleRules=Lg.prototype.c;function Ng(a){var b=this.matches||this.matchesSelector||this.mozMatchesSelector||this.msMatchesSelector||this.oMatchesSelector||this.webkitMatchesSelector;return b&&b.call(this,a)}var Og=navigator.userAgent.match("Trident");function Pg(){}function Qg(a){var b={},c=[],d=0;Yf(a,function(a){Rg(a);a.index=d++;a=a.m.cssText;for(var c;c=Sf.exec(a);){var e=c[1];":"!==c[2]&&(b[e]=!0)}},function(a){c.push(a)});a.b=c;a=[];for(var e in b)a.push(e);return a}
+function Rg(a){if(!a.m){var b={},c={};Sg(a,c)&&(b.A=c,a.rules=null);b.cssText=a.parsedCssText.replace(Vf,"").replace(Qf,"");a.m=b}}function Sg(a,b){var c=a.m;if(c){if(c.A)return Object.assign(b,c.A),!0}else{c=a.parsedCssText;for(var d;a=Qf.exec(c);){d=(a[2]||a[3]).trim();if("inherit"!==d||"unset"!==d)b[a[1].trim()]=d;d=!0}return d}}
+function Tg(a,b,c){b&&(b=0<=b.indexOf(";")?Ug(a,b,c):dg(b,function(b,e,f,h){if(!e)return b+h;(e=Tg(a,c[e],c))&&"initial"!==e?"apply-shim-inherit"===e&&(e="inherit"):e=Tg(a,c[f]||f,c)||f;return b+(e||"")+h}));return b&&b.trim()||""}
+function Ug(a,b,c){b=b.split(";");for(var d=0,e,f;d<b.length;d++)if(e=b[d]){Rf.lastIndex=0;if(f=Rf.exec(e))e=Tg(a,c[f[1]],c);else if(f=e.indexOf(":"),-1!==f){var h=e.substring(f);h=h.trim();h=Tg(a,h,c)||h;e=e.substring(0,f)+h}b[d]=e&&e.lastIndexOf(";")===e.length-1?e.slice(0,-1):e||""}return b.join(";")}
+function Vg(a,b){var c={},d=[];Yf(a,function(a){a.m||Rg(a);var e=a.s||a.parsedSelector;b&&a.m.A&&e&&Ng.call(b,e)&&(Sg(a,c),a=a.index,e=parseInt(a/32,10),d[e]=(d[e]||0)|1<<a%32)},null,!0);return{A:c,key:d}}
+function Wg(a,b,c,d){b.m||Rg(b);if(b.m.A){var e=fg(a);a=e.is;e=e.P;e=a?pg(a,e):"html";var f=b.parsedSelector,h=":host > *"===f||"html"===f,g=0===f.indexOf(":host")&&!h;"shady"===c&&(h=f===e+" > *."+e||-1!==f.indexOf("html"),g=!h&&0===f.indexOf(e));"shadow"===c&&(h=":host > *"===f||"html"===f,g=g&&!h);if(h||g)c=e,g&&(b.s||(b.s=rg(W,b,W.b,a?qg+a:"",e)),c=b.s||e),d({ab:c,Ua:g,ub:h})}}
+function Xg(a,b){var c={},d={},e=b&&b.__cssBuild;Yf(b,function(b){Wg(a,b,e,function(e){Ng.call(a.lb||a,e.ab)&&(e.Ua?Sg(b,c):Sg(b,d))})},null,!0);return{$a:d,Sa:c}}
+function Yg(a,b,c,d){var e=fg(b),f=pg(e.is,e.P),h=new RegExp("(?:^|[^.#[:])"+(b.extends?"\\"+f.slice(0,-1)+"\\]":f)+"($|[.:[\\s>+~])");e=X(b).B;var g=Zg(e,d);return ng(b,e,function(b){var e="";b.m||Rg(b);b.m.cssText&&(e=Ug(a,b.m.cssText,c));b.cssText=e;if(!S&&!$f(b)&&b.cssText){var k=e=b.cssText;null==b.wa&&(b.wa=Tf.test(e));if(b.wa)if(null==b.$){b.$=[];for(var n in g)k=g[n],k=k(e),e!==k&&(e=k,b.$.push(n))}else{for(n=0;n<b.$.length;++n)k=g[b.$[n]],e=k(e);k=e}b.cssText=k;b.s=b.s||b.selector;e="."+
+d;n=b.s.split(",");k=0;for(var t=n.length,C;k<t&&(C=n[k]);k++)n[k]=C.match(h)?C.replace(f,e):e+" "+C;b.selector=n.join(",")}})}function Zg(a,b){a=a.b;var c={};if(!S&&a)for(var d=0,e=a[d];d<a.length;e=a[++d]){var f=e,h=b;f.i=new RegExp("\\b"+f.keyframesName+"(?!\\B|-)","g");f.a=f.keyframesName+"-"+h;f.s=f.s||f.selector;f.selector=f.s.replace(f.keyframesName,f.a);c[e.keyframesName]=$g(e)}return c}function $g(a){return function(b){return b.replace(a.i,a.a)}}
+function ah(a,b){var c=bh,d=Zf(a);a.textContent=Xf(d,function(a){var d=a.cssText=a.parsedCssText;a.m&&a.m.cssText&&(d=d.replace(Kf,"").replace(Lf,""),a.cssText=Ug(c,d,b))})}ea.Object.defineProperties(Pg.prototype,{a:{configurable:!0,enumerable:!0,get:function(){return"x-scope"}}});var bh=new Pg;var ch={},dh=window.customElements;if(dh&&!S){var eh=dh.define;dh.define=function(a,b,c){var d=document.createComment(" Shady DOM styles for "+a+" "),e=document.head;e.insertBefore(d,(cg?cg.nextSibling:null)||e.firstChild);cg=d;ch[a]=d;eh.call(dh,a,b,c)}};function fh(){this.cache={}}fh.prototype.store=function(a,b,c,d){var e=this.cache[a]||[];e.push({A:b,styleElement:c,v:d});100<e.length&&e.shift();this.cache[a]=e};fh.prototype.fetch=function(a,b,c){if(a=this.cache[a])for(var d=a.length-1;0<=d;d--){var e=a[d],f;a:{for(f=0;f<c.length;f++){var h=c[f];if(e.A[h]!==b[h]){f=!1;break a}}f=!0}if(f)return e}};function gh(){}
+function hh(a){for(var b=0;b<a.length;b++){var c=a[b];if(c.target!==document.documentElement&&c.target!==document.head)for(var d=0;d<c.addedNodes.length;d++){var e=c.addedNodes[d];if(e.nodeType===Node.ELEMENT_NODE){var f=e.getRootNode();var h=e;var g=[];h.classList?g=Array.from(h.classList):h instanceof window.SVGElement&&h.hasAttribute("class")&&(g=h.getAttribute("class").split(/\s+/));h=g;g=h.indexOf(W.a);if((h=-1<g?h[g+1]:"")&&f===e.ownerDocument)mg(e,h);else if(f.nodeType===Node.DOCUMENT_FRAGMENT_NODE&&(f=
+f.host))for(f=fg(f).is,f!==h&&lg(e,h,f),e=window.ShadyDOM.nativeMethods.querySelectorAll.call(e,":not(."+W.a+")"),f=0;f<e.length;f++)if(h=e[f],g=h.getRootNode().host)g=fg(g).is,jg(h,g)}}}}
+if(!S){var ih=new MutationObserver(hh),jh=function(a){ih.observe(a,{childList:!0,subtree:!0})};if(window.customElements&&!window.customElements.polyfillWrapFlushCallback)jh(document);else{var kh=function(){jh(document.body)};window.HTMLImports?window.HTMLImports.whenReady(kh):requestAnimationFrame(function(){if("loading"===document.readyState){var a=function(){kh();document.removeEventListener("readystatechange",a)};document.addEventListener("readystatechange",a)}else kh()})}gh=function(){hh(ih.takeRecords())}}
+var lh=gh;var mh={};var nh=Promise.resolve();function oh(a){if(a=mh[a])a._applyShimCurrentVersion=a._applyShimCurrentVersion||0,a._applyShimValidatingVersion=a._applyShimValidatingVersion||0,a._applyShimNextVersion=(a._applyShimNextVersion||0)+1}function ph(a){return a._applyShimCurrentVersion===a._applyShimNextVersion}function qh(a){a._applyShimValidatingVersion=a._applyShimNextVersion;a.b||(a.b=!0,nh.then(function(){a._applyShimCurrentVersion=a._applyShimNextVersion;a.b=!1}))};var rh=new fh;function Y(){this.J={};this.c=document.documentElement;var a=new xf;a.rules=[];this.i=Mg(this.c,new Lg(a));this.o=!1;this.b=this.a=null}p=Y.prototype;p.pa=function(){lh()};p.Qa=function(a){return Zf(a)};p.cb=function(a){return Xf(a)};p.prepareTemplate=function(a,b,c){this.prepareTemplateDom(a,b);this.prepareTemplateStyles(a,b,c)};
+p.prepareTemplateStyles=function(a,b,c){if(!a.o){a.o=!0;a.name=b;a.extends=c;mh[b]=a;var d=(d=a.content.querySelector("style"))?d.getAttribute("css-build")||"":"";var e=[];for(var f=a.content.querySelectorAll("style"),h=0;h<f.length;h++){var g=f[h];if(g.hasAttribute("shady-unscoped")){if(!S){var k=g.textContent;Wf.has(k)||(Wf.add(k),k=g.cloneNode(!0),document.head.appendChild(k));g.parentNode.removeChild(g)}}else e.push(g.textContent),g.parentNode.removeChild(g)}e=e.join("").trim();c={is:b,extends:c,
+ib:d};sh(this);f=Rf.test(e)||Qf.test(e);Rf.lastIndex=0;Qf.lastIndex=0;e=yf(e);f&&U&&this.a&&this.a.transformRules(e,b);a._styleAst=e;a.J=d;d=[];U||(d=Qg(a._styleAst));if(!d.length||U)e=S?a.content:null,b=ch[b],f=ng(c,a._styleAst),b=f.length?ag(f,c.is,e,b):void 0,a.a=b;a.i=d}};p.prepareTemplateDom=function(a,b){S||a.c||(a.c=!0,hg(a.content,b))};
+function th(a){!a.b&&window.ShadyCSS&&window.ShadyCSS.CustomStyleInterface&&(a.b=window.ShadyCSS.CustomStyleInterface,a.b.transformCallback=function(b){a.Aa(b)},a.b.validateCallback=function(){requestAnimationFrame(function(){(a.b.enqueued||a.o)&&a.flushCustomStyles()})})}function sh(a){!a.a&&window.ShadyCSS&&window.ShadyCSS.ApplyShim&&(a.a=window.ShadyCSS.ApplyShim,a.a.invalidCallback=oh);th(a)}
+p.flushCustomStyles=function(){sh(this);if(this.b){var a=this.b.processStyles();if(this.b.enqueued){if(U)for(var b=0;b<a.length;b++){var c=this.b.getStyleForCustomStyle(a[b]);if(c&&U&&this.a){var d=Zf(c);sh(this);this.a.transformRules(d);c.textContent=Xf(d)}}else for(uh(this,this.c,this.i),b=0;b<a.length;b++)(c=this.b.getStyleForCustomStyle(a[b]))&&ah(c,this.i.G);this.b.enqueued=!1;this.o&&!U&&this.styleDocument()}}};
+p.styleElement=function(a,b){var c=fg(a).is,d=X(a);if(!d){var e=fg(a);d=e.is;e=e.P;var f=ch[d];d=mh[d];if(d){var h=d._styleAst;var g=d.i}d=Mg(a,new Lg(h,f,g,e))}a!==this.c&&(this.o=!0);b&&(d.L=d.L||{},Object.assign(d.L,b));if(U){if(d.L){b=d.L;for(var k in b)null===k?a.style.removeProperty(k):a.style.setProperty(k,b[k])}if(((k=mh[c])||a===this.c)&&k&&k.a&&!ph(k)){if(ph(k)||k._applyShimValidatingVersion!==k._applyShimNextVersion)sh(this),this.a&&this.a.transformRules(k._styleAst,c),k.a.textContent=
+ng(a,d.B),qh(k);S&&(c=a.shadowRoot)&&(c.querySelector("style").textContent=ng(a,d.B));d.B=k._styleAst}}else if(this.pa(),uh(this,a,d),d.oa&&d.oa.length){c=d;k=fg(a).is;d=(b=rh.fetch(k,c.G,c.oa))?b.styleElement:null;h=c.v;(g=b&&b.v)||(g=this.J[k]=(this.J[k]||0)+1,g=k+"-"+g);c.v=g;g=c.v;e=bh;e=d?d.textContent||"":Yg(e,a,c.G,g);f=X(a);var l=f.a;l&&!S&&l!==d&&(l._useCount--,0>=l._useCount&&l.parentNode&&l.parentNode.removeChild(l));S?f.a?(f.a.textContent=e,d=f.a):e&&(d=ag(e,g,a.shadowRoot,f.b)):d?d.parentNode||
+(Og&&-1<e.indexOf("@media")&&(d.textContent=e),bg(d,null,f.b)):e&&(d=ag(e,g,null,f.b));d&&(d._useCount=d._useCount||0,f.a!=d&&d._useCount++,f.a=d);g=d;S||(d=c.v,f=e=a.getAttribute("class")||"",h&&(f=e.replace(new RegExp("\\s*x-scope\\s*"+h+"\\s*","g")," ")),f+=(f?" ":"")+"x-scope "+d,e!==f&&eg(a,f));b||rh.store(k,c.G,g,c.v)}};function vh(a,b){return(b=b.getRootNode().host)?X(b)?b:vh(a,b):a.c}
+function uh(a,b,c){a=vh(a,b);var d=X(a);a=Object.create(d.G||null);var e=Xg(b,c.B);b=Vg(d.B,b).A;Object.assign(a,e.Sa,b,e.$a);b=c.L;for(var f in b)if((e=b[f])||0===e)a[f]=e;f=bh;b=Object.getOwnPropertyNames(a);for(e=0;e<b.length;e++)d=b[e],a[d]=Tg(f,a[d],a);c.G=a}p.styleDocument=function(a){this.styleSubtree(this.c,a)};
+p.styleSubtree=function(a,b){var c=a.shadowRoot;(c||a===this.c)&&this.styleElement(a,b);if(b=c&&(c.children||c.childNodes))for(a=0;a<b.length;a++)this.styleSubtree(b[a]);else if(a=a.children||a.childNodes)for(b=0;b<a.length;b++)this.styleSubtree(a[b])};p.Aa=function(a){var b=this,c=Zf(a);Yf(c,function(a){if(S)Ig(a);else{var c=W;a.selector=a.parsedSelector;Ig(a);a.selector=a.s=rg(c,a,c.c,void 0,void 0)}U&&(sh(b),b.a&&b.a.transformRule(a))});U?a.textContent=Xf(c):this.i.B.rules.push(c)};
+p.getComputedStyleValue=function(a,b){var c;U||(c=(X(a)||X(vh(this,a))).G[b]);return(c=c||window.getComputedStyle(a).getPropertyValue(b))?c.trim():""};p.bb=function(a,b){var c=a.getRootNode();b=b?b.split(/\s/):[];c=c.host&&c.host.localName;if(!c){var d=a.getAttribute("class");if(d){d=d.split(/\s/);for(var e=0;e<d.length;e++)if(d[e]===W.a){c=d[e+1];break}}}c&&b.push(W.a,c);U||(c=X(a))&&c.v&&b.push(bh.a,c.v);eg(a,b.join(" "))};p.Na=function(a){return X(a)};Y.prototype.flush=Y.prototype.pa;
+Y.prototype.prepareTemplate=Y.prototype.prepareTemplate;Y.prototype.styleElement=Y.prototype.styleElement;Y.prototype.styleDocument=Y.prototype.styleDocument;Y.prototype.styleSubtree=Y.prototype.styleSubtree;Y.prototype.getComputedStyleValue=Y.prototype.getComputedStyleValue;Y.prototype.setElementClass=Y.prototype.bb;Y.prototype._styleInfoForNode=Y.prototype.Na;Y.prototype.transformCustomStyleForDocument=Y.prototype.Aa;Y.prototype.getStyleAst=Y.prototype.Qa;Y.prototype.styleAstToString=Y.prototype.cb;
+Y.prototype.flushCustomStyles=Y.prototype.flushCustomStyles;Object.defineProperties(Y.prototype,{nativeShadow:{get:function(){return S}},nativeCss:{get:function(){return U}}});var Z=new Y,wh,xh;window.ShadyCSS&&(wh=window.ShadyCSS.ApplyShim,xh=window.ShadyCSS.CustomStyleInterface);
+window.ShadyCSS={ScopingShim:Z,prepareTemplate:function(a,b,c){Z.flushCustomStyles();Z.prepareTemplate(a,b,c)},prepareTemplateDom:function(a,b){Z.prepareTemplateDom(a,b)},prepareTemplateStyles:function(a,b,c){Z.flushCustomStyles();Z.prepareTemplateStyles(a,b,c)},styleSubtree:function(a,b){Z.flushCustomStyles();Z.styleSubtree(a,b)},styleElement:function(a){Z.flushCustomStyles();Z.styleElement(a)},styleDocument:function(a){Z.flushCustomStyles();Z.styleDocument(a)},flushCustomStyles:function(){Z.flushCustomStyles()},
+getComputedStyleValue:function(a,b){return Z.getComputedStyleValue(a,b)},nativeCss:U,nativeShadow:S};wh&&(window.ShadyCSS.ApplyShim=wh);xh&&(window.ShadyCSS.CustomStyleInterface=xh);var yh=window.customElements,zh=window.HTMLImports,Ah=window.HTMLTemplateElement;window.WebComponents=window.WebComponents||{};if(yh&&yh.polyfillWrapFlushCallback){var Bh,Ch=function(){if(Bh){Ah.C&&Ah.C(window.document);var a=Bh;Bh=null;a();return!0}},Dh=zh.whenReady;yh.polyfillWrapFlushCallback(function(a){Bh=a;Dh(Ch)});zh.whenReady=function(a){Dh(function(){Ch()?zh.whenReady(a):a()})}}
+zh.whenReady(function(){requestAnimationFrame(function(){window.WebComponents.ready=!0;document.dispatchEvent(new CustomEvent("WebComponentsReady",{bubbles:!0}))})});var Eh=document.createElement("style");Eh.textContent="body {transition: opacity ease-in 0.2s; } \nbody[unresolved] {opacity: 0; display: block; overflow: hidden; position: relative; } \n";var Fh=document.querySelector("head");Fh.insertBefore(Eh,Fh.firstChild);}).call(this);
 
-window.HTMLImports.addModule(function(scope) {
-  var flags = scope.flags;
-  var IMPORT_LINK_TYPE = scope.IMPORT_LINK_TYPE;
-  var IMPORT_SELECTOR = scope.IMPORT_SELECTOR;
-  var rootDocument = scope.rootDocument;
-  var Loader = scope.Loader;
-  var Observer = scope.Observer;
-  var parser = scope.parser;
-  var importer = {
-    documents: {},
-    documentPreloadSelectors: IMPORT_SELECTOR,
-    importsPreloadSelectors: [ IMPORT_SELECTOR ].join(","),
-    loadNode: function(node) {
-      importLoader.addNode(node);
-    },
-    loadSubtree: function(parent) {
-      var nodes = this.marshalNodes(parent);
-      importLoader.addNodes(nodes);
-    },
-    marshalNodes: function(parent) {
-      return parent.querySelectorAll(this.loadSelectorsForNode(parent));
-    },
-    loadSelectorsForNode: function(node) {
-      var doc = node.ownerDocument || node;
-      return doc === rootDocument ? this.documentPreloadSelectors : this.importsPreloadSelectors;
-    },
-    loaded: function(url, elt, resource, err, redirectedUrl) {
-      flags.load && console.log("loaded", url, elt);
-      elt.__resource = resource;
-      elt.__error = err;
-      if (isImportLink(elt)) {
-        var doc = this.documents[url];
-        if (doc === undefined) {
-          doc = err ? null : makeDocument(resource, redirectedUrl || url);
-          if (doc) {
-            doc.__importLink = elt;
-            this.bootDocument(doc);
-          }
-          this.documents[url] = doc;
-        }
-        elt.__doc = doc;
-      }
-      parser.parseNext();
-    },
-    bootDocument: function(doc) {
-      this.loadSubtree(doc);
-      this.observer.observe(doc);
-      parser.parseNext();
-    },
-    loadedAll: function() {
-      parser.parseNext();
-    }
-  };
-  var importLoader = new Loader(importer.loaded.bind(importer), importer.loadedAll.bind(importer));
-  importer.observer = new Observer();
-  function isImportLink(elt) {
-    return isLinkRel(elt, IMPORT_LINK_TYPE);
-  }
-  function isLinkRel(elt, rel) {
-    return elt.localName === "link" && elt.getAttribute("rel") === rel;
-  }
-  function hasBaseURIAccessor(doc) {
-    return !!Object.getOwnPropertyDescriptor(doc, "baseURI");
-  }
-  function makeDocument(resource, url) {
-    var doc = document.implementation.createHTMLDocument(IMPORT_LINK_TYPE);
-    doc._URL = url;
-    var base = doc.createElement("base");
-    base.setAttribute("href", url);
-    if (!doc.baseURI && !hasBaseURIAccessor(doc)) {
-      Object.defineProperty(doc, "baseURI", {
-        value: url
-      });
-    }
-    var meta = doc.createElement("meta");
-    meta.setAttribute("charset", "utf-8");
-    doc.head.appendChild(meta);
-    doc.head.appendChild(base);
-    doc.body.innerHTML = resource;
-    if (window.HTMLTemplateElement && HTMLTemplateElement.bootstrap) {
-      HTMLTemplateElement.bootstrap(doc);
-    }
-    return doc;
-  }
-  if (!document.baseURI) {
-    var baseURIDescriptor = {
-      get: function() {
-        var base = document.querySelector("base");
-        return base ? base.href : window.location.href;
-      },
-      configurable: true
-    };
-    Object.defineProperty(document, "baseURI", baseURIDescriptor);
-    Object.defineProperty(rootDocument, "baseURI", baseURIDescriptor);
-  }
-  scope.importer = importer;
-  scope.importLoader = importLoader;
-});
-
-window.HTMLImports.addModule(function(scope) {
-  var parser = scope.parser;
-  var importer = scope.importer;
-  var dynamic = {
-    added: function(nodes) {
-      var owner, parsed, loading;
-      for (var i = 0, l = nodes.length, n; i < l && (n = nodes[i]); i++) {
-        if (!owner) {
-          owner = n.ownerDocument;
-          parsed = parser.isParsed(owner);
-        }
-        loading = this.shouldLoadNode(n);
-        if (loading) {
-          importer.loadNode(n);
-        }
-        if (this.shouldParseNode(n) && parsed) {
-          parser.parseDynamic(n, loading);
-        }
-      }
-    },
-    shouldLoadNode: function(node) {
-      return node.nodeType === 1 && matches.call(node, importer.loadSelectorsForNode(node));
-    },
-    shouldParseNode: function(node) {
-      return node.nodeType === 1 && matches.call(node, parser.parseSelectorsForNode(node));
-    }
-  };
-  importer.observer.addCallback = dynamic.added.bind(dynamic);
-  var matches = HTMLElement.prototype.matches || HTMLElement.prototype.matchesSelector || HTMLElement.prototype.webkitMatchesSelector || HTMLElement.prototype.mozMatchesSelector || HTMLElement.prototype.msMatchesSelector;
-});
-
-(function(scope) {
-  var initializeModules = scope.initializeModules;
-  var isIE = scope.isIE;
-  if (scope.useNative) {
-    return;
-  }
-  initializeModules();
-  var rootDocument = scope.rootDocument;
-  function bootstrap() {
-    window.HTMLImports.importer.bootDocument(rootDocument);
-  }
-  if (document.readyState === "complete" || document.readyState === "interactive" && !window.attachEvent) {
-    bootstrap();
-  } else {
-    document.addEventListener("DOMContentLoaded", bootstrap);
-  }
-})(window.HTMLImports);
-
-window.CustomElements = window.CustomElements || {
-  flags: {}
-};
-
-(function(scope) {
-  var flags = scope.flags;
-  var modules = [];
-  var addModule = function(module) {
-    modules.push(module);
-  };
-  var initializeModules = function() {
-    modules.forEach(function(module) {
-      module(scope);
-    });
-  };
-  scope.addModule = addModule;
-  scope.initializeModules = initializeModules;
-  scope.hasNative = Boolean(document.registerElement);
-  scope.isIE = /Trident/.test(navigator.userAgent);
-  scope.useNative = !flags.register && scope.hasNative && !window.ShadowDOMPolyfill && (!window.HTMLImports || window.HTMLImports.useNative);
-})(window.CustomElements);
-
-window.CustomElements.addModule(function(scope) {
-  var IMPORT_LINK_TYPE = window.HTMLImports ? window.HTMLImports.IMPORT_LINK_TYPE : "none";
-  function forSubtree(node, cb) {
-    findAllElements(node, function(e) {
-      if (cb(e)) {
-        return true;
-      }
-      forRoots(e, cb);
-    });
-    forRoots(node, cb);
-  }
-  function findAllElements(node, find, data) {
-    var e = node.firstElementChild;
-    if (!e) {
-      e = node.firstChild;
-      while (e && e.nodeType !== Node.ELEMENT_NODE) {
-        e = e.nextSibling;
-      }
-    }
-    while (e) {
-      if (find(e, data) !== true) {
-        findAllElements(e, find, data);
-      }
-      e = e.nextElementSibling;
-    }
-    return null;
-  }
-  function forRoots(node, cb) {
-    var root = node.shadowRoot;
-    while (root) {
-      forSubtree(root, cb);
-      root = root.olderShadowRoot;
-    }
-  }
-  function forDocumentTree(doc, cb) {
-    _forDocumentTree(doc, cb, []);
-  }
-  function _forDocumentTree(doc, cb, processingDocuments) {
-    doc = window.wrap(doc);
-    if (processingDocuments.indexOf(doc) >= 0) {
-      return;
-    }
-    processingDocuments.push(doc);
-    var imports = doc.querySelectorAll("link[rel=" + IMPORT_LINK_TYPE + "]");
-    for (var i = 0, l = imports.length, n; i < l && (n = imports[i]); i++) {
-      if (n.import) {
-        _forDocumentTree(n.import, cb, processingDocuments);
-      }
-    }
-    cb(doc);
-  }
-  scope.forDocumentTree = forDocumentTree;
-  scope.forSubtree = forSubtree;
-});
-
-window.CustomElements.addModule(function(scope) {
-  var flags = scope.flags;
-  var forSubtree = scope.forSubtree;
-  var forDocumentTree = scope.forDocumentTree;
-  function addedNode(node, isAttached) {
-    return added(node, isAttached) || addedSubtree(node, isAttached);
-  }
-  function added(node, isAttached) {
-    if (scope.upgrade(node, isAttached)) {
-      return true;
-    }
-    if (isAttached) {
-      attached(node);
-    }
-  }
-  function addedSubtree(node, isAttached) {
-    forSubtree(node, function(e) {
-      if (added(e, isAttached)) {
-        return true;
-      }
-    });
-  }
-  var hasThrottledAttached = window.MutationObserver._isPolyfilled && flags["throttle-attached"];
-  scope.hasPolyfillMutations = hasThrottledAttached;
-  scope.hasThrottledAttached = hasThrottledAttached;
-  var isPendingMutations = false;
-  var pendingMutations = [];
-  function deferMutation(fn) {
-    pendingMutations.push(fn);
-    if (!isPendingMutations) {
-      isPendingMutations = true;
-      setTimeout(takeMutations);
-    }
-  }
-  function takeMutations() {
-    isPendingMutations = false;
-    var $p = pendingMutations;
-    for (var i = 0, l = $p.length, p; i < l && (p = $p[i]); i++) {
-      p();
-    }
-    pendingMutations = [];
-  }
-  function attached(element) {
-    if (hasThrottledAttached) {
-      deferMutation(function() {
-        _attached(element);
-      });
-    } else {
-      _attached(element);
-    }
-  }
-  function _attached(element) {
-    if (element.__upgraded__ && !element.__attached) {
-      element.__attached = true;
-      if (element.attachedCallback) {
-        element.attachedCallback();
-      }
-    }
-  }
-  function detachedNode(node) {
-    detached(node);
-    forSubtree(node, function(e) {
-      detached(e);
-    });
-  }
-  function detached(element) {
-    if (hasThrottledAttached) {
-      deferMutation(function() {
-        _detached(element);
-      });
-    } else {
-      _detached(element);
-    }
-  }
-  function _detached(element) {
-    if (element.__upgraded__ && element.__attached) {
-      element.__attached = false;
-      if (element.detachedCallback) {
-        element.detachedCallback();
-      }
-    }
-  }
-  function inDocument(element) {
-    var p = element;
-    var doc = window.wrap(document);
-    while (p) {
-      if (p == doc) {
-        return true;
-      }
-      p = p.parentNode || p.nodeType === Node.DOCUMENT_FRAGMENT_NODE && p.host;
-    }
-  }
-  function watchShadow(node) {
-    if (node.shadowRoot && !node.shadowRoot.__watched) {
-      flags.dom && console.log("watching shadow-root for: ", node.localName);
-      var root = node.shadowRoot;
-      while (root) {
-        observe(root);
-        root = root.olderShadowRoot;
-      }
-    }
-  }
-  function handler(root, mutations) {
-    if (flags.dom) {
-      var mx = mutations[0];
-      if (mx && mx.type === "childList" && mx.addedNodes) {
-        if (mx.addedNodes) {
-          var d = mx.addedNodes[0];
-          while (d && d !== document && !d.host) {
-            d = d.parentNode;
-          }
-          var u = d && (d.URL || d._URL || d.host && d.host.localName) || "";
-          u = u.split("/?").shift().split("/").pop();
-        }
-      }
-      console.group("mutations (%d) [%s]", mutations.length, u || "");
-    }
-    var isAttached = inDocument(root);
-    mutations.forEach(function(mx) {
-      if (mx.type === "childList") {
-        forEach(mx.addedNodes, function(n) {
-          if (!n.localName) {
-            return;
-          }
-          addedNode(n, isAttached);
-        });
-        forEach(mx.removedNodes, function(n) {
-          if (!n.localName) {
-            return;
-          }
-          detachedNode(n);
-        });
-      }
-    });
-    flags.dom && console.groupEnd();
-  }
-  function takeRecords(node) {
-    node = window.wrap(node);
-    if (!node) {
-      node = window.wrap(document);
-    }
-    while (node.parentNode) {
-      node = node.parentNode;
-    }
-    var observer = node.__observer;
-    if (observer) {
-      handler(node, observer.takeRecords());
-      takeMutations();
-    }
-  }
-  var forEach = Array.prototype.forEach.call.bind(Array.prototype.forEach);
-  function observe(inRoot) {
-    if (inRoot.__observer) {
-      return;
-    }
-    var observer = new MutationObserver(handler.bind(this, inRoot));
-    observer.observe(inRoot, {
-      childList: true,
-      subtree: true
-    });
-    inRoot.__observer = observer;
-  }
-  function upgradeDocument(doc) {
-    doc = window.wrap(doc);
-    flags.dom && console.group("upgradeDocument: ", doc.baseURI.split("/").pop());
-    var isMainDocument = doc === window.wrap(document);
-    addedNode(doc, isMainDocument);
-    observe(doc);
-    flags.dom && console.groupEnd();
-  }
-  function upgradeDocumentTree(doc) {
-    forDocumentTree(doc, upgradeDocument);
-  }
-  var originalCreateShadowRoot = Element.prototype.createShadowRoot;
-  if (originalCreateShadowRoot) {
-    Element.prototype.createShadowRoot = function() {
-      var root = originalCreateShadowRoot.call(this);
-      window.CustomElements.watchShadow(this);
-      return root;
-    };
-  }
-  scope.watchShadow = watchShadow;
-  scope.upgradeDocumentTree = upgradeDocumentTree;
-  scope.upgradeDocument = upgradeDocument;
-  scope.upgradeSubtree = addedSubtree;
-  scope.upgradeAll = addedNode;
-  scope.attached = attached;
-  scope.takeRecords = takeRecords;
-});
-
-window.CustomElements.addModule(function(scope) {
-  var flags = scope.flags;
-  function upgrade(node, isAttached) {
-    if (node.localName === "template") {
-      if (window.HTMLTemplateElement && HTMLTemplateElement.decorate) {
-        HTMLTemplateElement.decorate(node);
-      }
-    }
-    if (!node.__upgraded__ && node.nodeType === Node.ELEMENT_NODE) {
-      var is = node.getAttribute("is");
-      var definition = scope.getRegisteredDefinition(node.localName) || scope.getRegisteredDefinition(is);
-      if (definition) {
-        if (is && definition.tag == node.localName || !is && !definition.extends) {
-          return upgradeWithDefinition(node, definition, isAttached);
-        }
-      }
-    }
-  }
-  function upgradeWithDefinition(element, definition, isAttached) {
-    flags.upgrade && console.group("upgrade:", element.localName);
-    if (definition.is) {
-      element.setAttribute("is", definition.is);
-    }
-    implementPrototype(element, definition);
-    element.__upgraded__ = true;
-    created(element);
-    if (isAttached) {
-      scope.attached(element);
-    }
-    scope.upgradeSubtree(element, isAttached);
-    flags.upgrade && console.groupEnd();
-    return element;
-  }
-  function implementPrototype(element, definition) {
-    if (Object.__proto__) {
-      element.__proto__ = definition.prototype;
-    } else {
-      customMixin(element, definition.prototype, definition.native);
-      element.__proto__ = definition.prototype;
-    }
-  }
-  function customMixin(inTarget, inSrc, inNative) {
-    var used = {};
-    var p = inSrc;
-    while (p !== inNative && p !== HTMLElement.prototype) {
-      var keys = Object.getOwnPropertyNames(p);
-      for (var i = 0, k; k = keys[i]; i++) {
-        if (!used[k]) {
-          Object.defineProperty(inTarget, k, Object.getOwnPropertyDescriptor(p, k));
-          used[k] = 1;
-        }
-      }
-      p = Object.getPrototypeOf(p);
-    }
-  }
-  function created(element) {
-    if (element.createdCallback) {
-      element.createdCallback();
-    }
-  }
-  scope.upgrade = upgrade;
-  scope.upgradeWithDefinition = upgradeWithDefinition;
-  scope.implementPrototype = implementPrototype;
-});
-
-window.CustomElements.addModule(function(scope) {
-  var isIE = scope.isIE;
-  var upgradeDocumentTree = scope.upgradeDocumentTree;
-  var upgradeAll = scope.upgradeAll;
-  var upgradeWithDefinition = scope.upgradeWithDefinition;
-  var implementPrototype = scope.implementPrototype;
-  var useNative = scope.useNative;
-  function register(name, options) {
-    var definition = options || {};
-    if (!name) {
-      throw new Error("document.registerElement: first argument `name` must not be empty");
-    }
-    if (name.indexOf("-") < 0) {
-      throw new Error("document.registerElement: first argument ('name') must contain a dash ('-'). Argument provided was '" + String(name) + "'.");
-    }
-    if (isReservedTag(name)) {
-      throw new Error("Failed to execute 'registerElement' on 'Document': Registration failed for type '" + String(name) + "'. The type name is invalid.");
-    }
-    if (getRegisteredDefinition(name)) {
-      throw new Error("DuplicateDefinitionError: a type with name '" + String(name) + "' is already registered");
-    }
-    if (!definition.prototype) {
-      definition.prototype = Object.create(HTMLElement.prototype);
-    }
-    definition.__name = name.toLowerCase();
-    if (definition.extends) {
-      definition.extends = definition.extends.toLowerCase();
-    }
-    definition.lifecycle = definition.lifecycle || {};
-    definition.ancestry = ancestry(definition.extends);
-    resolveTagName(definition);
-    resolvePrototypeChain(definition);
-    overrideAttributeApi(definition.prototype);
-    registerDefinition(definition.__name, definition);
-    definition.ctor = generateConstructor(definition);
-    definition.ctor.prototype = definition.prototype;
-    definition.prototype.constructor = definition.ctor;
-    if (scope.ready) {
-      upgradeDocumentTree(document);
-    }
-    return definition.ctor;
-  }
-  function overrideAttributeApi(prototype) {
-    if (prototype.setAttribute._polyfilled) {
-      return;
-    }
-    var setAttribute = prototype.setAttribute;
-    prototype.setAttribute = function(name, value) {
-      changeAttribute.call(this, name, value, setAttribute);
-    };
-    var removeAttribute = prototype.removeAttribute;
-    prototype.removeAttribute = function(name) {
-      changeAttribute.call(this, name, null, removeAttribute);
-    };
-    prototype.setAttribute._polyfilled = true;
-  }
-  function changeAttribute(name, value, operation) {
-    name = name.toLowerCase();
-    var oldValue = this.getAttribute(name);
-    operation.apply(this, arguments);
-    var newValue = this.getAttribute(name);
-    if (this.attributeChangedCallback && newValue !== oldValue) {
-      this.attributeChangedCallback(name, oldValue, newValue);
-    }
-  }
-  function isReservedTag(name) {
-    for (var i = 0; i < reservedTagList.length; i++) {
-      if (name === reservedTagList[i]) {
-        return true;
-      }
-    }
-  }
-  var reservedTagList = [ "annotation-xml", "color-profile", "font-face", "font-face-src", "font-face-uri", "font-face-format", "font-face-name", "missing-glyph" ];
-  function ancestry(extnds) {
-    var extendee = getRegisteredDefinition(extnds);
-    if (extendee) {
-      return ancestry(extendee.extends).concat([ extendee ]);
-    }
-    return [];
-  }
-  function resolveTagName(definition) {
-    var baseTag = definition.extends;
-    for (var i = 0, a; a = definition.ancestry[i]; i++) {
-      baseTag = a.is && a.tag;
-    }
-    definition.tag = baseTag || definition.__name;
-    if (baseTag) {
-      definition.is = definition.__name;
-    }
-  }
-  function resolvePrototypeChain(definition) {
-    if (!Object.__proto__) {
-      var nativePrototype = HTMLElement.prototype;
-      if (definition.is) {
-        var inst = document.createElement(definition.tag);
-        nativePrototype = Object.getPrototypeOf(inst);
-      }
-      var proto = definition.prototype, ancestor;
-      var foundPrototype = false;
-      while (proto) {
-        if (proto == nativePrototype) {
-          foundPrototype = true;
-        }
-        ancestor = Object.getPrototypeOf(proto);
-        if (ancestor) {
-          proto.__proto__ = ancestor;
-        }
-        proto = ancestor;
-      }
-      if (!foundPrototype) {
-        console.warn(definition.tag + " prototype not found in prototype chain for " + definition.is);
-      }
-      definition.native = nativePrototype;
-    }
-  }
-  function instantiate(definition) {
-    return upgradeWithDefinition(domCreateElement(definition.tag), definition);
-  }
-  var registry = {};
-  function getRegisteredDefinition(name) {
-    if (name) {
-      return registry[name.toLowerCase()];
-    }
-  }
-  function registerDefinition(name, definition) {
-    registry[name] = definition;
-  }
-  function generateConstructor(definition) {
-    return function() {
-      return instantiate(definition);
-    };
-  }
-  var HTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
-  function createElementNS(namespace, tag, typeExtension) {
-    if (namespace === HTML_NAMESPACE) {
-      return createElement(tag, typeExtension);
-    } else {
-      return domCreateElementNS(namespace, tag);
-    }
-  }
-  function createElement(tag, typeExtension) {
-    if (tag) {
-      tag = tag.toLowerCase();
-    }
-    if (typeExtension) {
-      typeExtension = typeExtension.toLowerCase();
-    }
-    var definition = getRegisteredDefinition(typeExtension || tag);
-    if (definition) {
-      if (tag == definition.tag && typeExtension == definition.is) {
-        return new definition.ctor();
-      }
-      if (!typeExtension && !definition.is) {
-        return new definition.ctor();
-      }
-    }
-    var element;
-    if (typeExtension) {
-      element = createElement(tag);
-      element.setAttribute("is", typeExtension);
-      return element;
-    }
-    element = domCreateElement(tag);
-    if (tag.indexOf("-") >= 0) {
-      implementPrototype(element, HTMLElement);
-    }
-    return element;
-  }
-  var domCreateElement = document.createElement.bind(document);
-  var domCreateElementNS = document.createElementNS.bind(document);
-  var isInstance;
-  if (!Object.__proto__ && !useNative) {
-    isInstance = function(obj, ctor) {
-      if (obj instanceof ctor) {
-        return true;
-      }
-      var p = obj;
-      while (p) {
-        if (p === ctor.prototype) {
-          return true;
-        }
-        p = p.__proto__;
-      }
-      return false;
-    };
-  } else {
-    isInstance = function(obj, base) {
-      return obj instanceof base;
-    };
-  }
-  function wrapDomMethodToForceUpgrade(obj, methodName) {
-    var orig = obj[methodName];
-    obj[methodName] = function() {
-      var n = orig.apply(this, arguments);
-      upgradeAll(n);
-      return n;
-    };
-  }
-  wrapDomMethodToForceUpgrade(Node.prototype, "cloneNode");
-  wrapDomMethodToForceUpgrade(document, "importNode");
-  document.registerElement = register;
-  document.createElement = createElement;
-  document.createElementNS = createElementNS;
-  scope.registry = registry;
-  scope.instanceof = isInstance;
-  scope.reservedTagList = reservedTagList;
-  scope.getRegisteredDefinition = getRegisteredDefinition;
-  document.register = document.registerElement;
-});
-
-(function(scope) {
-  var useNative = scope.useNative;
-  var initializeModules = scope.initializeModules;
-  var isIE = scope.isIE;
-  if (useNative) {
-    var nop = function() {};
-    scope.watchShadow = nop;
-    scope.upgrade = nop;
-    scope.upgradeAll = nop;
-    scope.upgradeDocumentTree = nop;
-    scope.upgradeSubtree = nop;
-    scope.takeRecords = nop;
-    scope.instanceof = function(obj, base) {
-      return obj instanceof base;
-    };
-  } else {
-    initializeModules();
-  }
-  var upgradeDocumentTree = scope.upgradeDocumentTree;
-  var upgradeDocument = scope.upgradeDocument;
-  if (!window.wrap) {
-    if (window.ShadowDOMPolyfill) {
-      window.wrap = window.ShadowDOMPolyfill.wrapIfNeeded;
-      window.unwrap = window.ShadowDOMPolyfill.unwrapIfNeeded;
-    } else {
-      window.wrap = window.unwrap = function(node) {
-        return node;
-      };
-    }
-  }
-  if (window.HTMLImports) {
-    window.HTMLImports.__importsParsingHook = function(elt) {
-      if (elt.import) {
-        upgradeDocument(wrap(elt.import));
-      }
-    };
-  }
-  function bootstrap() {
-    upgradeDocumentTree(window.wrap(document));
-    window.CustomElements.ready = true;
-    var requestAnimationFrame = window.requestAnimationFrame || function(f) {
-      setTimeout(f, 16);
-    };
-    requestAnimationFrame(function() {
-      setTimeout(function() {
-        window.CustomElements.readyTime = Date.now();
-        if (window.HTMLImports) {
-          window.CustomElements.elapsed = window.CustomElements.readyTime - window.HTMLImports.readyTime;
-        }
-        document.dispatchEvent(new CustomEvent("WebComponentsReady", {
-          bubbles: true
-        }));
-      });
-    });
-  }
-  if (document.readyState === "complete" || scope.flags.eager) {
-    bootstrap();
-  } else if (document.readyState === "interactive" && !window.attachEvent && (!window.HTMLImports || window.HTMLImports.ready)) {
-    bootstrap();
-  } else {
-    var loadEvent = window.HTMLImports && !window.HTMLImports.ready ? "HTMLImportsLoaded" : "DOMContentLoaded";
-    window.addEventListener(loadEvent, bootstrap);
-  }
-})(window.CustomElements);
-
-(function(scope) {
-  var style = document.createElement("style");
-  style.textContent = "" + "body {" + "transition: opacity ease-in 0.2s;" + " } \n" + "body[unresolved] {" + "opacity: 0; display: block; overflow: hidden; position: relative;" + " } \n";
-  var head = document.querySelector("head");
-  head.insertBefore(style, head.firstChild);
-})(window.WebComponents);
\ No newline at end of file
+//# sourceMappingURL=webcomponents-lite.js.map
diff --git a/rhodecode/public/robots.txt b/rhodecode/public/robots.txt
--- a/rhodecode/public/robots.txt
+++ b/rhodecode/public/robots.txt
@@ -1,8 +1,9 @@
 # See http://www.robotstxt.org/robotstxt.html for documentation on
 # how to use the robots.txt file
-#
-# To forbid all spiders from indexing, uncomment the next two lines:
-# User-Agent: *
-# Disallow: /
+
+User-agent: *
 
-User-Agent: *
+# To forbid all spiders from indexing, uncomment the next line:
+#Disallow: /
+
+
diff --git a/rhodecode/subscribers.py b/rhodecode/subscribers.py
--- a/rhodecode/subscribers.py
+++ b/rhodecode/subscribers.py
@@ -86,6 +86,8 @@ def add_request_user_context(event):
     Adds auth user into request context
     """
     request = event.request
+    # access req_id as soon as possible
+    req_id = request.req_id
 
     if hasattr(request, 'vcs_call'):
         # skip vcs calls
@@ -98,6 +100,8 @@ def add_request_user_context(event):
     auth_user = get_auth_user(request)
     request.user = auth_user
     request.environ['rc_auth_user'] = auth_user
+    request.environ['rc_auth_user_id'] = auth_user.user_id
+    request.environ['rc_req_id'] = req_id
 
 
 def inject_app_settings(event):
@@ -239,8 +243,11 @@ def write_js_routes_if_enabled(event):
         jsroutes_file_path = os.path.join(
             static_path, 'js', 'rhodecode', 'routes.js')
 
-        with io.open(jsroutes_file_path, 'w', encoding='utf-8') as f:
-            f.write(jsroutes_file_content)
+        try:
+            with io.open(jsroutes_file_path, 'w', encoding='utf-8') as f:
+                f.write(jsroutes_file_content)
+        except Exception:
+            log.exception('Failed to write routes.js into %s', jsroutes_file_path)
 
 
 class Subscriber(object):
diff --git a/rhodecode/templates/admin/admin_audit_logs.mako b/rhodecode/templates/admin/admin_audit_logs.mako
--- a/rhodecode/templates/admin/admin_audit_logs.mako
+++ b/rhodecode/templates/admin/admin_audit_logs.mako
@@ -14,12 +14,14 @@
         <input type='submit' value="${_('filter')}" class="btn" />
         ${_('Audit logs')} - ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
     ${h.end_form()}
-    <p class="tooltip filterexample" title="${h.tooltip(h.journal_filter_help(request))}">${_('Example Queries')}</p>
+    <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
+    <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
+
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
diff --git a/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako b/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako
--- a/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako
+++ b/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako
@@ -131,7 +131,7 @@ var repoFilter = function(data) {
 
     $.each(data.results[0].children, function() {
         // replace name to ID for submision
-        this.id = this.obj.repo_id;
+        this.id = this.repo_id;
         results.push(this);
     });
 
@@ -154,7 +154,7 @@ var selectVcsScope = function() {
     dropdownAutoWidth: true,
     containerCssClass: "drop-menu",
     dropdownCssClass: "drop-menu-dropdown",
-    formatResult: formatResult,
+    formatResult: formatRepoResult,
     query: $.debounce(250, function(query){
         self = this;
         var cacheKey = query.term;
diff --git a/rhodecode/templates/admin/my_account/my_account_emails.mako b/rhodecode/templates/admin/my_account/my_account_emails.mako
--- a/rhodecode/templates/admin/my_account/my_account_emails.mako
+++ b/rhodecode/templates/admin/my_account/my_account_emails.mako
@@ -47,8 +47,14 @@
           </table>
         </div>
 
+    % if c.user.extern_type != 'rhodecode':
+        <p>${_('Your user account details are managed by an external source. Details cannot be managed here.')}
+           <br/>${_('Source type')}: <strong>${c.user.extern_type}</strong>
+        </p>
+    % else:
         <div>
            ${c.form.render() | n}
         </div>
+    % endif
     </div>
 </div>
diff --git a/rhodecode/templates/admin/my_account/my_account_notifications.mako b/rhodecode/templates/admin/my_account/my_account_notifications.mako
--- a/rhodecode/templates/admin/my_account/my_account_notifications.mako
+++ b/rhodecode/templates/admin/my_account/my_account_notifications.mako
@@ -1,4 +1,5 @@
-<template is="dom-bind" id="notificationsPage">
+<dom-bind id="notificationsPage">
+<template>
 <iron-ajax id="toggleNotifications"
            method="post"
            url="${h.route_path('my_account_notifications_toggle_visibility')}"
@@ -60,6 +61,10 @@
 
 </div>
 
+
+</template>
+</dom-bind>
+
 <script type="text/javascript">
     /** because im not creating a custom element for this page
      * we need to push the function onto the dom-template
@@ -81,7 +86,7 @@
         var levels = ['info', 'error', 'warning', 'success'];
         var level = levels[Math.floor(Math.random()*levels.length)];
         function getRandomArbitrary(min, max) {
-          return parseInt(Math.random() * (max - min) + min);
+            return parseInt(Math.random() * (max - min) + min);
         }
         function shuffle(a) {
             var j, x, i;
@@ -126,5 +131,3 @@
     };
 
 </script>
-
-</template>
diff --git a/rhodecode/templates/admin/my_account/my_account_ssh_keys.mako b/rhodecode/templates/admin/my_account/my_account_ssh_keys.mako
--- a/rhodecode/templates/admin/my_account/my_account_ssh_keys.mako
+++ b/rhodecode/templates/admin/my_account/my_account_ssh_keys.mako
@@ -8,7 +8,8 @@
             <tr>
                 <th>${_('Fingerprint')}</th>
                 <th>${_('Description')}</th>
-                <th>${_('Created')}</th>
+                <th>${_('Created on')}</th>
+                <th>${_('Accessed on')}</th>
                 <th>${_('Action')}</th>
             </tr>
             % if not c.ssh_enabled:
@@ -22,6 +23,7 @@
                         </td>
                         <td class="td-wrap">${ssh_key.description}</td>
                         <td class="td-tags">${h.format_date(ssh_key.created_on)}</td>
+                        <td class="td-tags">${h.format_date(ssh_key.accessed_on)}</td>
 
                         <td class="td-action">
                             ${h.secure_form(h.route_path('my_account_ssh_keys_delete'), request=request)}
diff --git a/rhodecode/templates/admin/my_account/my_account_user_group_membership.mako b/rhodecode/templates/admin/my_account/my_account_user_group_membership.mako
--- a/rhodecode/templates/admin/my_account/my_account_user_group_membership.mako
+++ b/rhodecode/templates/admin/my_account/my_account_user_group_membership.mako
@@ -38,7 +38,7 @@ var api;
          { data: {"_": "group_name",
                   "sort": "group_name"}, title: "${_('Name')}", className: "td-componentname," ,
             render: function (data,type,full,meta)
-                    {return '<div><i class="icon-group" title="User group">'+data+'</i></div>'}},
+                    {return '<div><i class="icon-user-group" title="User group">'+data+'</i></div>'}},
 
          { data: {"_": "group_description",
                   "sort": "group_description"}, title: "${_('Description')}", className: "td-description" },
diff --git a/rhodecode/templates/admin/permissions/permissions.mako b/rhodecode/templates/admin/permissions/permissions.mako
--- a/rhodecode/templates/admin/permissions/permissions.mako
+++ b/rhodecode/templates/admin/permissions/permissions.mako
@@ -38,6 +38,9 @@
           <li class="${'active' if c.active=='objects' else ''}">
             <a href="${h.route_path('admin_permissions_object')}">${_('Object')}</a>
           </li>
+          <li class="${'active' if c.active=='branch' else ''}">
+            <a href="${h.route_path('admin_permissions_branch')}">${_('Branch')}</a>
+          </li>
           <li class="${'active' if c.active=='ips' else ''}">
             <a href="${h.route_path('admin_permissions_ips')}">${_('IP Whitelist')}</a>
           </li>
diff --git a/rhodecode/templates/admin/permissions/permissions_branch.mako b/rhodecode/templates/admin/permissions/permissions_branch.mako
new file mode 100644
--- /dev/null
+++ b/rhodecode/templates/admin/permissions/permissions_branch.mako
@@ -0,0 +1,9 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">${_('Default Permissions for Branches.')}</h3>
+    </div>
+    <div class="panel-body">
+        <h4>${_('This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license.').format(sales_email='<a href="mailto:sales@rhodecode.com">sales@rhodecode.com</a>')|n}</h4>
+        <img style="width: 100%; height: 100%" src="${h.asset('images/ee_features/admin_branch_permissions.png')}"/>
+    </div>
+</div>
diff --git a/rhodecode/templates/admin/permissions/permissions_objects.mako b/rhodecode/templates/admin/permissions/permissions_objects.mako
--- a/rhodecode/templates/admin/permissions/permissions_objects.mako
+++ b/rhodecode/templates/admin/permissions/permissions_objects.mako
@@ -3,7 +3,10 @@
         <h3 class="panel-title">${_('Default Permissions for Repositories, User Groups and Repository Groups.')}</h3>
     </div>
     <div class="panel-body">
-        <p>${_('Default system permissions. Each permissions management entity will be created with the following default settings. Check the overwrite checkbox to force any permission changes on already existing settings.')}
+        <p>
+        ${_('Default access permissions. This defines permissions for the `default` user from which other users inherit permissions.')}
+        <br/>
+        ${_('Check the overwrite checkbox to force change all previously defined permissions for `default` user to the new selected value.')}
         </p>
         ${h.secure_form(h.route_path('admin_permissions_object_update'), request=request)}
             <div class="form">
@@ -45,7 +48,7 @@
                             ${h.select('default_user_group_perm','',c.user_group_perms_choices)}
                             ${h.checkbox('overwrite_default_user_group','true')}
                             <label for="overwrite_default_user_group">
-                                <span class="tooltip" title="${h.tooltip(_('All default permissions on each user group will be reset to chosen permission, note that all custom default permission on repository groups will be lost'))}">
+                                <span class="tooltip" title="${h.tooltip(_('All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost'))}">
                                     ${_('Overwrite Existing Settings')}
                                 </span>
                             </label>
diff --git a/rhodecode/templates/admin/permissions/permissions_ssh_keys.mako b/rhodecode/templates/admin/permissions/permissions_ssh_keys.mako
--- a/rhodecode/templates/admin/permissions/permissions_ssh_keys.mako
+++ b/rhodecode/templates/admin/permissions/permissions_ssh_keys.mako
@@ -22,21 +22,21 @@
 $(document).ready(function() {
     var $sshKeyListTable = $('#ssh_keys_table');
 
-    var getDatatableCount = function(){
-      var table = $sshKeyListTable.dataTable();
-      var page = table.api().page.info();
-      var  active = page.recordsDisplay;
-      var  total = page.recordsTotal;
-
-      var _text = _gettext("{0} out of {1} ssh keys").format(active, total);
-      $('#ssh_keys_count').text(_text);
-    };
-
     // user list
     $sshKeyListTable.DataTable({
       processing: true,
       serverSide: true,
-      ajax: "${h.route_path('admin_permissions_ssh_keys_data')}",
+      ajax: {
+          "url": "${h.route_path('admin_permissions_ssh_keys_data')}",
+          "dataSrc": function ( json ) {
+              var filteredCount = json.recordsFiltered;
+              var total = json.recordsTotal;
+
+              var _text = _gettext("{0} out of {1} ssh keys").format(filteredCount, total);
+              $('#ssh_keys_count').text(_text);
+              return json.data;
+          }
+      },
       dom: 'rtp',
       pageLength: ${c.visual.admin_grid_items},
       order: [[ 0, "asc" ]],
@@ -75,11 +75,6 @@
         $sshKeyListTable.css('opacity', 0.3);
     });
 
-    // refresh counters on draw
-    $sshKeyListTable.on('draw.dt', function(){
-        getDatatableCount();
-    });
-
     // filter
     $('#q_filter').on('keyup',
         $.debounce(250, function() {
diff --git a/rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako b/rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako
--- a/rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako
@@ -13,10 +13,12 @@
                 <th class="td-radio">${_('Write')}</th>
                 <th class="td-radio">${_('Admin')}</th>
                 <th class="td-owner">${_('User/User Group')}</th>
-                <th></th>
+                <th class="td-action"></th>
+                <th class="td-action"></th>
             </tr>
             ## USERS
             %for _user in c.repo_group.permissions():
+                ## super admin/owner row
                 %if getattr(_user, 'admin_row', None) or getattr(_user, 'owner_row', None):
                     <tr class="perm_admin_row">
                         <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.none', disabled="disabled")}</td>
@@ -34,6 +36,18 @@
                                 %endif
                         </td>
                         <td></td>
+                        <td class="quick_repo_menu">
+                            % if c.rhodecode_user.is_admin:
+                                <i class="icon-more"></i>
+                                <div class="menu_items_container" style="display: none;">
+                                <ul class="menu_items">
+                                  <li>
+                                     ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-groups-permissions'))}
+                                  </li>
+                                </ul>
+                                </div>
+                            % endif
+                        </td>
                     </tr>
                 %else:
                     <tr>
@@ -50,6 +64,9 @@
                                     ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
                                 % else:
                                     ${h.link_to_user(_user.username)}
+                                    %if getattr(_user, 'duplicate_perm', None):
+                                        (${_('inactive duplicate')})
+                                    %endif
                                 % endif
                             </span>
                         </td>
@@ -57,12 +74,28 @@
                             %if _user.username != h.DEFAULT_USER:
                                 <span  class="btn btn-link btn-danger revoke_perm"
                                   member="${_user.user_id}" member_type="user">
-                                <i class="icon-remove"></i> ${_('Revoke')}
+                                ${_('Remove')}
                                 </span>
                             %endif
                         </td>
+                        <td class="quick_repo_menu">
+                            % if c.rhodecode_user.is_admin:
+                                <i class="icon-more"></i>
+                                <div class="menu_items_container" style="display: none;">
+                                <ul class="menu_items">
+                                  <li>
+                                    % if _user.username == h.DEFAULT_USER:
+                                        ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-groups-permissions'))}
+                                    % else:
+                                        ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-groups-permissions'))}
+                                    % endif
+                                  </li>
+                                </ul>
+                                </div>
+                            % endif
+                        </td>
                         %else:
-                            ## special case for current user permissions, we make sure he cannot take his own permissions
+                            ## special case for currently logged-in user permissions, we make sure he cannot take his own permissions
                             <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.none', disabled="disabled")}</td>
                             <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.read', disabled="disabled")}</td>
                             <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.write', disabled="disabled")}</td>
@@ -74,11 +107,26 @@
                                         ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
                                     % else:
                                         ${h.link_to_user(_user.username)}
+                                        %if getattr(_user, 'duplicate_perm', None):
+                                            (${_('inactive duplicate')})
+                                        %endif
                                     % endif
                                     <span class="user-perm-help-text">(${_('delegated admin')})</span>
                                 </span>
                             </td>
                             <td></td>
+                            <td class="quick_repo_menu">
+                                % if c.rhodecode_user.is_admin:
+                                    <i class="icon-more"></i>
+                                    <div class="menu_items_container" style="display: none;">
+                                    <ul class="menu_items">
+                                      <li>
+                                         ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-groups-permissions'))}
+                                      </li>
+                                    </ul>
+                                    </div>
+                                % endif
+                            </td>
                         %endif
                     </tr>
                 %endif
@@ -92,7 +140,7 @@
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'group.write', checked=_user_group.permission=='group.write')}</td>
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'group.admin', checked=_user_group.permission=='group.admin')}</td>
                     <td class="td-componentname">
-                        <i class="icon-group" ></i>
+                        <i class="icon-user-group"></i>
                         %if h.HasPermissionAny('hg.admin')():
                          <a href="${h.route_path('edit_user_group',user_group_id=_user_group.users_group_id)}">
                              ${_user_group.users_group_name}
@@ -104,17 +152,40 @@
                     <td class="td-action">
                         <span  class="btn btn-link btn-danger revoke_perm"
                               member="${_user_group.users_group_id}" member_type="user_group">
-                        <i class="icon-remove"></i> ${_('Revoke')}
+                        ${_('Remove')}
                         </span>
                     </td>
+                    <td class="quick_repo_menu">
+                        % if c.rhodecode_user.is_admin:
+                            <i class="icon-more"></i>
+                            <div class="menu_items_container" style="display: none;">
+                            <ul class="menu_items">
+                              <li>
+                                 ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-groups-permissions'))}
+                              </li>
+                            </ul>
+                            </div>
+                        % endif
+                    </td>
                 </tr>
             %endfor
 
             <tr class="new_members" id="add_perm_input"></tr>
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td>
+                    <span id="add_perm" class="link">
+                        ${_('Add user/user group')}
+                    </span>
+                </td>
+                <td></td>
+            </tr>
         </table>
-        <div id="add_perm" class="link">
-            ${_('Add new')}
-        </div>
+
         <div class="fields">
             <div class="field">
                <div class="label label-radio">
@@ -142,5 +213,6 @@
     });
     $('.revoke_perm').on('click', function(e){
         markRevokePermInput($(this), 'group');
-    })
+    });
+    quick_repo_menu();
 </script>
diff --git a/rhodecode/templates/admin/repos/repo_add_base.mako b/rhodecode/templates/admin/repos/repo_add_base.mako
--- a/rhodecode/templates/admin/repos/repo_add_base.mako
+++ b/rhodecode/templates/admin/repos/repo_add_base.mako
@@ -40,6 +40,15 @@
         </div>
         <div class="field">
             <div class="label">
+                <label for="repo_type">${_('Type')}:</label>
+            </div>
+            <div class="select">
+                ${h.select('repo_type','hg',c.backends)}
+                <span class="help-block">${_('Set the type of repository to create.')}</span>
+            </div>
+        </div>
+        <div class="field">
+            <div class="label">
                 <label for="repo_description">${_('Description')}:</label>
             </div>
             <div class="textarea editor">
@@ -66,6 +75,15 @@
                  <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
              </div>
         </div>
+        <div class="field">
+            <div class="label">
+                <label for="repo_landing_rev">${_('Landing commit')}:</label>
+            </div>
+            <div class="select">
+                ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")}
+                <span class="help-block">${_('The default commit for file pages, downloads, full text search index, and README generation.')}</span>
+            </div>
+        </div>
         <div id="copy_perms" class="field">
             <div class="label label-checkbox">
                 <label for="repo_copy_permissions">${_('Copy Parent Group Permissions')}:</label>
@@ -76,24 +94,6 @@
             </div>
         </div>
         <div class="field">
-            <div class="label">
-                <label for="repo_type">${_('Type')}:</label>
-            </div>
-            <div class="select">
-                ${h.select('repo_type','hg',c.backends)}
-                <span class="help-block">${_('Set the type of repository to create.')}</span>
-            </div>
-        </div>
-        <div class="field">
-            <div class="label">
-                <label for="repo_landing_rev">${_('Landing commit')}:</label>
-            </div>
-            <div class="select">
-                ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")}
-                <span class="help-block">${_('The default commit for file pages, downloads, full text search index, and README generation.')}</span>
-            </div>
-        </div>
-        <div class="field">
             <div class="label label-checkbox">
                 <label for="repo_private">${_('Private Repository')}:</label>
             </div>
diff --git a/rhodecode/templates/admin/repos/repo_edit.mako b/rhodecode/templates/admin/repos/repo_edit.mako
--- a/rhodecode/templates/admin/repos/repo_edit.mako
+++ b/rhodecode/templates/admin/repos/repo_edit.mako
@@ -48,6 +48,9 @@
           <li class="${'active' if c.active=='permissions' else ''}">
               <a href="${h.route_path('edit_repo_perms', repo_name=c.repo_name)}">${_('Permissions')}</a>
           </li>
+          <li class="${'active' if c.active=='permissions_branch' else ''}">
+              <a href="${h.route_path('edit_repo_perms_branch', repo_name=c.repo_name)}">${_('Branch Permissions')}</a>
+          </li>
           <li class="${'active' if c.active=='advanced' else ''}">
               <a href="${h.route_path('edit_repo_advanced', repo_name=c.repo_name)}">${_('Advanced')}</a>
           </li>
diff --git a/rhodecode/templates/admin/repos/repo_edit_advanced.mako b/rhodecode/templates/admin/repos/repo_edit_advanced.mako
--- a/rhodecode/templates/admin/repos/repo_edit_advanced.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_advanced.mako
@@ -165,8 +165,8 @@ var repoTypeFilter = function(data) {
 
     $.each(data.results[0].children, function() {
         // filter out the SAME repo, it cannot be used as fork of itself
-        if (this.obj.repo_id != currentRepoId) {
-            this.id = this.obj.repo_id;
+        if (this.repo_id != currentRepoId) {
+            this.id = this.repo_id;
             results.push(this)
         }
     });
@@ -181,7 +181,7 @@ var repoTypeFilter = function(data) {
     dropdownAutoWidth: true,
     containerCssClass: "drop-menu",
     dropdownCssClass: "drop-menu-dropdown",
-    formatResult: formatResult,
+    formatResult: formatRepoResult,
     query: $.debounce(250, function(query){
         self = this;
         var cacheKey = query.term;
diff --git a/rhodecode/templates/admin/repos/repo_edit_audit.mako b/rhodecode/templates/admin/repos/repo_edit_audit.mako
--- a/rhodecode/templates/admin/repos/repo_edit_audit.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_audit.mako
@@ -14,7 +14,9 @@
             <input class="q_filter_box ${'' if c.filter_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.filter_term or ''}" placeholder="${_('audit filter...')}"/>
             <input type='submit' value="${_('filter')}" class="btn" />
         ${h.end_form()}
-        <p class="tooltip filterexample" style="position: inherit" title="${h.tooltip(h.journal_filter_help(request))}">${_('Example Queries')}</p>
+
+        <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
+        <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
 
         <%include file="/admin/admin_log_base.mako" />
 
diff --git a/rhodecode/templates/admin/repos/repo_edit_caches.mako b/rhodecode/templates/admin/repos/repo_edit_caches.mako
--- a/rhodecode/templates/admin/repos/repo_edit_caches.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_caches.mako
@@ -36,14 +36,14 @@
       <div class="field" >
            <table class="rctable edit_cache">
            <tr>
-            <th>${_('Prefix')}</th>
             <th>${_('Key')}</th>
+            <th>${_('Namespace')}</th>
             <th>${_('Active')}</th>
             </tr>
           %for cache in c.rhodecode_db_repo.cache_keys:
               <tr>
-                <td class="td-prefix">${cache.get_prefix() or '-'}</td>
-                <td class="td-cachekey">${cache.cache_key}</td>
+                <td class="td-prefix"><code>${cache.cache_key}</code></td>
+                <td class="td-cachekey"><code>${cache.cache_args}</code></td>
                 <td class="td-active">${h.bool2icon(cache.cache_active)}</td>
               </tr>
           %endfor
@@ -52,6 +52,63 @@
     </div>
 </div>
 
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">
+            ${_('Cache keys')}
+        </h3>
+    </div>
+    <div class="panel-body">
+<p>
+    Cache keys used for storing cached values of repository stats,
+    file tree history and file tree search.
+    Invalidating the cache will remove those entries.
+</p>
+<pre>
+region: ${c.region.name}
+backend: ${c.region.actual_backend.__class__}
+store: ${c.region.actual_backend.get_store()}
+
+
+% if c.repo_keys:
+${len(c.repo_keys)} <a href="#showKeys" onclick="$('#show-keys').toggle()">${_('Show all')}</a>
+<span id="show-keys" style="display: none">
+    % for k in c.repo_keys:
+ - ${k}
+    % endfor
+</span>
+% else:
+ NO KEYS FOUND
+% endif
+
+</pre>
+
+    </div>
+</div>
+
+
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">${_('Shadow Repositories')}</h3>
+    </div>
+    <div class="panel-body">
+        <table class="rctable edit_cache">
+            % if c.shadow_repos:
+            % for shadow_repo in c.shadow_repos:
+                <tr>
+                    <td>${shadow_repo}</td>
+                </tr>
+            % endfor
+            % else:
+                <tr>
+                    <td>${_('No Shadow repositories exist for this repository.')}</td>
+                </tr>
+            % endif
+
+        </table>
+    </div>
+</div>
+
 
 <div class="panel panel-default">
     <div class="panel-heading">
diff --git a/rhodecode/templates/admin/repos/repo_edit_permissions.mako b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
--- a/rhodecode/templates/admin/repos/repo_edit_permissions.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
@@ -13,7 +13,8 @@
                 <th class="td-radio">${_('Write')}</th>
                 <th class="td-radio">${_('Admin')}</th>
                 <th class="td-owner">${_('User/User Group')}</th>
-                <th></th>
+                <th class="td-action"></th>
+                <th class="td-action"></th>
             </tr>
             ## USERS
             %for _user in c.rhodecode_db_repo.permissions():
@@ -34,6 +35,18 @@
                             %endif
                         </td>
                         <td></td>
+                        <td class="quick_repo_menu">
+                            % if c.rhodecode_user.is_admin:
+                                <i class="icon-more"></i>
+                                <div class="menu_items_container" style="display: none;">
+                                <ul class="menu_items">
+                                  <li>
+                                     ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
+                                  </li>
+                                </ul>
+                                </div>
+                            % endif
+                        </td>
                     </tr>
                 %elif _user.username == h.DEFAULT_USER and c.rhodecode_db_repo.private:
                     <tr>
@@ -46,11 +59,24 @@
                             ${base.gravatar(h.DEFAULT_USER_EMAIL, 16)}
                             ${h.DEFAULT_USER} - ${_('only users/user groups explicitly added here will have access')}</td>
                         <td></td>
+                        <td class="quick_repo_menu">
+                            % if c.rhodecode_user.is_admin:
+                                <i class="icon-more"></i>
+                                <div class="menu_items_container" style="display: none;">
+                                <ul class="menu_items">
+                                  <li>
+                                     ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))}
+                                  </li>
+                                </ul>
+                                </div>
+                            % endif
+                        </td>
                     </tr>
                 %else:
+                    <% used_by_n_rules = len(getattr(_user, 'branch_rules', None) or []) %>
                     <tr>
-                        <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.none', checked=_user.permission=='repository.none')}</td>
-                        <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.read', checked=_user.permission=='repository.read')}</td>
+                        <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.none', checked=_user.permission=='repository.none', disabled="disabled" if (used_by_n_rules and _user.username != h.DEFAULT_USER) else None)}</td>
+                        <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.read', checked=_user.permission=='repository.read', disabled="disabled" if (used_by_n_rules and _user.username != h.DEFAULT_USER) else None)}</td>
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.write', checked=_user.permission=='repository.write')}</td>
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.admin', checked=_user.permission=='repository.admin')}</td>
                         <td class="td-user">
@@ -60,17 +86,43 @@
                                     ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
                                 % else:
                                     ${h.link_to_user(_user.username)}
+                                    %if getattr(_user, 'duplicate_perm', None):
+                                        (${_('inactive duplicate')})
+                                    %endif
+                                    %if getattr(_user, 'branch_rules', None):
+                                        % if used_by_n_rules == 1:
+                                            (${_('used by {} branch rule, requires write+ permissions').format(used_by_n_rules)})
+                                        % else:
+                                            (${_('used by {} branch rules, requires write+ permissions').format(used_by_n_rules)})
+                                        % endif
+                                    %endif
                                 % endif
                             </span>
                         </td>
                         <td class="td-action">
-                          %if _user.username != h.DEFAULT_USER:
+                          %if _user.username != h.DEFAULT_USER and getattr(_user, 'branch_rules', None) is None:
                             <span class="btn btn-link btn-danger revoke_perm"
                                   member="${_user.user_id}" member_type="user">
-                            <i class="icon-remove"></i> ${_('Revoke')}
+                            ${_('Remove')}
                             </span>
                           %endif
                         </td>
+                        <td class="quick_repo_menu">
+                            % if c.rhodecode_user.is_admin:
+                                <i class="icon-more"></i>
+                                <div class="menu_items_container" style="display: none;">
+                                <ul class="menu_items">
+                                  <li>
+                                     % if _user.username == h.DEFAULT_USER:
+                                        ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))}
+                                    % else:
+                                        ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
+                                    % endif
+                                  </li>
+                                </ul>
+                                </div>
+                            % endif
+                        </td>
                     </tr>
                 %endif
             %endfor
@@ -83,7 +135,7 @@
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.write', checked=_user_group.permission=='repository.write')}</td>
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.admin', checked=_user_group.permission=='repository.admin')}</td>
                     <td class="td-componentname">
-                        <i class="icon-group" ></i>
+                        <i class="icon-user-group"></i>
                         %if h.HasPermissionAny('hg.admin')():
                          <a href="${h.route_path('edit_user_group',user_group_id=_user_group.users_group_id)}">
                              ${_user_group.users_group_name}
@@ -95,16 +147,41 @@
                     <td class="td-action">
                         <span class="btn btn-link btn-danger revoke_perm"
                               member="${_user_group.users_group_id}" member_type="user_group">
-                        <i class="icon-remove"></i> ${_('Revoke')}
+                        ${_('Remove')}
                         </span>
                     </td>
+                    <td class="quick_repo_menu">
+                        % if c.rhodecode_user.is_admin:
+                            <i class="icon-more"></i>
+                            <div class="menu_items_container" style="display: none;">
+                            <ul class="menu_items">
+                              <li>
+                                 ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-permissions'))}
+                              </li>
+                            </ul>
+                            </div>
+                        % endif
+                    </td>
                 </tr>
             %endfor
             <tr class="new_members" id="add_perm_input"></tr>
+
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td>
+                    <span id="add_perm" class="link">
+                        ${_('Add user/user group')}
+                    </span>
+                </td>
+                <td></td>
+            </tr>
+
         </table>
-        <div id="add_perm" class="link">
-            ${_('Add new')}
-        </div>
+
         <div class="buttons">
           ${h.submit('save',_('Save'),class_="btn btn-primary")}
           ${h.reset('reset',_('Reset'),class_="btn btn-danger")}
@@ -120,4 +197,5 @@
     $('.revoke_perm').on('click', function(e){
         markRevokePermInput($(this), 'repository');
     });
+    quick_repo_menu();
 </script>
diff --git a/rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako b/rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako
new file mode 100644
--- /dev/null
+++ b/rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako
@@ -0,0 +1,9 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">${_('Repository Branch Permissions.')}</h3>
+    </div>
+    <div class="panel-body">
+        <h4>${_('This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license.').format(sales_email='<a href="mailto:sales@rhodecode.com">sales@rhodecode.com</a>')|n}</h4>
+        <img style="width: 100%; height: 100%" src="${h.asset('images/ee_features/repo_branch_permissions.png')}"/>
+    </div>
+</div>
diff --git a/rhodecode/templates/admin/settings/settings.mako b/rhodecode/templates/admin/settings/settings.mako
--- a/rhodecode/templates/admin/settings/settings.mako
+++ b/rhodecode/templates/admin/settings/settings.mako
@@ -44,7 +44,7 @@
           </ul>
       </div>
 
-      <div class="main-content-full-width">
+      <div class="main-content-auto-width">
         ${self.main_content()}
       </div>
     </div>
diff --git a/rhodecode/templates/admin/settings/settings_email.mako b/rhodecode/templates/admin/settings/settings_email.mako
--- a/rhodecode/templates/admin/settings/settings_email.mako
+++ b/rhodecode/templates/admin/settings/settings_email.mako
@@ -26,6 +26,10 @@
           <dd  title="${h.tooltip(tt)}">${dd}</dd>
         %endfor
         </dl>
+        <span class="help-block">
+            ${_('You can adjust those settings in [DEFAULT] section of .ini file located at')}: <br/>
+            ${c.rhodecode_ini.get('__file__')}
+        </span>
     </div>
 </div>
 
diff --git a/rhodecode/templates/admin/settings/settings_exceptions.mako b/rhodecode/templates/admin/settings/settings_exceptions.mako
new file mode 100644
--- /dev/null
+++ b/rhodecode/templates/admin/settings/settings_exceptions.mako
@@ -0,0 +1,38 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">${_('Exceptions Tracker - Exception ID')}: ${c.exception_id}</h3>
+    </div>
+    <div class="panel-body">
+    % if c.traceback:
+
+    <h4>${_('Exception `{}` generated on UTC date: {}').format(c.traceback.get('exc_type', 'NO_TYPE'), c.traceback.get('exc_utc_date', 'NO_DATE'))}</h4>
+    <pre>${c.traceback.get('exc_message', 'NO_MESSAGE')}</pre>
+
+    % else:
+        ${_('Unable to Read Exception. It might be removed or non-existing.')}
+    % endif
+    </div>
+</div>
+
+
+% if c.traceback:
+<div class="panel panel-danger">
+    <div class="panel-heading" id="advanced-delete">
+        <h3 class="panel-title">${_('Delete this Exception')}</h3>
+    </div>
+    <div class="panel-body">
+      ${h.secure_form(h.route_path('admin_settings_exception_tracker_delete', exception_id=c.exception_id), request=request)}
+        <div style="margin: 0 0 20px 0" class="fake-space"></div>
+
+        <div class="field">
+            <button class="btn btn-small btn-danger" type="submit"
+                    onclick="return confirm('${_('Confirm to delete this exception')}');">
+                <i class="icon-remove-sign"></i>
+                ${_('Delete This Exception')}
+            </button>
+        </div>
+
+      ${h.end_form()}
+    </div>
+</div>
+% endif
diff --git a/rhodecode/templates/admin/settings/settings_exceptions_browse.mako b/rhodecode/templates/admin/settings/settings_exceptions_browse.mako
new file mode 100644
--- /dev/null
+++ b/rhodecode/templates/admin/settings/settings_exceptions_browse.mako
@@ -0,0 +1,57 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">${_('Exceptions Tracker ')}</h3>
+    </div>
+    <div class="panel-body">
+        % if c.exception_list_count == 1:
+            ${_('There is {} stored exception.').format(c.exception_list_count)}
+        % else:
+            ${_('There are {} stored exceptions.').format(c.exception_list_count)}
+        % endif
+        ${_('Store directory')}: ${c.exception_store_dir}
+
+      ${h.secure_form(h.route_path('admin_settings_exception_tracker_delete_all'), request=request)}
+        <div style="margin: 0 0 20px 0" class="fake-space"></div>
+
+        <div class="field">
+            <button class="btn btn-small btn-danger" type="submit"
+                    onclick="return confirm('${_('Confirm to delete all exceptions')}');">
+                <i class="icon-remove-sign"></i>
+                ${_('Delete All')}
+            </button>
+        </div>
+
+      ${h.end_form()}
+
+    </div>
+</div>
+
+
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">${_('Exceptions Tracker - Showing the last {} Exceptions').format(c.limit)}.</h3>
+        <a class="panel-edit" href="${h.current_route_path(request, limit=c.next_limit)}">${_('Show more')}</a>
+    </div>
+    <div class="panel-body">
+        <table class="rctable">
+        <tr>
+            <th>#</th>
+            <th>Exception ID</th>
+            <th>Date</th>
+            <th>App Type</th>
+            <th>Exc Type</th>
+        </tr>
+        <% cnt = len(c.exception_list)%>
+        % for tb in c.exception_list:
+            <tr>
+                <td>${cnt}</td>
+                <td><a href="${h.route_path('admin_settings_exception_tracker_show', exception_id=tb['exc_id'])}"><code>${tb['exc_id']}</code></a></td>
+                <td>${h.format_date(tb['exc_utc_date'])}</td>
+                <td>${tb['app_type']}</td>
+                <td>${tb['exc_type']}</td>
+            </tr>
+            <% cnt -=1 %>
+        % endfor
+        </table>
+    </div>
+</div>
diff --git a/rhodecode/templates/admin/user_groups/user_group_edit_perms.mako b/rhodecode/templates/admin/user_groups/user_group_edit_perms.mako
--- a/rhodecode/templates/admin/user_groups/user_group_edit_perms.mako
+++ b/rhodecode/templates/admin/user_groups/user_group_edit_perms.mako
@@ -13,10 +13,12 @@
                 <th class="td-radio">${_('Write')}</th>
                 <th class="td-radio">${_('Admin')}</th>
                 <th>${_('User/User Group')}</th>
-                <th></th>
+                <th class="td-action"></th>
+                <th class="td-action"></th>
             </tr>
             ## USERS
             %for _user in c.user_group.permissions():
+                ## super admin/owner row
                 %if getattr(_user, 'admin_row', None) or getattr(_user, 'owner_row', None):
                     <tr class="perm_admin_row">
                         <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.none', disabled="disabled")}</td>
@@ -36,6 +38,18 @@
                             </span>
                         </td>
                         <td></td>
+                        <td class="quick_repo_menu">
+                            % if c.rhodecode_user.is_admin:
+                                <i class="icon-more"></i>
+                                <div class="menu_items_container" style="display: none;">
+                                <ul class="menu_items">
+                                  <li>
+                                     ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='user-groups-permissions'))}
+                                  </li>
+                                </ul>
+                                </div>
+                            % endif
+                        </td>
                     </tr>
                 %else:
                     ##forbid revoking permission from yourself, except if you're an super admin
@@ -52,6 +66,9 @@
                                     ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
                                 % else:
                                     ${h.link_to_user(_user.username)}
+                                    %if getattr(_user, 'duplicate_perm', None):
+                                        (${_('inactive duplicate')})
+                                    %endif
                                 % endif
                             </span>
                         </td>
@@ -59,12 +76,28 @@
                           %if _user.username != h.DEFAULT_USER:
                             <span class="btn btn-link btn-danger revoke_perm"
                                   member="${_user.user_id}" member_type="user">
-                            <i class="icon-remove"></i> ${_('revoke')}
+                            ${_('Remove')}
                             </span>
                           %endif
                         </td>
+                        <td class="quick_repo_menu">
+                            % if c.rhodecode_user.is_admin:
+                                <i class="icon-more"></i>
+                                <div class="menu_items_container" style="display: none;">
+                                <ul class="menu_items">
+                                  <li>
+                                    % if _user.username == h.DEFAULT_USER:
+                                        ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='user-groups-permissions'))}
+                                    % else:
+                                        ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='user-groups-permissions'))}
+                                    % endif
+                                  </li>
+                                </ul>
+                                </div>
+                            % endif
+                        </td>
                         %else:
-                        ## special case for current user permissions, we make sure he cannot take his own permissions
+                        ## special case for currently logged-in user permissions, we make sure he cannot take his own permissions
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'usergroup.none', disabled="disabled")}</td>
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'usergroup.read', disabled="disabled")}</td>
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'usergroup.write', disabled="disabled")}</td>
@@ -76,11 +109,26 @@
                                     ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
                                 % else:
                                     ${h.link_to_user(_user.username)}
+                                    %if getattr(_user, 'duplicate_perm', None):
+                                        (${_('inactive duplicate')})
+                                    %endif
                                 % endif
                                 <span class="user-perm-help-text">(${_('delegated admin')})</span>
                             </span>
                         </td>
                         <td></td>
+                        <td class="quick_repo_menu">
+                            % if c.rhodecode_user.is_admin:
+                                <i class="icon-more"></i>
+                                <div class="menu_items_container" style="display: none;">
+                                <ul class="menu_items">
+                                  <li>
+                                     ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='user-groups-permissions'))}
+                                  </li>
+                                </ul>
+                                </div>
+                            % endif
+                        </td>
                         %endif
                     </tr>
                 %endif
@@ -94,7 +142,7 @@
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'usergroup.write')}</td>
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'usergroup.admin')}</td>
                     <td class="td-user">
-                        <i class="icon-group" ></i>
+                        <i class="icon-user-group"></i>
                         %if h.HasPermissionAny('hg.admin')():
                          <a href="${h.route_path('edit_user_group',user_group_id=_user_group.users_group_id)}">
                              ${_user_group.users_group_name}
@@ -106,16 +154,39 @@
                     <td class="td-action">
                         <span class="btn btn-link btn-danger revoke_perm"
                               member="${_user_group.users_group_id}" member_type="user_group">
-                        <i class="icon-remove"></i> ${_('revoke')}
+                        ${_('Remove')}
                         </span>
                     </td>
+                    <td class="quick_repo_menu">
+                        % if c.rhodecode_user.is_admin:
+                            <i class="icon-more"></i>
+                            <div class="menu_items_container" style="display: none;">
+                            <ul class="menu_items">
+                              <li>
+                                 ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='user-groups-permissions'))}
+                              </li>
+                            </ul>
+                            </div>
+                        % endif
+                    </td>
                 </tr>
             %endfor
             <tr class="new_members" id="add_perm_input"></tr>
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td>
+                    <span id="add_perm" class="link">
+                        ${_('Add user/user group')}
+                    </span>
+                </td>
+                <td></td>
+            </tr>
         </table>
-        <div id="add_perm" class="link">
-            ${_('Add new')}
-        </div>
+
         <div class="buttons">
           ${h.submit('save',_('Save'),class_="btn btn-primary")}
           ${h.reset('reset',_('Reset'),class_="btn btn-danger")}
@@ -131,4 +202,5 @@
     $('.revoke_perm').on('click', function(e){
         markRevokePermInput($(this), 'usergroup');
     });
+    quick_repo_menu()
 </script>
diff --git a/rhodecode/templates/admin/user_groups/user_groups.mako b/rhodecode/templates/admin/user_groups/user_groups.mako
--- a/rhodecode/templates/admin/user_groups/user_groups.mako
+++ b/rhodecode/templates/admin/user_groups/user_groups.mako
@@ -10,7 +10,7 @@
 
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="user_group_count">0</span> ${_('user groups')}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="user_group_count">0</span>
 </%def>
 
 <%def name="menu_bar_nav()">
@@ -38,21 +38,33 @@
 </div>
 <script>
 $(document).ready(function() {
-    var getDatatableCount = function(){
-      var table = $('#user_group_list_table').dataTable();
-      var page = table.api().page.info();
-      var  active = page.recordsDisplay;
-      var  total = page.recordsTotal;
-
-      var _text = _gettext("{0} out of {1} users").format(active, total);
-      $('#user_group_count').text(_text);
-    };
+    var $userGroupsListTable = $('#user_group_list_table');
 
     // user list
-    $('#user_group_list_table').DataTable({
+    $userGroupsListTable.DataTable({
       processing: true,
       serverSide: true,
-      ajax: "${h.route_path('user_groups_data')}",
+      ajax: {
+          "url": "${h.route_path('user_groups_data')}",
+          "dataSrc": function (json) {
+              var filteredCount = json.recordsFiltered;
+              var filteredInactiveCount = json.recordsFilteredInactive;
+              var totalInactive = json.recordsTotalInactive;
+              var total = json.recordsTotal;
+
+              var _text = _gettext(
+                      "{0} ({1} inactive) of {2} user groups ({3} inactive)").format(
+                      filteredCount, filteredInactiveCount, total, totalInactive);
+
+              if (total === filteredCount) {
+                  _text = _gettext(
+                          "{0} user groups ({1} inactive)").format(total, totalInactive);
+              }
+              $('#user_group_count').text(_text);
+              return json.data;
+          },
+      },
+
       dom: 'rtp',
       pageLength: ${c.visual.admin_grid_items},
       order: [[ 0, "asc" ]],
@@ -79,17 +91,12 @@
       }
     });
 
-    $('#user_group_list_table').on('xhr.dt', function(e, settings, json, xhr){
-        $('#user_group_list_table').css('opacity', 1);
+    $userGroupsListTable.on('xhr.dt', function(e, settings, json, xhr){
+        $userGroupsListTable.css('opacity', 1);
     });
 
-    $('#user_group_list_table').on('preXhr.dt', function(e, settings, data){
-        $('#user_group_list_table').css('opacity', 0.3);
-    });
-
-    // refresh counters on draw
-    $('#user_group_list_table').on('draw.dt', function(){
-        getDatatableCount();
+    $userGroupsListTable.on('preXhr.dt', function(e, settings, data){
+        $userGroupsListTable.css('opacity', 0.3);
     });
 
     // filter
diff --git a/rhodecode/templates/admin/users/user_edit.mako b/rhodecode/templates/admin/users/user_edit.mako
--- a/rhodecode/templates/admin/users/user_edit.mako
+++ b/rhodecode/templates/admin/users/user_edit.mako
@@ -45,6 +45,7 @@
           <li class="${'active' if c.active=='ips' else ''}"><a href="${h.route_path('edit_user_ips', user_id=c.user.user_id)}">${_('Ip Whitelist')}</a></li>
           <li class="${'active' if c.active=='groups' else ''}"><a href="${h.route_path('edit_user_groups_management', user_id=c.user.user_id)}">${_('User Groups Management')}</a></li>
           <li class="${'active' if c.active=='audit' else ''}"><a href="${h.route_path('edit_user_audit_logs', user_id=c.user.user_id)}">${_('Audit logs')}</a></li>
+          <li class="${'active' if c.active=='caches' else ''}"><a href="${h.route_path('edit_user_caches', user_id=c.user.user_id)}">${_('Caches')}</a></li>
         </ul>
     </div>
 
diff --git a/rhodecode/templates/admin/users/user_edit_audit.mako b/rhodecode/templates/admin/users/user_edit_audit.mako
--- a/rhodecode/templates/admin/users/user_edit_audit.mako
+++ b/rhodecode/templates/admin/users/user_edit_audit.mako
@@ -14,7 +14,9 @@
             <input class="q_filter_box ${'' if c.filter_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.filter_term or ''}" placeholder="${_('audit filter...')}"/>
             <input type='submit' value="${_('filter')}" class="btn" />
         ${h.end_form()}
-        <p class="tooltip filterexample" style="position: inherit" title="${h.tooltip(h.journal_filter_help(request))}">${_('Example Queries')}</p>
+
+        <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
+        <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
 
         <%include file="/admin/admin_log_base.mako" />
 
diff --git a/rhodecode/templates/admin/users/user_edit_auth_tokens.mako b/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
--- a/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
+++ b/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
@@ -129,7 +129,7 @@ var repoFilter = function(data) {
 
     $.each(data.results[0].children, function() {
         // replace name to ID for submision
-        this.id = this.obj.repo_id;
+        this.id = this.repo_id;
         results.push(this);
     });
 
@@ -152,7 +152,7 @@ var selectVcsScope = function() {
     dropdownAutoWidth: true,
     containerCssClass: "drop-menu",
     dropdownCssClass: "drop-menu-dropdown",
-    formatResult: formatResult,
+    formatResult: formatRepoResult,
     query: $.debounce(250, function(query){
         self = this;
         var cacheKey = query.term;
diff --git a/rhodecode/templates/admin/users/user_edit_caches.mako b/rhodecode/templates/admin/users/user_edit_caches.mako
new file mode 100644
--- /dev/null
+++ b/rhodecode/templates/admin/users/user_edit_caches.mako
@@ -0,0 +1,41 @@
+<%namespace name="base" file="/base/base.mako"/>
+
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">${_('Caches')}</h3>
+    </div>
+    <div class="panel-body">
+    <p>
+        Cache keys used for storing cached values of user permissions and authentication plugin cache.
+        Invalidating the cache will remove those entries.
+    </p>
+
+<pre>
+region: ${c.region.name}
+backend: ${c.region.actual_backend.__class__}
+store: ${c.region.actual_backend.get_store()}
+
+% if c.user_keys:
+${len(c.user_keys)} <a href="#showKeys" onclick="$('#show-keys').toggle()">${_('Show all')}</a>
+<span id="show-keys" style="display: none">
+    % for k in c.user_keys:
+ - ${k}
+    % endfor
+</span>
+% else:
+ NO KEYS FOUND
+% endif
+</pre>
+    <p></p>
+    ${h.secure_form(h.route_path('edit_user_caches_update', user_id=c.user.user_id), request=request)}
+    <div class="form">
+       <div class="fields">
+           ${h.submit('reset_cache_%s' % c.user.user_id, _('Invalidate user cache'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to invalidate user cache')+"');")}
+       </div>
+    </div>
+    ${h.end_form()}
+
+    </div>
+</div>
+
+
diff --git a/rhodecode/templates/admin/users/user_edit_groups.mako b/rhodecode/templates/admin/users/user_edit_groups.mako
--- a/rhodecode/templates/admin/users/user_edit_groups.mako
+++ b/rhodecode/templates/admin/users/user_edit_groups.mako
@@ -53,7 +53,7 @@ var api;
          { data: {"_": "group_name",
                   "sort": "group_name"}, title: "${_('Name')}", className: "td-componentname," ,
             render: function (data,type,full,meta)
-                    {return '<div><i class="icon-group" title="User group">'+data+'</i></div>'}},
+                    {return '<div><i class="icon-user-group" title="User group">'+data+'</i></div>'}},
 
          { data: {"_": "group_description",
                   "sort": "group_description"}, title: "${_('Description')}", className: "td-description" },
diff --git a/rhodecode/templates/admin/users/user_edit_ssh_keys.mako b/rhodecode/templates/admin/users/user_edit_ssh_keys.mako
--- a/rhodecode/templates/admin/users/user_edit_ssh_keys.mako
+++ b/rhodecode/templates/admin/users/user_edit_ssh_keys.mako
@@ -8,7 +8,8 @@
             <tr>
                 <th>${_('Fingerprint')}</th>
                 <th>${_('Description')}</th>
-                <th>${_('Created')}</th>
+                <th>${_('Created on')}</th>
+                <th>${_('Accessed on')}</th>
                 <th>${_('Action')}</th>
             </tr>
             %if c.user_ssh_keys:
@@ -19,6 +20,7 @@
                     </td>
                     <td class="td-wrap">${ssh_key.description}</td>
                     <td class="td-tags">${h.format_date(ssh_key.created_on)}</td>
+                    <td class="td-tags">${h.format_date(ssh_key.accessed_on)}</td>
 
                     <td class="td-action">
                         ${h.secure_form(h.route_path('edit_user_ssh_keys_delete', user_id=c.user.user_id), request=request)}
diff --git a/rhodecode/templates/admin/users/users.mako b/rhodecode/templates/admin/users/users.mako
--- a/rhodecode/templates/admin/users/users.mako
+++ b/rhodecode/templates/admin/users/users.mako
@@ -39,22 +39,30 @@
 
 $(document).ready(function() {
     var $userListTable = $('#user_list_table');
-
-    var getDatatableCount = function(){
-      var table = $userListTable.dataTable();
-      var page = table.api().page.info();
-      var  active = page.recordsDisplay;
-      var  total = page.recordsTotal;
-
-      var _text = _gettext("{0} out of {1} users").format(active, total);
-      $('#user_count').text(_text);
-    };
-
     // user list
     $userListTable.DataTable({
       processing: true,
       serverSide: true,
-      ajax: "${h.route_path('users_data')}",
+      ajax: {
+          "url": "${h.route_path('users_data')}",
+          "dataSrc": function ( json ) {
+              var filteredCount = json.recordsFiltered;
+              var filteredInactiveCount = json.recordsFilteredInactive;
+              var totalInactive = json.recordsTotalInactive;
+              var total = json.recordsTotal;
+
+              var _text = _gettext(
+                  "{0} ({1} inactive) of {2} users ({3} inactive)").format(
+                      filteredCount, filteredInactiveCount, total, totalInactive);
+
+              if(total === filteredCount){
+                  _text = _gettext(
+                      "{0} users ({1} inactive)").format(total, totalInactive);
+              }
+              $('#user_count').text(_text);
+              return json.data;
+          }
+      },
       dom: 'rtp',
       pageLength: ${c.visual.admin_grid_items},
       order: [[ 0, "asc" ]],
@@ -100,11 +108,6 @@
         $userListTable.css('opacity', 0.3);
     });
 
-    // refresh counters on draw
-    $userListTable.on('draw.dt', function(){
-        getDatatableCount();
-    });
-
     // filter
     $('#q_filter').on('keyup',
         $.debounce(250, function() {
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -226,7 +226,7 @@
   <!--- CONTEXT BAR -->
   <div id="context-bar">
     <div class="wrapper">
-      <ul id="context-pages" class="horizontal-list navigation">
+      <ul id="context-pages" class="navigation horizontal-list">
         <li class="${is_active('summary')}"><a class="menulink" href="${h.route_path('repo_summary', repo_name=c.repo_name)}"><div class="menulabel">${_('Summary')}</div></a></li>
         <li class="${is_active('changelog')}"><a class="menulink" href="${h.route_path('repo_changelog', repo_name=c.repo_name)}"><div class="menulabel">${_('Changelog')}</div></a></li>
         <li class="${is_active('files')}"><a class="menulink" href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.rhodecode_db_repo.landing_rev[1], f_path='')}"><div class="menulabel">${_('Files')}</div></a></li>
@@ -385,11 +385,42 @@
             return "active"
         return ""
     %>
+
     <ul id="quick" class="main_nav navigation horizontal-list">
-      <!-- repo switcher -->
-      <li class="${is_active('repositories')} repo_switcher_li has_select2">
-        <input id="repo_switcher" name="repo_switcher" type="hidden">
-      </li>
+       ## notice box for important system messages
+       <li style="display: none">
+          <a class="notice-box" href="#openNotice" onclick="showNoticeBox(); return false">
+            <div class="menulabel-notice" >
+                0
+            </div>
+          </a>
+       </li>
+
+        ## Main filter
+       <li>
+        <div class="menulabel main_filter_box">
+            <div class="main_filter_input_box">
+                <input class="main_filter_input" id="main_filter" size="15" type="text" name="main_filter" placeholder="${_('search / go to...')}" value=""/>
+            </div>
+            <div class="main_filter_help_box">
+                <a href="#showFilterHelp" onclick="showMainFilterBox(); return false">?</a>
+            </div>
+        </div>
+
+        <div id="main_filter_help" style="display: none">
+Use '/' key to quickly access this field.
+Enter name of repository, or repository group for quick search.
+
+Prefix query to allow special search:
+
+user:admin, to search for usernames
+
+user_group:devops, to search for user groups
+
+commit:efced4, to search for commits
+
+        </div>
+       </li>
 
       ## ROOT MENU
       %if c.rhodecode_user.username != h.DEFAULT_USER:
@@ -432,109 +463,149 @@
                               c.rhodecode_user.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}
       </li>
       % endif
+      ## render extra user menu
+      ${usermenu(active=(active=='my_account'))}
+
       % if c.debug_style:
-      <li class="${is_active('debug_style')}">
+      <li>
           <a class="menulink" title="${_('Style')}" href="${h.route_path('debug_style_home')}">
-            <div class="menulabel">${_('Style')}</div>
+            <div class="menulabel">${_('[Style]')}</div>
           </a>
       </li>
       % endif
-      ## render extra user menu
-      ${usermenu(active=(active=='my_account'))}
     </ul>
 
     <script type="text/javascript">
-        var visual_show_public_icon = "${c.visual.show_public_icon}" == "True";
-
-        /*format the look of items in the list*/
-        var format = function(state, escapeMarkup){
-            if (!state.id){
-              return state.text; // optgroup
-            }
-            var obj_dict = state.obj;
-            var tmpl = '';
+        var visualShowPublicIcon = "${c.visual.show_public_icon}" == "True";
 
-            if(obj_dict && state.type == 'repo'){
-                if(obj_dict['repo_type'] === 'hg'){
-                    tmpl += '<i class="icon-hg"></i> ';
-                }
-                else if(obj_dict['repo_type'] === 'git'){
-                    tmpl += '<i class="icon-git"></i> ';
-                }
-                else if(obj_dict['repo_type'] === 'svn'){
-                    tmpl += '<i class="icon-svn"></i> ';
+        var formatRepoResult = function(result, container, query, escapeMarkup) {
+            return function(data, escapeMarkup) {
+                if (!data.repo_id){
+                  return data.text; // optgroup text Repositories
                 }
-                if(obj_dict['private']){
-                    tmpl += '<i class="icon-lock" ></i> ';
-                }
-                else if(visual_show_public_icon){
-                    tmpl += '<i class="icon-unlock-alt"></i> ';
+
+                var tmpl = '';
+                var repoType = data['repo_type'];
+                var repoName = data['text'];
+
+                if(data && data.type == 'repo'){
+                    if(repoType === 'hg'){
+                        tmpl += '<i class="icon-hg"></i> ';
+                    }
+                    else if(repoType === 'git'){
+                        tmpl += '<i class="icon-git"></i> ';
+                    }
+                    else if(repoType === 'svn'){
+                        tmpl += '<i class="icon-svn"></i> ';
+                    }
+                    if(data['private']){
+                        tmpl += '<i class="icon-lock" ></i> ';
+                    }
+                    else if(visualShowPublicIcon){
+                        tmpl += '<i class="icon-unlock-alt"></i> ';
+                    }
                 }
-            }
-            if(obj_dict && state.type == 'commit') {
-                tmpl += '<i class="icon-tag"></i>';
-            }
-            if(obj_dict && state.type == 'group'){
-                tmpl += '<i class="icon-folder-close"></i> ';
-            }
-            tmpl += escapeMarkup(state.text);
-            return tmpl;
-        };
+                tmpl += escapeMarkup(repoName);
+                return tmpl;
 
-        var formatResult = function(result, container, query, escapeMarkup) {
-            return format(result, escapeMarkup);
-        };
-
-        var formatSelection = function(data, container, escapeMarkup) {
-            return format(data, escapeMarkup);
+            }(result, escapeMarkup);
         };
 
-        $("#repo_switcher").select2({
-            cachedDataSource: {},
-            minimumInputLength: 2,
-            placeholder: '<div class="menulabel">${_('Go to')} <div class="show_more"></div></div>',
-            dropdownAutoWidth: true,
-            formatResult: formatResult,
-            formatSelection: formatSelection,
-            containerCssClass: "repo-switcher",
-            dropdownCssClass: "repo-switcher-dropdown",
-            escapeMarkup: function(m){
-                // don't escape our custom placeholder
-                if(m.substr(0,23) == '<div class="menulabel">'){
-                    return m;
-                }
+
+        var autocompleteMainFilterFormatResult = function (data, value, org_formatter) {
+
+            if (value.split(':').length === 2) {
+                value = value.split(':')[1]
+            }
+
+            var searchType = data['type'];
+            var valueDisplay = data['value_display'];
+
+            var escapeRegExChars = function (value) {
+            return value.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+            };
+            var pattern = '(' + escapeRegExChars(value) + ')';
+
+            // highlight match
+            valueDisplay = Select2.util.escapeMarkup(valueDisplay);
+            valueDisplay = valueDisplay.replace(new RegExp(pattern, 'gi'), '<strong>$1<\/strong>');
+
+            var icon = '';
 
-                return Select2.util.escapeMarkup(m);
-            },
-            query: $.debounce(250, function(query){
-                self = this;
-                var cacheKey = query.term;
-                var cachedData = self.cachedDataSource[cacheKey];
+            if (searchType === 'hint') {
+                icon += '<i class="icon-folder-close"></i> ';
+            }
+            else if (searchType === 'search') {
+                icon += '<i class="icon-more"></i> ';
+            }
+            else if (searchType === 'repo') {
+                if (data['repo_type'] === 'hg') {
+                    icon += '<i class="icon-hg"></i> ';
+                }
+                else if (data['repo_type'] === 'git') {
+                    icon += '<i class="icon-git"></i> ';
+                }
+                else if (data['repo_type'] === 'svn') {
+                    icon += '<i class="icon-svn"></i> ';
+                }
+                if (data['private']) {
+                    icon += '<i class="icon-lock" ></i> ';
+                }
+                else if (visualShowPublicIcon) {
+                    icon += '<i class="icon-unlock-alt"></i> ';
+                }
+            }
+            else if (searchType === 'repo_group') {
+                icon += '<i class="icon-folder-close"></i> ';
+            }
+            else if (searchType === 'user_group') {
+                icon += '<i class="icon-group"></i> ';
+            }
+            else if (searchType === 'user') {
+                icon += '<img class="gravatar" src="{0}"/>'.format(data['icon_link']);
+            }
+            else if (searchType === 'commit') {
+                icon += '<i class="icon-tag"></i>';
+            }
 
-                if (cachedData) {
-                    query.callback({results: cachedData.results});
-                } else {
-                    $.ajax({
-                        url: pyroutes.url('goto_switcher_data'),
-                        data: {'query': query.term},
-                        dataType: 'json',
-                        type: 'GET',
-                        success: function(data) {
-                            self.cachedDataSource[cacheKey] = data;
-                            query.callback({results: data.results});
-                        },
-                        error: function(data, textStatus, errorThrown) {
-                            alert("Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
-                        }
-                    })
-                }
-            })
+            var tmpl = '<div class="ac-container-wrap">{0}{1}</div>';
+            return tmpl.format(icon, valueDisplay);
+        };
+
+        var handleSelect = function(element, suggestion) {
+            if (suggestion.type === "hint") {
+                // we skip action
+                $('#main_filter').focus();
+            } else {
+              window.location = suggestion['url'];
+            }
+        };
+        var autocompleteMainFilterResult = function (suggestion, originalQuery, queryLowerCase) {
+            if (queryLowerCase.split(':').length === 2) {
+                queryLowerCase = queryLowerCase.split(':')[1]
+            }
+            return suggestion.value_display.toLowerCase().indexOf(queryLowerCase) !== -1;
+        };
+
+        $('#main_filter').autocomplete({
+            serviceUrl: pyroutes.url('goto_switcher_data'),
+            params: {"repo_group_id": templateContext.repo_group_id},
+            minChars:2,
+            maxHeight:400,
+            deferRequestBy: 300, //miliseconds
+            tabDisabled: true,
+            autoSelectFirst: true,
+            formatResult: autocompleteMainFilterFormatResult,
+            lookupFilter: autocompleteMainFilterResult,
+            onSelect: function(element, suggestion){
+                handleSelect(element, suggestion);
+                return false;
+            }
         });
 
-        $("#repo_switcher").on('select2-selecting', function(e){
-            e.preventDefault();
-            window.location = e.choice.url;
-        });
+        showMainFilterBox = function () {
+            $('#main_filter_help').toggle();
+        }
 
     </script>
     <script src="${h.asset('js/rhodecode/base/keyboard-bindings.js', ver=c.rhodecode_version_hash)}"></script>
@@ -557,7 +628,7 @@
                   </tr>
                   <%
                      elems = [
-                         ('/', 'Open quick search box'),
+                         ('/', 'Use quick search box'),
                          ('g h', 'Goto home page'),
                          ('g g', 'Goto my private gists page'),
                          ('g G', 'Goto my public gists page'),
@@ -611,3 +682,4 @@
       </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
+
diff --git a/rhodecode/templates/base/perms_summary.mako b/rhodecode/templates/base/perms_summary.mako
--- a/rhodecode/templates/base/perms_summary.mako
+++ b/rhodecode/templates/base/perms_summary.mako
@@ -4,11 +4,23 @@
 ##    ${p.perms_summary(c.perm_user.permissions)}
 
 <%def name="perms_summary(permissions, show_all=False, actions=True, side_link=None)">
+<% section_to_label = {
+    'global': 'Global Permissions',
+    'repository_branches': 'Repository Branch Rules',
+    'repositories': 'Repository Permissions',
+    'user_groups': 'User Group Permissions',
+    'repositories_groups': 'Repository Group Permissions',
+} %>
+
 <div id="perms" class="table fields">
-  %for section in sorted(permissions.keys()):
+  %for section in sorted(permissions.keys(), key=lambda item: {'global': 0, 'repository_branches': 1}.get(item, 1000)):
+  <% total_counter = 0 %>
+
   <div class="panel panel-default">
-    <div class="panel-heading">
-        <h3 class="panel-title">${section.replace("_"," ").capitalize()}</h3>
+    <div class="panel-heading" id="${section.replace("_","-")}-permissions">
+        <h3 class="panel-title">${section_to_label.get(section, section)} - <span id="total_count_${section}"></span>
+        <a class="permalink" href="#${section.replace("_","-")}-permissions"> ¶</a>
+        </h3>
         % if side_link:
             <div class="pull-right">
                 <a href="${side_link}">${_('in JSON format')}</a>
@@ -18,15 +30,24 @@
     <div class="panel-body">
       <div class="perms_section_head field">
         <div class="radios">
-          %if section != 'global':
+          % if section == 'repository_branches':
               <span class="permissions_boxes">
               <span class="desc">${_('show')}: </span>
-              ${h.checkbox('perms_filter_none_%s' % section, 'none', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='none')}   <label for="${'perms_filter_none_%s' % section}"><span class="perm_tag none">${_('none')}</span></label>
-              ${h.checkbox('perms_filter_read_%s' % section, 'read', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='read')}   <label for="${'perms_filter_read_%s' % section}"><span class="perm_tag read">${_('read')}</span></label>
-              ${h.checkbox('perms_filter_write_%s' % section, 'write', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='write')} <label for="${'perms_filter_write_%s' % section}"> <span class="perm_tag write">${_('write')}</span></label>
-              ${h.checkbox('perms_filter_admin_%s' % section, 'admin', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='admin')} <label for="${'perms_filter_admin_%s' % section}"><span class="perm_tag admin">${_('admin')}</span></label>
+              ${h.checkbox('perms_filter_none_%s' % section, 'none', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='none')}   <label for="${'perms_filter_none_{}'.format(section)}"><span class="perm_tag none">${_('none')}</span></label>
+              ${h.checkbox('perms_filter_merge_%s' % section, 'merge', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='merge')}   <label for="${'perms_filter_merge_{}'.format(section)}"><span class="perm_tag merge">${_('merge')}</span></label>
+              ${h.checkbox('perms_filter_push_%s' % section, 'push', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='push')} <label for="${'perms_filter_push_{}'.format(section)}"> <span class="perm_tag push">${_('push')}</span></label>
+              ${h.checkbox('perms_filter_push_force_%s' % section, 'push_force', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='push_force')} <label for="${'perms_filter_push_force_{}'.format(section)}"><span class="perm_tag push_force">${_('push force')}</span></label>
               </span>
-          %endif
+          % elif section != 'global':
+              <span class="permissions_boxes">
+              <span class="desc">${_('show')}: </span>
+              ${h.checkbox('perms_filter_none_%s' % section, 'none', '', class_='perm_filter filter_%s' % section, section=section, perm_type='none')}   <label for="${'perms_filter_none_{}'.format(section)}"><span class="perm_tag none">${_('none')}</span></label>
+              ${h.checkbox('perms_filter_read_%s' % section, 'read', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='read')}   <label for="${'perms_filter_read_{}'.format(section)}"><span class="perm_tag read">${_('read')}</span></label>
+              ${h.checkbox('perms_filter_write_%s' % section, 'write', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='write')} <label for="${'perms_filter_write_{}'.format(section)}"> <span class="perm_tag write">${_('write')}</span></label>
+              ${h.checkbox('perms_filter_admin_%s' % section, 'admin', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='admin')} <label for="${'perms_filter_admin_{}'.format(section)}"><span class="perm_tag admin">${_('admin')}</span></label>
+              </span>
+          % endif
+
         </div>
       </div>
       <div class="field">
@@ -72,12 +93,10 @@
                       %endif
                     %else:
                       %if not val_lbl:
-                          ${
-                             {'false': False,
+                          ${{'false': False,
                              'true': True,
                              'none': False,
-                             'repository': True}.get(val[1][0] if 0 < len(val[1]) else 'false')
-                          }
+                             'repository': True}.get(val[1][0] if 0 < len(val[1]) else 'false')}
                       %else:
                           <span class="perm_tag ${val[1][0]}">${val_lbl}.${val[1][0]}</span>
                       %endif
@@ -142,7 +161,81 @@
                 edit_url=h.route_path('user_edit_global_perms', user_id=c.user.user_id), edit_global_url=h.route_path('admin_permissions_object'))}
 
            </tbody>
+          ## Branch perms
+          %elif section == 'repository_branches':
+            <thead>
+                <tr>
+                <th>${_('Name')}</th>
+                <th>${_('Pattern')}</th>
+                <th>${_('Permission')}</th>
+                %if actions:
+                <th>${_('Edit Branch Permission')}</th>
+                %endif
+            </thead>
+            <tbody class="section_${section}">
+            <%
+                def name_sorter(permissions):
+                    def custom_sorter(item):
+                        return item[0]
+                    return sorted(permissions, key=custom_sorter)
+
+                def branch_sorter(permissions):
+                    def custom_sorter(item):
+                       ## none, merge, push, push_force
+                       section = item[1].split('.')[-1]
+                       section_importance = {'none': u'0',
+                                             'merge': u'1',
+                                             'push': u'2',
+                                             'push_force': u'3'}.get(section)
+                       ## sort by importance + name
+                       return section_importance + item[0]
+                    return sorted(permissions, key=custom_sorter)
+            %>
+            %for k, section_perms in name_sorter(permissions[section].items()):
+                ## for display purposes, for non super-admins we need to check if shown
+                ## repository is actually accessible for user
+                <% repo_perm = permissions['repositories'][k] %>
+                % if repo_perm == 'repository.none' and not c.rhodecode_user.is_admin:
+                    ## skip this entry
+                    <% continue %>
+                % endif
+
+                <% total_counter +=1 %>
+                % for pattern, perm in branch_sorter(section_perms.items()):
+                    <tr class="perm_row ${'{}_{}'.format(section, perm.split('.')[-1])}">
+                        <td class="td-name">
+                            <a href="${h.route_path('repo_summary',repo_name=k)}">${k}</a>
+                        </td>
+                        <td>${pattern}</td>
+                        <td class="td-tags">
+                            ## TODO: calculate origin somehow
+                            ## % for i, ((_pat, perm), origin) in enumerate((permissions[section].perm_origin_stack[k])):
+
+                             <div>
+                                 <% i = 0 %>
+                                 <% origin = 'unknown' %>
+                                 <% _css_class = i > 0 and 'perm_overriden' or '' %>
+
+                                 <span class="${_css_class} perm_tag ${perm.split('.')[-1]}">
+                                  ${perm}
+                                  ##(${origin})
+                                 </span>
+                             </div>
+                            ## % endfor
+                        </td>
+                        %if actions:
+                        <td class="td-action">
+                            <a href="${h.route_path('edit_repo_perms_branch',repo_name=k)}">${_('edit')}</a>
+                        </td>
+                        %endif
+                    </tr>
+                % endfor
+            %endfor
+            </tbody>
+
+          ## Repos/Repo Groups/users groups perms
           %else:
+
            ## none/read/write/admin permissions on groups/repos etc
             <thead>
                 <tr>
@@ -167,8 +260,11 @@
                     return sorted(permissions, key=custom_sorter)
             %>
             %for k, section_perm in sorter(permissions[section].items()):
-                %if section_perm.split('.')[-1] != 'none' or show_all:
-                <tr class="perm_row ${'%s_%s' % (section, section_perm.split('.')[-1])}">
+                <% perm_value = section_perm.split('.')[-1] %>
+                <% _css_class = 'display:none' if perm_value in ['none'] else '' %>
+
+                %if perm_value != 'none' or show_all:
+                <tr class="perm_row ${'{}_{}'.format(section, section_perm.split('.')[-1])}" style="${_css_class}">
                     <td class="td-name">
                         %if section == 'repositories':
                             <a href="${h.route_path('repo_summary',repo_name=k)}">${k}</a>
@@ -183,7 +279,7 @@
                       %if hasattr(permissions[section], 'perm_origin_stack'):
                          <div>
                          %for i, (perm, origin) in enumerate(reversed(permissions[section].perm_origin_stack[k])):
-
+                         <% _css_class =  i > 0 and 'perm_overriden' or '' %>
                          % if i > 0:
                              <div style="color: #979797">
                              <i class="icon-arrow_up"></i>
@@ -193,7 +289,7 @@
                          % endif
 
                          <div>
-                             <span class="${i > 0 and 'perm_overriden' or ''} perm_tag ${perm.split('.')[-1]}">
+                             <span class="${_css_class} perm_tag ${perm.split('.')[-1]}">
                               ${perm} (${origin})
                              </span>
                          </div>
@@ -216,11 +312,13 @@
                     </td>
                     %endif
                 </tr>
+                <% total_counter +=1 %>
                 %endif
+
             %endfor
 
             <tr id="empty_${section}" class="noborder" style="display:none;">
-              <td colspan="6">${_('No permission defined')}</td>
+              <td colspan="6">${_('No matching permission defined')}</td>
             </tr>
 
             </tbody>
@@ -231,20 +329,26 @@
       </div>
     </div>
   </div>
+
+  <script>
+    $('#total_count_${section}').html(${total_counter})
+  </script>
+
   %endfor
 </div>
 
 <script>
     $(document).ready(function(){
-        var show_empty = function(section){
+        var showEmpty = function(section){
             var visible = $('.section_{0} tr.perm_row:visible'.format(section)).length;
-            if(visible == 0){
+            if(visible === 0){
                 $('#empty_{0}'.format(section)).show();
             }
             else{
                 $('#empty_{0}'.format(section)).hide();
             }
         };
+
         $('.perm_filter').on('change', function(e){
             var self = this;
             var section = $(this).attr('section');
@@ -261,7 +365,7 @@
                     $('.'+section+'_'+perm_type).hide();
                 }
             });
-            show_empty(section);
+            showEmpty(section);
         })
     })
 </script>
diff --git a/rhodecode/templates/base/root.mako b/rhodecode/templates/base/root.mako
--- a/rhodecode/templates/base/root.mako
+++ b/rhodecode/templates/base/root.mako
@@ -8,6 +8,9 @@ if hasattr(c, 'rhodecode_db_repo'):
     c.template_context['repo_type'] = c.rhodecode_db_repo.repo_type
     c.template_context['repo_landing_commit'] = c.rhodecode_db_repo.landing_rev[1]
 
+if getattr(c, 'repo_group', None):
+    c.template_context['repo_group_id'] = c.repo_group.group_id
+
 if getattr(c, 'rhodecode_user', None) and c.rhodecode_user.user_id:
     c.template_context['rhodecode_user']['username'] = c.rhodecode_user.username
     c.template_context['rhodecode_user']['email'] = c.rhodecode_user.email
@@ -24,7 +27,7 @@ c.template_context['default_user'] = {
 %>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
-        <script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-lite.min.js', ver=c.rhodecode_version_hash)}"></script>
+        <script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-lite.js', ver=c.rhodecode_version_hash)}"></script>
         <link rel="import" href="${h.asset('js/rhodecode-components.html', ver=c.rhodecode_version_hash)}">
         <title>${self.title()}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
@@ -60,33 +63,6 @@ c.template_context['default_user'] = {
 
         ## JAVASCRIPT
         <%def name="js()">
-            <script>
-                // setup Polymer options
-                window.Polymer = {lazyRegister: true, dom: 'shadow'};
-
-                // Load webcomponentsjs polyfill if browser does not support native Web Components
-                (function() {
-                    'use strict';
-                    var onload = function() {
-                        // For native Imports, manually fire WebComponentsReady so user code
-                        // can use the same code path for native and polyfill'd imports.
-                        if (!window.HTMLImports) {
-                            document.dispatchEvent(
-                                    new CustomEvent('WebComponentsReady', {bubbles: true})
-                            );
-                        }
-                    };
-                    var webComponentsSupported = (
-                            'registerElement' in document
-                            && 'import' in document.createElement('link')
-                            && 'content' in document.createElement('template')
-                    );
-                    if (!webComponentsSupported) {
-                    } else {
-                        onload();
-                    }
-                })();
-            </script>
 
             <script src="${h.asset('js/rhodecode/i18n/%s.js' % c.language, ver=c.rhodecode_version_hash)}"></script>
             <script type="text/javascript">
@@ -94,6 +70,7 @@ c.template_context['default_user'] = {
             var templateContext = ${h.json.dumps(c.template_context)|n};
 
             var APPLICATION_URL = "${h.route_path('home').rstrip('/')}";
+            var APPLICATION_PLUGINS = [];
             var ASSET_URL = "${h.asset('')}";
             var DEFAULT_RENDERER = "${h.get_visual_attr(c, 'default_renderer')}";
             var CSRF_TOKEN = "${getattr(c, 'csrf_token', '')}";
diff --git a/rhodecode/templates/changeset/changeset.mako b/rhodecode/templates/changeset/changeset.mako
--- a/rhodecode/templates/changeset/changeset.mako
+++ b/rhodecode/templates/changeset/changeset.mako
@@ -62,11 +62,11 @@
           </div>
           <div class="pull-right">
               <span id="parent_link">
-                <a href="#parentCommit" title="${_('Parent Commit')}">${_('Parent')}</a>
+                <a href="#parentCommit" title="${_('Parent Commit')}"><i class="icon-left icon-no-margin"></i>${_('parent')}</a>
               </span>
                |
               <span id="child_link">
-                <a href="#childCommit" title="${_('Child Commit')}">${_('Child')}</a>
+                <a href="#childCommit" title="${_('Child Commit')}">${_('child')}<i class="icon-right icon-no-margin"></i></a>
               </span>
           </div>
       </div>
diff --git a/rhodecode/templates/changeset/changeset_file_comment.mako b/rhodecode/templates/changeset/changeset_file_comment.mako
--- a/rhodecode/templates/changeset/changeset_file_comment.mako
+++ b/rhodecode/templates/changeset/changeset_file_comment.mako
@@ -7,6 +7,7 @@
 
 <%def name="comment_block(comment, inline=False)">
   <% pr_index_ver = comment.get_index_version(getattr(c, 'versions', [])) %>
+  <% latest_ver = len(getattr(c, 'versions', [])) %>
   % if inline:
       <% outdated_at_ver = comment.outdated_at_version(getattr(c, 'at_version_num', None)) %>
   % else:
@@ -103,11 +104,11 @@
                   <div class="pr-version-inline">
                     <a href="${request.current_route_path(_query=dict(version=comment.pull_request_version_id), _anchor='comment-{}'.format(comment.comment_id))}">
                     % if outdated_at_ver:
-                        <code class="pr-version-num" title="${_('Outdated comment from pull request version {0}').format(pr_index_ver)}">
+                        <code class="pr-version-num" title="${_('Outdated comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}">
                             outdated ${'v{}'.format(pr_index_ver)} |
                         </code>
                     % elif pr_index_ver:
-                        <code class="pr-version-num" title="${_('Comment from pull request version {0}').format(pr_index_ver)}">
+                        <code class="pr-version-num" title="${_('Comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}">
                             ${'v{}'.format(pr_index_ver)} |
                         </code>
                     % endif
@@ -119,10 +120,10 @@
                     <div class="pr-version">
                       % if comment.outdated:
                         <a href="?version=${comment.pull_request_version_id}#comment-${comment.comment_id}">
-                            ${_('Outdated comment from pull request version {}').format(pr_index_ver)}
+                            ${_('Outdated comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}
                         </a>
                       % else:
-                        <div title="${_('Comment from pull request version {0}').format(pr_index_ver)}">
+                        <div title="${_('Comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}">
                             <a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id, version=comment.pull_request_version_id)}">
                             <code class="pr-version-num">
                                 ${'v{}'.format(pr_index_ver)}
diff --git a/rhodecode/templates/codeblocks/diffs.mako b/rhodecode/templates/codeblocks/diffs.mako
--- a/rhodecode/templates/codeblocks/diffs.mako
+++ b/rhodecode/templates/codeblocks/diffs.mako
@@ -263,8 +263,13 @@ collapse_all = len(diffset.files) > coll
 
     ## outdated comments that are made for a file that has been deleted
     % for filename, comments_dict in (deleted_files_comments or {}).items():
-
-        <div class="filediffs filediff-outdated" style="display: none">
+        <%
+            display_state = 'display: none'
+            open_comments_in_file = [x for x in comments_dict['comments'] if x.outdated is False]
+            if open_comments_in_file:
+                display_state = ''
+        %>
+        <div class="filediffs filediff-outdated" style="${display_state}">
             <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox">
             <div class="filediff" data-f-path="${filename}"  id="a_${h.FID('', filename)}">
                 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
@@ -291,7 +296,7 @@ collapse_all = len(diffset.files) > coll
 
                         <td></td>
                         <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=5'}>
-                        ${_('File was deleted in this version, and outdated comments were made on it')}
+                        ${_('File was deleted in this version. There are still outdated/unresolved comments attached to it.')}
                         </td>
                     </tr>
                     %if c.diffmode == 'unified':
diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako
--- a/rhodecode/templates/data_table/_dt_elements.mako
+++ b/rhodecode/templates/data_table/_dt_elements.mako
@@ -284,7 +284,7 @@
 
 <%def name="user_group_name(user_group_name)">
   <div>
-      <i class="icon-group" title="${_('User group')}"></i>
+      <i class="icon-user-group" title="${_('User group')}"></i>
       ${h.link_to_group(user_group_name)}
   </div>
 </%def>
@@ -350,8 +350,7 @@
 </%def>
 
 <%def name="pullrequest_title(title, description)">
-    ${title} <br/>
-    ${h.shorter(description, 40)}
+    ${title}
 </%def>
 
 <%def name="pullrequest_comments(comments_nr)">
@@ -375,3 +374,52 @@
 <%def name="pullrequest_author(full_contact)">
     ${base.gravatar_with_user(full_contact, 16)}
 </%def>
+
+
+<%def name="markup_form(form_id, form_text='', help_text=None)">
+
+  <div class="markup-form">
+    <div class="markup-form-area">
+        <div class="markup-form-area-header">
+            <ul class="nav-links clearfix">
+                <li class="active">
+                    <a href="#edit-text" tabindex="-1" id="edit-btn_${form_id}">${_('Write')}</a>
+                </li>
+                <li class="">
+                    <a href="#preview-text" tabindex="-1" id="preview-btn_${form_id}">${_('Preview')}</a>
+                </li>
+            </ul>
+        </div>
+
+        <div class="markup-form-area-write" style="display: block;">
+            <div id="edit-container_${form_id}">
+                <textarea id="${form_id}" name="${form_id}" class="comment-block-ta ac-input">${form_text if form_text else ''}</textarea>
+            </div>
+            <div id="preview-container_${form_id}" class="clearfix" style="display: none;">
+                <div id="preview-box_${form_id}" class="preview-box"></div>
+            </div>
+        </div>
+
+        <div class="markup-form-area-footer">
+            <div class="toolbar">
+                <div class="toolbar-text">
+                  ${(_('Parsed using %s syntax') % (
+                           ('<a href="%s">%s</a>' % (h.route_url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
+                       )
+                    )|n}
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="markup-form-footer">
+        % if help_text:
+            <span class="help-block">${help_text}</span>
+        % endif
+    </div>
+  </div>
+  <script type="text/javascript">
+    new MarkupForm('${form_id}');
+  </script>
+
+</%def>
diff --git a/rhodecode/templates/debug_style/tables.html b/rhodecode/templates/debug_style/tables.html
--- a/rhodecode/templates/debug_style/tables.html
+++ b/rhodecode/templates/debug_style/tables.html
@@ -534,7 +534,7 @@
         </tbody>
       </table>
       <div class="link" id="add_perm">
-        Add new
+        Add user/user group
       </div>
 
 
diff --git a/rhodecode/templates/errors/error_document.mako b/rhodecode/templates/errors/error_document.mako
--- a/rhodecode/templates/errors/error_document.mako
+++ b/rhodecode/templates/errors/error_document.mako
@@ -60,15 +60,30 @@
                 </div>
                 <div class="inner-column">
                     <h4>Support</h4>
-                    <p>For support, go to <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a>.
+                    <p>For help and support, go to the <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support Page')}</a>.
                        It may be useful to include your log file; see the log file locations <a href="${h.route_url('enterprise_log_file_locations')}">here</a>.
                     </p>
+
                 </div>
                 <div class="inner-column">
                     <h4>Documentation</h4>
                     <p>For more information, see <a href="${h.route_url('enterprise_docs')}">docs.rhodecode.com</a>.</p>
                 </div>
             </div>
+
+            % if c.show_exception_id:
+            <div class="sidebar" style="width: 130px">
+
+            </div>
+            <div class="main-content">
+                <p>
+                <strong>Exception ID: <code><a href="${c.exception_id_url}">${c.exception_id}</a></code> </strong> <br/>
+
+                Super Admins can see detailed traceback information from this exception by checking the below Exception ID.<br/>
+                Please include the above link for further details of this exception.
+                </p>
+            </div>
+            % endif
         </div>
 
     </body>
diff --git a/rhodecode/templates/files/files_add.mako b/rhodecode/templates/files/files_add.mako
--- a/rhodecode/templates/files/files_add.mako
+++ b/rhodecode/templates/files/files_add.mako
@@ -12,7 +12,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${_('Add new file')} @ ${h.show_id(c.commit)}
+    ${_('Add new file')} @ ${h.show_id(c.commit)} ${_('Branch')}: ${c.commit.branch}
 </%def>
 
 <%def name="menu_bar_subnav()">
diff --git a/rhodecode/templates/forks/fork.mako b/rhodecode/templates/forks/fork.mako
--- a/rhodecode/templates/forks/fork.mako
+++ b/rhodecode/templates/forks/fork.mako
@@ -85,6 +85,16 @@
 
             <div class="field">
                 <div class="label label-checkbox">
+                    <label for="private">${_('Copy permissions')}:</label>
+                </div>
+                <div class="checkboxes">
+                    ${h.checkbox('copy_permissions',value="True", checked="checked")}
+                    <span class="help-block">${_('Copy permissions from forked repository')}</span>
+                </div>
+            </div>
+
+            <div class="field">
+                <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
@@ -93,16 +103,6 @@
                 </div>
             </div>
 
-            <div class="field">
-                <div class="label label-checkbox">
-                    <label for="private">${_('Copy permissions')}:</label>
-                </div>
-                <div class="checkboxes">
-                    ${h.checkbox('copy_permissions',value="True", checked="checked")}
-                    <span class="help-block">${_('Copy permissions from forked repository')}</span>
-                </div>
-            </div>
-
             <div class="buttons">
                 ${h.submit('',_('Fork this Repository'),class_="btn")}
             </div>
diff --git a/rhodecode/templates/forks/forks.mako b/rhodecode/templates/forks/forks.mako
--- a/rhodecode/templates/forks/forks.mako
+++ b/rhodecode/templates/forks/forks.mako
@@ -43,23 +43,15 @@
 <script type="text/javascript">
 
 $(document).ready(function() {
-    var $userListTable = $('#fork_list_table');
+    var $forksListTable = $('#fork_list_table');
 
-    var getDatatableCount = function(){
-      var table = $userListTable.dataTable();
-      var page = table.api().page.info();
-      var  active = page.recordsDisplay;
-      var  total = page.recordsTotal;
-
-      var _text = _gettext("{0} out of {1} users").format(active, total);
-      $('#user_count').text(_text);
-    };
-
-    // user list
-    $userListTable.DataTable({
+    // fork list
+    $forksListTable.DataTable({
       processing: true,
       serverSide: true,
-      ajax: "${h.route_path('repo_forks_data', repo_name=c.repo_name)}",
+      ajax: {
+          "url": "${h.route_path('repo_forks_data', repo_name=c.repo_name)}",
+      },
       dom: 'rtp',
       pageLength: ${c.visual.dashboard_items},
       order: [[ 0, "asc" ]],
@@ -92,23 +84,18 @@
       }
     });
 
-    $userListTable.on('xhr.dt', function(e, settings, json, xhr){
-        $userListTable.css('opacity', 1);
+    $forksListTable.on('xhr.dt', function(e, settings, json, xhr){
+        $forksListTable.css('opacity', 1);
     });
 
-    $userListTable.on('preXhr.dt', function(e, settings, data){
-        $userListTable.css('opacity', 0.3);
-    });
-
-    // refresh counters on draw
-    $userListTable.on('draw.dt', function(){
-        getDatatableCount();
+    $forksListTable.on('preXhr.dt', function(e, settings, data){
+        $forksListTable.css('opacity', 0.3);
     });
 
     // filter
     $('#q_filter').on('keyup',
         $.debounce(250, function() {
-            $userListTable.DataTable().search(
+            $forksListTable.DataTable().search(
                 $('#q_filter').val()
             ).draw();
         })
diff --git a/rhodecode/templates/forms/mapping.pt b/rhodecode/templates/forms/mapping.pt
--- a/rhodecode/templates/forms/mapping.pt
+++ b/rhodecode/templates/forms/mapping.pt
@@ -8,12 +8,11 @@
     <div class="panel-heading">${title}</div>
     <div class="panel-body">
 
-      <div tal:condition="errormsg"
-           class="clearfix alert alert-danger">
-        <p i18n:translate="">
+      <div tal:condition="errormsg" class="clearfix alert alert-error">
+        <span i18n:translate="">
            There was a problem with this section
-        </p>
-        <p>${errormsg}</p>
+        </span>
+        <div>${errormsg}</div>
       </div>
 
       <div tal:condition="description">
diff --git a/rhodecode/templates/index_base.mako b/rhodecode/templates/index_base.mako
--- a/rhodecode/templates/index_base.mako
+++ b/rhodecode/templates/index_base.mako
@@ -5,9 +5,8 @@
         <!-- box / title -->
         <div class="title">
             <div class="block-left breadcrumbs">
-              <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
               ${self.breadcrumbs()}
-              <span id="match_container" style="display:none">&raquo; <span id="match_count">0</span> ${_('matches')}</span>
+              <span id="match_container" style="display:none"><span id="match_count">0</span> ${_('matches')}</span>
             </div>
             %if c.rhodecode_user.username != h.DEFAULT_USER:
               <div class="block-right">
@@ -137,65 +136,6 @@
         });
         % endif
 
-        var getDatatableCount = function() {
-          var reposCount = 0;
-          var reposCountTotal = 0;
-
-          % if c.repos_data != '[]':
-          var pageInfo = $('#repo_list_table').dataTable().api().page.info();
-          var reposCount = pageInfo.recordsDisplay;
-          var reposCountTotal = pageInfo.recordsTotal;
-          % endif
-
-          var repoGroupsCount = 0;
-          var repoGroupsCountTotal = 0;
-
-          % if c.repo_groups_data != '[]':
-          var pageInfo = $('#group_list_table').dataTable().api().page.info();
-          var repoGroupsCount = pageInfo.recordsDisplay;
-          var repoGroupsCountTotal = pageInfo.recordsTotal;
-          % endif
-
-          if (repoGroupsCount !== repoGroupsCountTotal) {
-            $('#match_count').text(reposCount + repoGroupsCount);
-          }
-          if (reposCount !== reposCountTotal) {
-            $('#match_container').show();
-          }
-          if ($('#q_filter').val() === '') {
-            $('#match_container').hide();
-          }
-        };
-
-        // update the counter when doing search
-        $('#repo_list_table, #group_list_table').on( 'search.dt', function (e,settings) {
-          getDatatableCount();
-        });
-
-        // filter, filter both grids
-        $('#q_filter').on( 'keyup', function () {
-
-          % if c.repo_groups_data != '[]':
-          var repo_group_api = $('#group_list_table').dataTable().api();
-          repo_group_api
-            .columns( 0 )
-            .search( this.value )
-            .draw();
-          % endif
-
-          % if c.repos_data != '[]':
-          var repo_api = $('#repo_list_table').dataTable().api();
-          repo_api
-            .columns( 0 )
-            .search( this.value )
-            .draw();
-          % endif
-
-        });
-
-        // refilter table if page load via back button
-        $("#q_filter").trigger('keyup');
-
       });
     </script>
 </%def>
diff --git a/rhodecode/templates/journal/journal.mako b/rhodecode/templates/journal/journal.mako
--- a/rhodecode/templates/journal/journal.mako
+++ b/rhodecode/templates/journal/journal.mako
@@ -7,19 +7,20 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs()">
-    <h1 class="block-left">
+<%def name="breadcrumbs_links()">
     ${h.form(None, id_="filter_form", method="get")}
         <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term}" placeholder="${_('quick filter...')}"/>
-        <input type='submit' value="${_('Filter')}" class="btn" />
+        <input type='submit' value="${_('filter')}" class="btn" />
         ${_('Journal')} - ${_ungettext('%s entry', '%s entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}
     ${h.end_form()}
-    </h1>
-    <p class="tooltip filterexample" title="${h.tooltip(h.journal_filter_help(request))}">${_('Example Queries')}</p>
+    <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
+    <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
 </%def>
+
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='journal')}
 </%def>
+
 <%def name="head_extra()">
 <link href="${h.route_path('journal_atom', _query=dict(auth_token=c.rhodecode_user.feed_token))}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />
 <link href="${h.route_path('journal_rss', _query=dict(auth_token=c.rhodecode_user.feed_token))}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />
@@ -27,30 +28,31 @@
 
 <%def name="main()">
 
-    <div class="box">
-        <!-- box / title -->
-        <div class="title journal">
-         ${self.breadcrumbs()}
-         <ul class="links icon-only-links block-right">
-           <li>
-             <span><a id="refresh" href="${h.route_path('journal')}"><i class="icon-refresh"></i></a></span>
-           </li>
-           <li>
-             <span><a href="${h.route_path('journal_atom', _query=dict(auth_token=c.rhodecode_user.feed_token))}"><i class="icon-rss-sign"></i></a></span>
-           </li>
-         </ul>
-        </div>
-        <div id="journal">${c.journal_data|n}</div>
+<div class="box">
+    <!-- box / title -->
+    <div class="title journal">
+     ${self.breadcrumbs()}
+     <ul class="links icon-only-links block-right">
+       <li>
+         <span><a id="refresh" href="${h.route_path('journal')}"><i class="icon-refresh"></i></a></span>
+       </li>
+       <li>
+         <span><a href="${h.route_path('journal_atom', _query=dict(auth_token=c.rhodecode_user.feed_token))}"><i class="icon-rss-sign"></i></a></span>
+       </li>
+     </ul>
     </div>
+    <div id="journal">${c.journal_data|n}</div>
+</div>
 
-    <script type="text/javascript">
+<script type="text/javascript">
 
-    $('#j_filter').autoGrowInput();
-    $(document).on('pjax:success',function(){
-      show_more_event();
-    });
-    $(document).pjax('#refresh', '#journal',
-                     {url: "${request.current_route_path(_query=dict(filter=c.search_term))}", push: false});
+$('#j_filter').autoGrowInput();
+$(document).on('pjax:success',function(){
+  show_more_event();
+});
+$(document).pjax(
+    '#refresh', '#journal',
+    {url: "${request.current_route_path(_query=dict(filter=c.search_term))}", push: false});
 
-    </script>
+</script>
 </%def>
diff --git a/rhodecode/templates/login.mako b/rhodecode/templates/login.mako
--- a/rhodecode/templates/login.mako
+++ b/rhodecode/templates/login.mako
@@ -73,7 +73,9 @@
                     %endif
 
                     ${h.submit('sign_in', _('Sign In'), class_="btn sign-in")}
-
+                    <p class="help-block pull-right">
+                        RhodeCode ${c.rhodecode_edition}
+                    </p>
                 ${h.end_form()}
                 <script type="text/javascript">
                     $(document).ready(function(){
diff --git a/rhodecode/templates/password_reset.mako b/rhodecode/templates/password_reset.mako
--- a/rhodecode/templates/password_reset.mako
+++ b/rhodecode/templates/password_reset.mako
@@ -55,6 +55,7 @@
                           <span class="error-message">${errors.get('email')}</span>
                           <br />
                         %endif
+                        <p class="help-block">${_('Password reset link will be sent to matching email address')}</p>
     
                         %if captcha_active:
                         <div class="login-captcha">
@@ -70,7 +71,9 @@
                         %endif
     
                         ${h.submit('send', _('Send password reset email'), class_="btn sign-in")}
-                        <div class="activation_msg">${_('Password reset link will be sent to matching email address')}</div>
+                        <p class="help-block pull-right">
+                            RhodeCode ${c.rhodecode_edition}
+                        </p>
     
                     ${h.end_form()}
                 </div>
diff --git a/rhodecode/templates/pullrequests/pullrequest.mako b/rhodecode/templates/pullrequests/pullrequest.mako
--- a/rhodecode/templates/pullrequests/pullrequest.mako
+++ b/rhodecode/templates/pullrequests/pullrequest.mako
@@ -1,4 +1,5 @@
 <%inherit file="/base/base.mako"/>
+<%namespace name="dt" file="/data_table/_dt_elements.mako"/>
 
 <%def name="title()">
     ${c.repo_name} ${_('New pull request')}
@@ -54,14 +55,14 @@
                                 <label for="pullrequest_desc">${_('Description')}:</label>
                             </div>
                             <div class="textarea text-area editor">
-                                ${h.textarea('pullrequest_desc',size=30, )}
-                                <span class="help-block">${_('Write a short description on this pull request')}</span>
+                                <input id="pr-renderer-input" type="hidden" name="description_renderer" value="${c.visual.default_renderer}">
+                                ${dt.markup_form('pullrequest_desc')}
                             </div>
                         </div>
 
                         <div class="field">
                             <div class="label label-textarea">
-                                <label for="pullrequest_desc">${_('Commit flow')}:</label>
+                                <label for="commit_flow">${_('Commit flow')}:</label>
                             </div>
 
                             ## TODO: johbo: Abusing the "content" class here to get the
@@ -98,7 +99,7 @@
                             </div>
                             <div class="input">
                                 <div class="pr-submit-button">
-                                    ${h.submit('save',_('Submit Pull Request'),class_="btn")}
+                                    <input id="pr_submit" class="btn" name="save" type="submit" value="${_('Submit Pull Request')}">
                                 </div>
                                 <div id="pr_open_message"></div>
                             </div>
@@ -164,374 +165,384 @@
 </div>
 
 <script type="text/javascript">
-$(function(){
-  var defaultSourceRepo = '${c.default_repo_data['source_repo_name']}';
-  var defaultSourceRepoData = ${c.default_repo_data['source_refs_json']|n};
-  var defaultTargetRepo = '${c.default_repo_data['target_repo_name']}';
-  var defaultTargetRepoData = ${c.default_repo_data['target_refs_json']|n};
+ $(function(){
+   var defaultSourceRepo = '${c.default_repo_data['source_repo_name']}';
+   var defaultSourceRepoData = ${c.default_repo_data['source_refs_json']|n};
+   var defaultTargetRepo = '${c.default_repo_data['target_repo_name']}';
+   var defaultTargetRepoData = ${c.default_repo_data['target_refs_json']|n};
 
-  var $pullRequestForm = $('#pull_request_form');
-  var $sourceRepo = $('#source_repo', $pullRequestForm);
-  var $targetRepo = $('#target_repo', $pullRequestForm);
-  var $sourceRef = $('#source_ref', $pullRequestForm);
-  var $targetRef = $('#target_ref', $pullRequestForm);
+   var $pullRequestForm = $('#pull_request_form');
+   var $pullRequestSubmit = $('#pr_submit', $pullRequestForm);
+   var $sourceRepo = $('#source_repo', $pullRequestForm);
+   var $targetRepo = $('#target_repo', $pullRequestForm);
+   var $sourceRef = $('#source_ref', $pullRequestForm);
+   var $targetRef = $('#target_ref', $pullRequestForm);
 
-  var sourceRepo = function() { return $sourceRepo.eq(0).val() };
-  var sourceRef = function() { return $sourceRef.eq(0).val().split(':') };
+   var sourceRepo = function() { return $sourceRepo.eq(0).val() };
+   var sourceRef = function() { return $sourceRef.eq(0).val().split(':') };
 
-  var targetRepo = function() { return $targetRepo.eq(0).val() };
-  var targetRef = function() { return $targetRef.eq(0).val().split(':') };
+   var targetRepo = function() { return $targetRepo.eq(0).val() };
+   var targetRef = function() { return $targetRef.eq(0).val().split(':') };
 
-  var calculateContainerWidth = function() {
-      var maxWidth = 0;
-      var repoSelect2Containers = ['#source_repo', '#target_repo'];
-      $.each(repoSelect2Containers, function(idx, value) {
-          $(value).select2('container').width('auto');
-          var curWidth = $(value).select2('container').width();
-          if (maxWidth <= curWidth) {
-              maxWidth = curWidth;
-          }
-          $.each(repoSelect2Containers, function(idx, value) {
-              $(value).select2('container').width(maxWidth + 10);
-          });
-      });
-  };
+   var calculateContainerWidth = function() {
+       var maxWidth = 0;
+       var repoSelect2Containers = ['#source_repo', '#target_repo'];
+       $.each(repoSelect2Containers, function(idx, value) {
+           $(value).select2('container').width('auto');
+           var curWidth = $(value).select2('container').width();
+           if (maxWidth <= curWidth) {
+               maxWidth = curWidth;
+           }
+           $.each(repoSelect2Containers, function(idx, value) {
+               $(value).select2('container').width(maxWidth + 10);
+           });
+       });
+   };
 
-  var initRefSelection = function(selectedRef) {
-      return function(element, callback) {
-          // translate our select2 id into a text, it's a mapping to show
-          // simple label when selecting by internal ID.
-          var id, refData;
-          if (selectedRef === undefined || selectedRef === null) {
-            id = element.val();
-            refData = element.val().split(':');
+   var initRefSelection = function(selectedRef) {
+       return function(element, callback) {
+           // translate our select2 id into a text, it's a mapping to show
+           // simple label when selecting by internal ID.
+           var id, refData;
+           if (selectedRef === undefined || selectedRef === null) {
+             id = element.val();
+             refData = element.val().split(':');
 
-            if (refData.length !== 3){
-                refData = ["", "", ""]
-            }
-          } else {
-            id = selectedRef;
-            refData = selectedRef.split(':');
-          }
+             if (refData.length !== 3){
+                 refData = ["", "", ""]
+             }
+           } else {
+             id = selectedRef;
+             refData = selectedRef.split(':');
+           }
 
-          var text = refData[1];
-          if (refData[0] === 'rev') {
-              text = text.substring(0, 12);
-          }
+           var text = refData[1];
+           if (refData[0] === 'rev') {
+               text = text.substring(0, 12);
+           }
 
-          var data = {id: id, text: text};
-          callback(data);
-      };
-  };
+           var data = {id: id, text: text};
+           callback(data);
+       };
+   };
 
-  var formatRefSelection = function(item) {
-      var prefix = '';
-      var refData = item.id.split(':');
-      if (refData[0] === 'branch') {
-          prefix = '<i class="icon-branch"></i>';
-      }
-      else if (refData[0] === 'book') {
-          prefix = '<i class="icon-bookmark"></i>';
-      }
-      else if (refData[0] === 'tag') {
-          prefix = '<i class="icon-tag"></i>';
-      }
+   var formatRefSelection = function(data, container, escapeMarkup) {
+       var prefix = '';
+       var refData = data.id.split(':');
+       if (refData[0] === 'branch') {
+           prefix = '<i class="icon-branch"></i>';
+       }
+       else if (refData[0] === 'book') {
+           prefix = '<i class="icon-bookmark"></i>';
+       }
+       else if (refData[0] === 'tag') {
+           prefix = '<i class="icon-tag"></i>';
+       }
 
-      var originalOption = item.element;
-      return prefix + item.text;
-  };
+       var originalOption = data.element;
+       return prefix + escapeMarkup(data.text);
+   };formatSelection:
 
-  // custom code mirror
-  var codeMirrorInstance = initPullRequestsCodeMirror('#pullrequest_desc');
+   // custom code mirror
+   var codeMirrorInstance = $('#pullrequest_desc').get(0).MarkupForm.cm;
 
-  reviewersController = new ReviewersController();
+   reviewersController = new ReviewersController();
 
-  var queryTargetRepo = function(self, query) {
-      // cache ALL results if query is empty
-      var cacheKey = query.term || '__';
-      var cachedData = self.cachedDataSource[cacheKey];
+   var queryTargetRepo = function(self, query) {
+       // cache ALL results if query is empty
+       var cacheKey = query.term || '__';
+       var cachedData = self.cachedDataSource[cacheKey];
 
-      if (cachedData) {
-          query.callback({results: cachedData.results});
-      } else {
-          $.ajax({
-              url: pyroutes.url('pullrequest_repo_destinations', {'repo_name': templateContext.repo_name}),
-              data: {query: query.term},
-              dataType: 'json',
-              type: 'GET',
-              success: function(data) {
-                  self.cachedDataSource[cacheKey] = data;
-                  query.callback({results: data.results});
-              },
-              error: function(data, textStatus, errorThrown) {
-                  alert(
-                    "Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
-              }
-          });
-      }
-  };
+       if (cachedData) {
+           query.callback({results: cachedData.results});
+       } else {
+           $.ajax({
+               url: pyroutes.url('pullrequest_repo_destinations', {'repo_name': templateContext.repo_name}),
+               data: {query: query.term},
+               dataType: 'json',
+               type: 'GET',
+               success: function(data) {
+                   self.cachedDataSource[cacheKey] = data;
+                   query.callback({results: data.results});
+               },
+               error: function(data, textStatus, errorThrown) {
+                   alert(
+                     "Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
+               }
+           });
+       }
+   };
 
-  var queryTargetRefs = function(initialData, query) {
-      var data = {results: []};
-      // filter initialData
-      $.each(initialData, function() {
-          var section = this.text;
-          var children = [];
-          $.each(this.children, function() {
-              if (query.term.length === 0 ||
-                  this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ) {
-                  children.push({'id': this.id, 'text': this.text})
-              }
-          });
-          data.results.push({'text': section, 'children': children})
-      });
-      query.callback({results: data.results});
-  };
+   var queryTargetRefs = function(initialData, query) {
+       var data = {results: []};
+       // filter initialData
+       $.each(initialData, function() {
+           var section = this.text;
+           var children = [];
+           $.each(this.children, function() {
+               if (query.term.length === 0 ||
+                   this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ) {
+                   children.push({'id': this.id, 'text': this.text})
+               }
+           });
+           data.results.push({'text': section, 'children': children})
+       });
+       query.callback({results: data.results});
+   };
 
-  var loadRepoRefDiffPreview = function() {
+   var loadRepoRefDiffPreview = function() {
 
-      var url_data = {
-          'repo_name': targetRepo(),
-          'target_repo': sourceRepo(),
-          'source_ref': targetRef()[2],
-          'source_ref_type': 'rev',
-          'target_ref': sourceRef()[2],
-          'target_ref_type': 'rev',
-          'merge': true,
-          '_': Date.now() // bypass browser caching
-      }; // gather the source/target ref and repo here
+       var url_data = {
+           'repo_name': targetRepo(),
+           'target_repo': sourceRepo(),
+           'source_ref': targetRef()[2],
+           'source_ref_type': 'rev',
+           'target_ref': sourceRef()[2],
+           'target_ref_type': 'rev',
+           'merge': true,
+           '_': Date.now() // bypass browser caching
+       }; // gather the source/target ref and repo here
 
-      if (sourceRef().length !== 3 || targetRef().length !== 3) {
-          prButtonLock(true, "${_('Please select source and target')}");
-          return;
-      }
-      var url = pyroutes.url('repo_compare', url_data);
+       if (sourceRef().length !== 3 || targetRef().length !== 3) {
+           prButtonLock(true, "${_('Please select source and target')}");
+           return;
+       }
+       var url = pyroutes.url('repo_compare', url_data);
 
-      // lock PR button, so we cannot send PR before it's calculated
-      prButtonLock(true, "${_('Loading compare ...')}", 'compare');
+       // lock PR button, so we cannot send PR before it's calculated
+       prButtonLock(true, "${_('Loading compare ...')}", 'compare');
+
+       if (loadRepoRefDiffPreview._currentRequest) {
+           loadRepoRefDiffPreview._currentRequest.abort();
+       }
 
-      if (loadRepoRefDiffPreview._currentRequest) {
-          loadRepoRefDiffPreview._currentRequest.abort();
-      }
+       loadRepoRefDiffPreview._currentRequest = $.get(url)
+           .error(function(data, textStatus, errorThrown) {
+                 if (textStatus !== 'abort') {
+                     alert(
+                         "Error while processing request.\nError code {0} ({1}).".format(
+                                 data.status, data.statusText));
+                 }
 
-      loadRepoRefDiffPreview._currentRequest = $.get(url)
-          .error(function(data, textStatus, errorThrown) {
-                if (textStatus !== 'abort') {
-                    alert(
-                        "Error while processing request.\nError code {0} ({1}).".format(
-                                data.status, data.statusText));
-                }
+           })
+           .done(function(data) {
+               loadRepoRefDiffPreview._currentRequest = null;
+               $('#pull_request_overview').html(data);
+
+               var commitElements = $(data).find('tr[commit_id]');
 
-          })
-          .done(function(data) {
-              loadRepoRefDiffPreview._currentRequest = null;
-              $('#pull_request_overview').html(data);
+               var prTitleAndDesc = getTitleAndDescription(
+                   sourceRef()[1], commitElements, 5);
 
-              var commitElements = $(data).find('tr[commit_id]');
+               var title = prTitleAndDesc[0];
+               var proposedDescription = prTitleAndDesc[1];
 
-              var prTitleAndDesc = getTitleAndDescription(
-                  sourceRef()[1], commitElements, 5);
+               var useGeneratedTitle = (
+                    $('#pullrequest_title').hasClass('autogenerated-title') ||
+                    $('#pullrequest_title').val() === "");
 
-              var title = prTitleAndDesc[0];
-              var proposedDescription = prTitleAndDesc[1];
-
-              var useGeneratedTitle = (
-                   $('#pullrequest_title').hasClass('autogenerated-title') ||
-                   $('#pullrequest_title').val() === "");
+               if (title && useGeneratedTitle) {
+                   // use generated title if we haven't specified our own
+                   $('#pullrequest_title').val(title);
+                   $('#pullrequest_title').addClass('autogenerated-title');
 
-              if (title && useGeneratedTitle) {
-                  // use generated title if we haven't specified our own
-                  $('#pullrequest_title').val(title);
-                  $('#pullrequest_title').addClass('autogenerated-title');
+               }
+
+               var useGeneratedDescription = (
+                   !codeMirrorInstance._userDefinedValue ||
+                    codeMirrorInstance.getValue() === "");
 
-              }
+               if (proposedDescription && useGeneratedDescription) {
+                    // set proposed content, if we haven't defined our own,
+                    // or we don't have description written
+                    codeMirrorInstance._userDefinedValue = false; // reset state
+                    codeMirrorInstance.setValue(proposedDescription);
+               }
 
-              var useGeneratedDescription = (
-                  !codeMirrorInstance._userDefinedDesc ||
-                   codeMirrorInstance.getValue() === "");
+               // refresh our codeMirror so events kicks in and it's change aware
+               codeMirrorInstance.refresh();
 
-              if (proposedDescription && useGeneratedDescription) {
-                  // set proposed content, if we haven't defined our own,
-                  // or we don't have description written
-                  codeMirrorInstance._userDefinedDesc = false; // reset state
-                  codeMirrorInstance.setValue(proposedDescription);
-              }
+               var msg = '';
+               if (commitElements.length === 1) {
+                   msg = "${_ungettext('This pull request will consist of __COMMITS__ commit.', 'This pull request will consist of __COMMITS__ commits.', 1)}";
+               } else {
+                   msg = "${_ungettext('This pull request will consist of __COMMITS__ commit.', 'This pull request will consist of __COMMITS__ commits.', 2)}";
+               }
 
-              var msg = '';
-              if (commitElements.length === 1) {
-                  msg = "${_ungettext('This pull request will consist of __COMMITS__ commit.', 'This pull request will consist of __COMMITS__ commits.', 1)}";
-              } else {
-                  msg = "${_ungettext('This pull request will consist of __COMMITS__ commit.', 'This pull request will consist of __COMMITS__ commits.', 2)}";
-              }
+               msg += ' <a id="pull_request_overview_url" href="{0}" target="_blank">${_('Show detailed compare.')}</a>'.format(url);
 
-              msg += ' <a id="pull_request_overview_url" href="{0}" target="_blank">${_('Show detailed compare.')}</a>'.format(url);
-
-              if (commitElements.length) {
-                  var commitsLink = '<a href="#pull_request_overview"><strong>{0}</strong></a>'.format(commitElements.length);
-                  prButtonLock(false, msg.replace('__COMMITS__', commitsLink), 'compare');
-              }
-              else {
-                  prButtonLock(true, "${_('There are no commits to merge.')}", 'compare');
-              }
+               if (commitElements.length) {
+                   var commitsLink = '<a href="#pull_request_overview"><strong>{0}</strong></a>'.format(commitElements.length);
+                   prButtonLock(false, msg.replace('__COMMITS__', commitsLink), 'compare');
+               }
+               else {
+                   prButtonLock(true, "${_('There are no commits to merge.')}", 'compare');
+               }
 
 
-          });
-  };
+           });
+   };
 
-  var Select2Box = function(element, overrides) {
-    var globalDefaults = {
-        dropdownAutoWidth: true,
-        containerCssClass: "drop-menu",
-        dropdownCssClass: "drop-menu-dropdown"
-    };
+   var Select2Box = function(element, overrides) {
+     var globalDefaults = {
+         dropdownAutoWidth: true,
+         containerCssClass: "drop-menu",
+         dropdownCssClass: "drop-menu-dropdown"
+     };
 
-    var initSelect2 = function(defaultOptions) {
-      var options = jQuery.extend(globalDefaults, defaultOptions, overrides);
-      element.select2(options);
-    };
+     var initSelect2 = function(defaultOptions) {
+       var options = jQuery.extend(globalDefaults, defaultOptions, overrides);
+       element.select2(options);
+     };
 
-    return {
-      initRef: function() {
-        var defaultOptions = {
-          minimumResultsForSearch: 5,
-          formatSelection: formatRefSelection
-        };
+     return {
+       initRef: function() {
+         var defaultOptions = {
+           minimumResultsForSearch: 5,
+           formatSelection: formatRefSelection
+         };
 
-        initSelect2(defaultOptions);
-      },
+         initSelect2(defaultOptions);
+       },
 
-      initRepo: function(defaultValue, readOnly) {
-        var defaultOptions = {
-          initSelection : function (element, callback) {
-            var data = {id: defaultValue, text: defaultValue};
-            callback(data);
-          }
-        };
+       initRepo: function(defaultValue, readOnly) {
+         var defaultOptions = {
+           initSelection : function (element, callback) {
+             var data = {id: defaultValue, text: defaultValue};
+             callback(data);
+           }
+         };
 
-        initSelect2(defaultOptions);
+         initSelect2(defaultOptions);
 
-        element.select2('val', defaultSourceRepo);
-        if (readOnly === true) {
-          element.select2('readonly', true);
-        }
-      }
-    };
-  };
+         element.select2('val', defaultSourceRepo);
+         if (readOnly === true) {
+           element.select2('readonly', true);
+         }
+       }
+     };
+   };
+
+   var initTargetRefs = function(refsData, selectedRef) {
 
-  var initTargetRefs = function(refsData, selectedRef) {
+     Select2Box($targetRef, {
+         placeholder: "${_('Select commit reference')}",
+       query: function(query) {
+         queryTargetRefs(refsData, query);
+       },
+       initSelection : initRefSelection(selectedRef)
+     }).initRef();
 
-    Select2Box($targetRef, {
-        placeholder: "${_('Select commit reference')}",
-      query: function(query) {
-        queryTargetRefs(refsData, query);
-      },
-      initSelection : initRefSelection(selectedRef)
-    }).initRef();
+     if (!(selectedRef === undefined)) {
+         $targetRef.select2('val', selectedRef);
+     }
+   };
 
-    if (!(selectedRef === undefined)) {
-        $targetRef.select2('val', selectedRef);
-    }
-  };
+   var targetRepoChanged = function(repoData) {
+       // generate new DESC of target repo displayed next to select
+       var prLink = pyroutes.url('pullrequest_new', {'repo_name': repoData['name']});
+       $('#target_repo_desc').html(
+           "<strong>${_('Target repository')}</strong>: {0}. <a href=\"{1}\">Switch base, and use as source.</a>".format(repoData['description'], prLink)
+       );
+
+       // generate dynamic select2 for refs.
+       initTargetRefs(repoData['refs']['select2_refs'],
+                      repoData['refs']['selected_ref']);
 
-  var targetRepoChanged = function(repoData) {
-      // generate new DESC of target repo displayed next to select
-      var prLink = pyroutes.url('pullrequest_new', {'repo_name': repoData['name']});
-      $('#target_repo_desc').html(
-          "<strong>${_('Target repository')}</strong>: {0}. <a href=\"{1}\">Switch base, and use as source.</a>".format(repoData['description'], prLink)
-      );
+   };
 
-      // generate dynamic select2 for refs.
-      initTargetRefs(repoData['refs']['select2_refs'],
-                     repoData['refs']['selected_ref']);
-
-  };
+   var sourceRefSelect2 = Select2Box($sourceRef, {
+       placeholder: "${_('Select commit reference')}",
+       query: function(query) {
+         var initialData = defaultSourceRepoData['refs']['select2_refs'];
+         queryTargetRefs(initialData, query)
+       },
+       initSelection: initRefSelection()
+     }
+   );
 
-  var sourceRefSelect2 = Select2Box($sourceRef, {
-      placeholder: "${_('Select commit reference')}",
-      query: function(query) {
-        var initialData = defaultSourceRepoData['refs']['select2_refs'];
-        queryTargetRefs(initialData, query)
-      },
-      initSelection: initRefSelection()
-    }
-  );
+   var sourceRepoSelect2 = Select2Box($sourceRepo, {
+     query: function(query) {}
+   });
 
-  var sourceRepoSelect2 = Select2Box($sourceRepo, {
-    query: function(query) {}
-  });
+   var targetRepoSelect2 = Select2Box($targetRepo, {
+     cachedDataSource: {},
+     query: $.debounce(250, function(query) {
+       queryTargetRepo(this, query);
+     }),
+     formatResult: formatRepoResult
+   });
+
+   sourceRefSelect2.initRef();
+
+   sourceRepoSelect2.initRepo(defaultSourceRepo, true);
+
+   targetRepoSelect2.initRepo(defaultTargetRepo, false);
 
-  var targetRepoSelect2 = Select2Box($targetRepo, {
-    cachedDataSource: {},
-    query: $.debounce(250, function(query) {
-      queryTargetRepo(this, query);
-    }),
-    formatResult: formatResult
-  });
-
-  sourceRefSelect2.initRef();
-
-  sourceRepoSelect2.initRepo(defaultSourceRepo, true);
+   $sourceRef.on('change', function(e){
+     loadRepoRefDiffPreview();
+     reviewersController.loadDefaultReviewers(
+         sourceRepo(), sourceRef(), targetRepo(), targetRef());
+   });
 
-  targetRepoSelect2.initRepo(defaultTargetRepo, false);
+   $targetRef.on('change', function(e){
+     loadRepoRefDiffPreview();
+     reviewersController.loadDefaultReviewers(
+         sourceRepo(), sourceRef(), targetRepo(), targetRef());
+   });
 
-  $sourceRef.on('change', function(e){
-    loadRepoRefDiffPreview();
-    reviewersController.loadDefaultReviewers(
-        sourceRepo(), sourceRef(), targetRepo(), targetRef());
-  });
-
-  $targetRef.on('change', function(e){
-    loadRepoRefDiffPreview();
-    reviewersController.loadDefaultReviewers(
-        sourceRepo(), sourceRef(), targetRepo(), targetRef());
-  });
+   $targetRepo.on('change', function(e){
+       var repoName = $(this).val();
+       calculateContainerWidth();
+       $targetRef.select2('destroy');
+       $('#target_ref_loading').show();
 
-  $targetRepo.on('change', function(e){
-      var repoName = $(this).val();
-      calculateContainerWidth();
-      $targetRef.select2('destroy');
-      $('#target_ref_loading').show();
+       $.ajax({
+           url: pyroutes.url('pullrequest_repo_refs',
+             {'repo_name': templateContext.repo_name, 'target_repo_name':repoName}),
+           data: {},
+           dataType: 'json',
+           type: 'GET',
+           success: function(data) {
+               $('#target_ref_loading').hide();
+               targetRepoChanged(data);
+               loadRepoRefDiffPreview();
+           },
+           error: function(data, textStatus, errorThrown) {
+               alert("Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
+           }
+       })
 
-      $.ajax({
-          url: pyroutes.url('pullrequest_repo_refs',
-            {'repo_name': templateContext.repo_name, 'target_repo_name':repoName}),
-          data: {},
-          dataType: 'json',
-          type: 'GET',
-          success: function(data) {
-              $('#target_ref_loading').hide();
-              targetRepoChanged(data);
-              loadRepoRefDiffPreview();
-          },
-          error: function(data, textStatus, errorThrown) {
-              alert("Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
-          }
-      })
+   });
 
-  });
-
-  prButtonLock(true, "${_('Please select source and target')}", 'all');
+    $pullRequestForm.on('submit', function(e){
+        // Flush changes into textarea
+        codeMirrorInstance.save();
+        prButtonLock(true, null, 'all');
+    });
 
-  // auto-load on init, the target refs select2
-  calculateContainerWidth();
-  targetRepoChanged(defaultTargetRepoData);
+   prButtonLock(true, "${_('Please select source and target')}", 'all');
 
-  $('#pullrequest_title').on('keyup', function(e){
-      $(this).removeClass('autogenerated-title');
-  });
+   // auto-load on init, the target refs select2
+   calculateContainerWidth();
+   targetRepoChanged(defaultTargetRepoData);
 
-  % if c.default_source_ref:
-  // in case we have a pre-selected value, use it now
-  $sourceRef.select2('val', '${c.default_source_ref}');
-  // diff preview load
-  loadRepoRefDiffPreview();
-  // default reviewers
-  reviewersController.loadDefaultReviewers(
-      sourceRepo(), sourceRef(), targetRepo(), targetRef());
-  % endif
+   $('#pullrequest_title').on('keyup', function(e){
+       $(this).removeClass('autogenerated-title');
+   });
 
-  ReviewerAutoComplete('#user');
-});
+   % if c.default_source_ref:
+   // in case we have a pre-selected value, use it now
+   $sourceRef.select2('val', '${c.default_source_ref}');
+   // diff preview load
+   loadRepoRefDiffPreview();
+   // default reviewers
+   reviewersController.loadDefaultReviewers(
+       sourceRepo(), sourceRef(), targetRepo(), targetRef());
+   % endif
+
+   ReviewerAutoComplete('#user');
+ });
 </script>
 
 </%def>
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -1,5 +1,6 @@
 <%inherit file="/base/base.mako"/>
 <%namespace name="base" file="/base/base.mako"/>
+<%namespace name="dt" file="/data_table/_dt_elements.mako"/>
 
 <%def name="title()">
     ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}
@@ -165,14 +166,15 @@
             </div>
            </div>
            <div class="field">
-            <div class="pr-description-label label-summary">
+            <div class="pr-description-label label-summary" title="${_('Rendered using {} renderer').format(c.renderer)}">
                 <label>${_('Description')}:</label>
             </div>
             <div id="pr-desc" class="input">
-                <div class="pr-description">${h.urlify_commit_message(c.pull_request.description, c.repo_name)}</div>
+                <div class="pr-description">${h.render(c.pull_request.description, renderer=c.renderer)}</div>
             </div>
             <div id="pr-desc-edit" class="input textarea editor" style="display: none;">
-                <textarea id="pr-description-input" size="30">${c.pull_request.description}</textarea>
+                <input id="pr-renderer-input" type="hidden" name="description_renderer" value="${c.visual.default_renderer}">
+                ${dt.markup_form('pr-description-input', form_text=c.pull_request.description)}
             </div>
            </div>
 
@@ -221,7 +223,7 @@
                                <td>
                                    % if c.at_version_num != ver_pr:
                                     <i class="icon-comment"></i>
-                                       <code class="tooltip" title="${_('Comment from pull request version {0}, general:{1} inline:{2}').format(ver_pos, len(c.comment_versions[ver_pr]['at']), len(c.inline_versions[ver_pr]['at']))}">
+                                       <code class="tooltip" title="${_('Comment from pull request version v{0}, general:{1} inline:{2}').format(ver_pos, len(c.comment_versions[ver_pr]['at']), len(c.inline_versions[ver_pr]['at']))}">
                                            G:${len(c.comment_versions[ver_pr]['at'])} / I:${len(c.inline_versions[ver_pr]['at'])}
                                        </code>
                                    % endif
@@ -417,6 +419,7 @@
                       <strong>${_('Missing commits')}:</strong>
                         ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}
                         ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}
+                        ${_('Consider doing a {force_refresh_url} in case you think this is an error.').format(force_refresh_url=h.link_to('force refresh', h.current_route_path(request, force_refresh='1')))|n}
                     </div>
                   </div>
                 </div>
@@ -642,7 +645,7 @@
         $(function(){
 
             // custom code mirror
-            var codeMirrorInstance = initPullRequestsCodeMirror('#pr-description-input');
+            var codeMirrorInstance = $('#pr-description-input').get(0).MarkupForm.cm;
 
             var PRDetails = {
               editButton: $('#open_edit_pullrequest'),
@@ -793,9 +796,10 @@
             $('#edit_pull_request').on('click', function(e){
                 var title = $('#pr-title-input').val();
                 var description = codeMirrorInstance.getValue();
+                var renderer = $('#pr-renderer-input').val();
                 editPullRequest(
                     "${c.repo_name}", "${c.pull_request.pull_request_id}",
-                    title, description);
+                    title, description, renderer);
             });
 
             $('#update_pull_request').on('click', function(e){
diff --git a/rhodecode/templates/register.mako b/rhodecode/templates/register.mako
--- a/rhodecode/templates/register.mako
+++ b/rhodecode/templates/register.mako
@@ -32,7 +32,12 @@
         <div id="register" class="right-column">
             <!-- login -->
             <div class="sign-in-title">
-                <h1>${_('Create an account')}</h1>
+                % if social_auth_provider:
+                    <h1>${_('Create an account linked with {}').format(social_auth_provider)}</h1>
+                % else:
+                    <h1>${_('Create an account')}</h1>
+                % endif
+
                 <h4>${h.link_to(_("Go to the login page to sign in with an existing account."), request.route_path('login'))}</h4>
             </div>
             <div class="inner form">
@@ -45,6 +50,11 @@
                       <br />
                     %endif
 
+                    % if social_auth_provider:
+                        ## hide password prompts for social auth
+                        <div style="display: none">
+                    % endif
+
                     <label for="password">${_('Password')}:</label>
                     ${h.password('password', defaults.get('password'))}
                     %if 'password' in errors:
@@ -59,6 +69,11 @@
                       <br />
                     %endif
 
+                    % if social_auth_provider:
+                        ## hide password prompts for social auth
+                        </div>
+                    % endif
+
                     <label for="firstname">${_('First Name')}:</label>
                     ${h.text('firstname', defaults.get('firstname'))}
                     %if 'firstname' in errors:
@@ -102,7 +117,9 @@
                     </p>
 
                     ${h.submit('sign_up',_('Create Account'),class_="btn sign-in")}
-
+                    <p class="help-block pull-right">
+                        RhodeCode ${c.rhodecode_edition}
+                    </p>
                 ${h.end_form()}
             </div>
             <%block name="below_register_button" />
diff --git a/rhodecode/tests/__init__.py b/rhodecode/tests/__init__.py
--- a/rhodecode/tests/__init__.py
+++ b/rhodecode/tests/__init__.py
@@ -41,7 +41,7 @@ log = logging.getLogger(__name__)
 
 __all__ = [
     'get_new_dir', 'TestController',
-    'link_to', 'clear_all_caches',
+    'link_to', 'clear_cache_regions',
     'assert_session_flash', 'login_user', 'no_newline_id_generator',
     'TESTS_TMP_PATH', 'HG_REPO', 'GIT_REPO', 'SVN_REPO',
     'NEW_HG_REPO', 'NEW_GIT_REPO',
@@ -95,10 +95,12 @@ TEST_HG_REPO_PULL = jn(TESTS_TMP_PATH, '
 TEST_REPO_PREFIX = 'vcs-test'
 
 
-def clear_all_caches():
-    from beaker.cache import cache_managers
-    for _cache in cache_managers.values():
-        _cache.clear()
+def clear_cache_regions(regions=None):
+    # dogpile
+    from rhodecode.lib.rc_cache import region_meta
+    for region_name, region in region_meta.dogpile_cache_regions.items():
+        if not regions or region_name in regions:
+            region.invalidate()
 
 
 def get_new_dir(title):
@@ -116,6 +118,13 @@ def get_new_dir(title):
     return get_normalized_path(path)
 
 
+def repo_id_generator(name):
+    numeric_hash = 0
+    for char in name:
+        numeric_hash += (ord(char))
+    return numeric_hash
+
+
 @pytest.mark.usefixtures('app', 'index_location')
 class TestController(object):
 
diff --git a/rhodecode/tests/config/test_sanitize_settings.py b/rhodecode/tests/config/test_sanitize_settings.py
--- a/rhodecode/tests/config/test_sanitize_settings.py
+++ b/rhodecode/tests/config/test_sanitize_settings.py
@@ -117,6 +117,7 @@ class TestSanitizeVcsSettings(object):
         ('vcs.svn.compatible_version', ''),
         ('git_rev_filter', '--all'),
         ('vcs.hooks.protocol', 'http'),
+        ('vcs.hooks.host', '127.0.0.1'),
         ('vcs.scm_app_implementation', 'http'),
         ('vcs.server', ''),
         ('vcs.server.log_level', 'debug'),
diff --git a/rhodecode/tests/lib/middleware/test_simplehg.py b/rhodecode/tests/lib/middleware/test_simplehg.py
--- a/rhodecode/tests/lib/middleware/test_simplehg.py
+++ b/rhodecode/tests/lib/middleware/test_simplehg.py
@@ -47,11 +47,14 @@ def get_environ(url):
         ('/foo/bar?cmd=pushkey&key=tip', 'push'),
         ('/foo/bar?cmd=listkeys&key=tip', 'pull'),
         ('/foo/bar?cmd=changegroup&key=tip', 'pull'),
-        # Edge case: unknown argument: assume pull
-        ('/foo/bar?cmd=unknown&key=tip', 'pull'),
-        ('/foo/bar?cmd=&key=tip', 'pull'),
+        ('/foo/bar?cmd=hello', 'pull'),
+        ('/foo/bar?cmd=batch', 'push'),
+        ('/foo/bar?cmd=putlfile', 'push'),
+        # Edge case: unknown argument: assume push
+        ('/foo/bar?cmd=unknown&key=tip', 'push'),
+        ('/foo/bar?cmd=&key=tip', 'push'),
         # Edge case: not cmd argument
-        ('/foo/bar?key=tip', 'pull'),
+        ('/foo/bar?key=tip', 'push'),
     ])
 def test_get_action(url, expected_action, request_stub):
     app = simplehg.SimpleHg(config={'auth_ret_code': '', 'base_path': ''},
@@ -60,6 +63,34 @@ def test_get_action(url, expected_action
 
 
 @pytest.mark.parametrize(
+    'environ, expected_xargs, expected_batch',
+    [
+        ({},
+         [''], ['push']),
+
+        ({'HTTP_X_HGARG_1': ''},
+         [''], ['push']),
+
+        ({'HTTP_X_HGARG_1': 'cmds=listkeys+namespace%3Dphases'},
+         ['listkeys namespace=phases'], ['pull']),
+
+        ({'HTTP_X_HGARG_1': 'cmds=pushkey+namespace%3Dbookmarks%2Ckey%3Dbm%2Cold%3D%2Cnew%3Dcb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b'},
+         ['pushkey namespace=bookmarks,key=bm,old=,new=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b'], ['push']),
+
+        ({'HTTP_X_HGARG_1': 'namespace=phases'},
+         ['namespace=phases'], ['push']),
+
+    ])
+def test_xarg_and_batch_commands(environ, expected_xargs, expected_batch):
+    app = simplehg.SimpleHg
+
+    result = app._get_xarg_headers(environ)
+    result_batch = app._get_batch_cmd(environ)
+    assert expected_xargs == result
+    assert expected_batch == result_batch
+
+
+@pytest.mark.parametrize(
     'url, expected_repo_name',
     [
         ('/foo?cmd=unbundle&key=tip', 'foo'),
diff --git a/rhodecode/tests/lib/middleware/test_simplevcs.py b/rhodecode/tests/lib/middleware/test_simplevcs.py
--- a/rhodecode/tests/lib/middleware/test_simplevcs.py
+++ b/rhodecode/tests/lib/middleware/test_simplevcs.py
@@ -333,7 +333,7 @@ class TestShadowRepoExposure(object):
         workspace_id = PullRequestModel()._workspace_id(pull_request)
         target_vcs = pull_request.target_repo.scm_instance()
         vcs_repo_name = target_vcs._get_shadow_repository_path(
-            workspace_id)
+            pull_request.target_repo.repo_id, workspace_id)
 
         assert controller.vcs_repo_name == vcs_repo_name
         assert controller.url_repo_name == shadow_url
@@ -465,6 +465,7 @@ class TestPrepareHooksDaemon(object):
         prepare_mock.assert_called_once_with(
             expected_extras,
             protocol=app_settings['vcs.hooks.protocol'],
+            host=app_settings['vcs.hooks.host'],
             txn_id=None,
             use_direct_calls=app_settings['vcs.hooks.direct_calls'])
 
diff --git a/rhodecode/tests/lib/test_auth.py b/rhodecode/tests/lib/test_auth.py
--- a/rhodecode/tests/lib/test_auth.py
+++ b/rhodecode/tests/lib/test_auth.py
@@ -419,7 +419,7 @@ def test_permission_calculator_admin_per
 
     calculator = auth.PermissionCalculator(
         user.user_id, {}, False, False, True, 'higherwin')
-    permissions = calculator._admin_permissions()
+    permissions = calculator._calculate_admin_permissions()
 
     assert permissions['repositories_groups'][repo_group.group_name] == \
         'group.admin'
diff --git a/rhodecode/tests/lib/test_auth_crypto_backend.py b/rhodecode/tests/lib/test_auth_crypto_backend.py
--- a/rhodecode/tests/lib/test_auth_crypto_backend.py
+++ b/rhodecode/tests/lib/test_auth_crypto_backend.py
@@ -75,7 +75,7 @@ def test_hash_check_with_update_enforces
 
 
 @pytest.fixture(params=[
-    auth._RhodeCodeCryptoMd5,
+    auth._RhodeCodeCryptoTest,
     auth._RhodeCodeCryptoBCrypt,
     auth._RhodeCodeCryptoSha256,
 ])
diff --git a/rhodecode/tests/lib/test_caches.py b/rhodecode/tests/lib/test_caches.py
--- a/rhodecode/tests/lib/test_caches.py
+++ b/rhodecode/tests/lib/test_caches.py
@@ -22,36 +22,24 @@ import time
 
 import pytest
 
-from rhodecode.lib import caches
-from rhodecode.lib.memory_lru_debug import MemoryLRUNamespaceManagerBase
+from rhodecode.lib import rc_cache
 
 
-class TestCacheManager(object):
+@pytest.mark.usefixtures('app')
+class TestCaches(object):
 
-    @pytest.mark.parametrize('repo_name', [
-        ('',),
-        (u'',),
-        (u'ac',),
-        ('ac', ),
-        (u'ęćc',),
-        ('ąac',),
+    def test_cache_decorator_init_not_configured(self):
+        with pytest.raises(EnvironmentError):
+            rc_cache.get_or_create_region('dontexist')
+
+    @pytest.mark.parametrize('region_name', [
+        'cache_perms', u'cache_perms',
     ])
-    def test_cache_manager_init(self, repo_name):
-        cache_manager_instance = caches.get_cache_manager(
-            repo_name, 'my_cache')
-        assert cache_manager_instance
-
-    def test_cache_manager_init_undefined_namespace(self):
-        cache_manager_instance = caches.get_cache_manager(
-            'repo_cache_long_undefined', 'my_cache')
-        assert cache_manager_instance
-
-        def_config = caches.DEFAULT_CACHE_MANAGER_CONFIG.copy()
-        def_config.pop('type')
-        assert cache_manager_instance.nsargs == def_config
-
-        assert isinstance(
-            cache_manager_instance.namespace, MemoryLRUNamespaceManagerBase)
+    def test_cache_decorator_init(self, region_name):
+        namespace = region_name
+        cache_region = rc_cache.get_or_create_region(
+            region_name, region_namespace=namespace)
+        assert cache_region
 
     @pytest.mark.parametrize('example_input', [
         ('',),
@@ -62,45 +50,59 @@ class TestCacheManager(object):
         (u'/ac', ),
     ])
     def test_cache_manager_create_key(self, example_input):
-        key = caches.compute_key_from_params(*example_input)
+        key = rc_cache.utils.compute_key_from_params(*example_input)
         assert key
 
-    def test_store_and_invalidate_value_from_manager(self):
-        cache_manger_instance = caches.get_cache_manager(
-            'repo_cache_long', 'my_cache_store')
+    @pytest.mark.parametrize('example_namespace', [
+        'namespace', None
+    ])
+    @pytest.mark.parametrize('example_input', [
+        ('',),
+        (u'/ac',),
+        (u'/ac', 1, 2, object()),
+        (u'/ęćc', 1, 2, object()),
+        ('/ąac',),
+        (u'/ac', ),
+    ])
+    def test_cache_keygen(self, example_input, example_namespace):
+        def func_wrapped():
+            return 1
+        func = rc_cache.utils.key_generator(example_namespace, func_wrapped)
+        key = func(*example_input)
+        assert key
 
-        def compute():
+    def test_store_value_in_cache(self):
+        cache_region = rc_cache.get_or_create_region('cache_perms')
+        # make sure we empty the cache now
+        cache_region.delete_multi(cache_region.backend.list_keys())
+
+        assert cache_region.backend.list_keys() == []
+
+        @cache_region.conditional_cache_on_arguments(expiration_time=5)
+        def compute(key):
             return time.time()
 
-        added_keys = []
-        for i in xrange(3):
-            _cache_key = caches.compute_key_from_params('foo_bar', 'p%s' % i)
-            added_keys.append(_cache_key)
-            for x in xrange(10):
-                cache_manger_instance.get(_cache_key, createfunc=compute)
+        for x in range(10):
+            compute(x)
+
+        assert len(set(cache_region.backend.list_keys())) == 10
 
-        for key in added_keys:
-            assert cache_manger_instance[key]
-
-        caches.clear_cache_manager(cache_manger_instance)
-
-        for key in added_keys:
-            assert key not in cache_manger_instance
-        assert len(cache_manger_instance.namespace.keys()) == 0
+    def test_store_and_get_value_from_region(self):
+        cache_region = rc_cache.get_or_create_region('cache_perms')
+        # make sure we empty the cache now
+        for key in cache_region.backend.list_keys():
+            cache_region.delete(key)
+        assert cache_region.backend.list_keys() == []
 
-    def test_store_and_get_value_from_manager(self):
-            cache_manger_instance = caches.get_cache_manager(
-                'repo_cache_long', 'my_cache_store')
-
-            _cache_key = caches.compute_key_from_params('foo_bar', 'multicall')
+        @cache_region.conditional_cache_on_arguments(expiration_time=5)
+        def compute(key):
+            return time.time()
 
-            def compute():
-                return time.time()
+        result = set()
+        for x in range(10):
+            ret = compute('x')
+            result.add(ret)
 
-            result = set()
-            for x in xrange(10):
-                ret = cache_manger_instance.get(_cache_key, createfunc=compute)
-                result.add(ret)
-
-            # once computed we have only one value after executing it 10x
-            assert len(result) == 1
+        # once computed we have only one value (the same from cache)
+        # after executing it 10x
+        assert len(result) == 1
diff --git a/rhodecode/tests/lib/test_hooks_daemon.py b/rhodecode/tests/lib/test_hooks_daemon.py
--- a/rhodecode/tests/lib/test_hooks_daemon.py
+++ b/rhodecode/tests/lib/test_hooks_daemon.py
@@ -180,7 +180,7 @@ class TestHttpHooksCallbackDaemon(object
         assert daemon._daemon == tcp_server
 
         _, port = tcp_server.server_address
-        expected_uri = '{}:{}'.format(daemon.IP_ADDRESS, port)
+        expected_uri = '{}:{}'.format('127.0.0.1', port)
         msg = 'Preparing HTTP callback daemon at `{}` and ' \
               'registering hook object'.format(expected_uri)
         assert_message_in_log(
@@ -192,7 +192,7 @@ class TestHttpHooksCallbackDaemon(object
             daemon = hooks_daemon.HttpHooksCallbackDaemon()
 
         _, port = tcp_server.server_address
-        expected_uri = '{}:{}'.format(daemon.IP_ADDRESS, port)
+        expected_uri = '{}:{}'.format('127.0.0.1', port)
         assert daemon.hooks_uri == expected_uri
 
         msg = 'Preparing HTTP callback daemon at `{}` and ' \
@@ -264,7 +264,8 @@ class TestPrepareHooksDaemon(object):
             self, protocol):
         expected_extras = {'extra1': 'value1'}
         callback, extras = hooks_daemon.prepare_callback_daemon(
-            expected_extras.copy(), protocol=protocol, use_direct_calls=True)
+            expected_extras.copy(), protocol=protocol,
+            host='127.0.0.1', use_direct_calls=True)
         assert isinstance(callback, hooks_daemon.DummyHooksCallbackDaemon)
         expected_extras['hooks_module'] = 'rhodecode.lib.hooks_daemon'
         expected_extras['time'] = extras['time']
@@ -281,7 +282,8 @@ class TestPrepareHooksDaemon(object):
             'hooks_protocol': protocol.lower()
         }
         callback, extras = hooks_daemon.prepare_callback_daemon(
-            expected_extras.copy(), protocol=protocol, use_direct_calls=False,
+            expected_extras.copy(), protocol=protocol, host='127.0.0.1',
+            use_direct_calls=False,
             txn_id='txnid2')
         assert isinstance(callback, expected_class)
         extras.pop('hooks_uri')
@@ -301,7 +303,7 @@ class TestPrepareHooksDaemon(object):
         with pytest.raises(Exception):
             callback, extras = hooks_daemon.prepare_callback_daemon(
                 expected_extras.copy(),
-                protocol=protocol,
+                protocol=protocol, host='127.0.0.1',
                 use_direct_calls=False)
 
 
diff --git a/rhodecode/tests/lib/test_libs.py b/rhodecode/tests/lib/test_libs.py
--- a/rhodecode/tests/lib/test_libs.py
+++ b/rhodecode/tests/lib/test_libs.py
@@ -30,10 +30,12 @@ import pytest
 
 from rhodecode.tests import no_newline_id_generator
 from rhodecode.tests.utils import run_test_concurrently
-from rhodecode.lib.helpers import InitialsGravatar
 
+from rhodecode.lib import rc_cache
+from rhodecode.lib.helpers import InitialsGravatar
 from rhodecode.lib.utils2 import AttributeDict
-from rhodecode.model.db import Repository
+
+from rhodecode.model.db import Repository, CacheKey
 
 
 def _urls_for_proto(proto):
@@ -558,87 +560,128 @@ def test_get_repo_by_id(test, expected):
     assert _test == expected
 
 
-@pytest.mark.parametrize("test_repo_name, repo_type", [
-  ("test_repo_1", None),
-  ("repo_group/foobar", None),
-  ("test_non_asci_ąćę", None),
-  (u"test_non_asci_unicode_ąćę", None),
-])
-def test_invalidation_context(baseapp, test_repo_name, repo_type):
-    from beaker.cache import cache_region
-    from rhodecode.lib import caches
-    from rhodecode.model.db import CacheKey
+def test_invalidation_context(baseapp):
+    repo_id = 999
+
+    cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
+        repo_id, CacheKey.CACHE_TYPE_README)
+    invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+        repo_id=repo_id)
+    region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
+
+    calls = [1, 2]
 
-    @cache_region('long_term')
+    @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
     def _dummy_func(cache_key):
-        return 'result'
+        val = calls.pop(0)
+        return 'result:{}'.format(val)
+
+    inv_context_manager = rc_cache.InvalidationContext(
+        uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
+
+    # 1st call, fresh caches
+    with inv_context_manager as invalidation_context:
+        should_invalidate = invalidation_context.should_invalidate()
+        if should_invalidate:
+            result = _dummy_func.refresh('some-key')
+        else:
+            result = _dummy_func('some-key')
+
+        assert isinstance(invalidation_context, rc_cache.FreshRegionCache)
+        assert should_invalidate is True
 
-    invalidator_context = CacheKey.repo_context_cache(
-        _dummy_func, test_repo_name, 'repo')
+        assert 'result:1' == result
+        # should be cached so calling it twice will give the same result !
+        result = _dummy_func('some-key')
+        assert 'result:1' == result
 
-    with invalidator_context as context:
-        invalidated = context.invalidate()
-        result = context.compute()
+    # 2nd call, we create a new context manager, this should be now key aware, and
+    # return an active cache region
+    with inv_context_manager as invalidation_context:
+        should_invalidate = invalidation_context.should_invalidate()
+        assert isinstance(invalidation_context, rc_cache.ActiveRegionCache)
+        assert should_invalidate is False
+
+    # Mark invalidation
+    CacheKey.set_invalidate(invalidation_namespace)
 
-    assert invalidated == True
-    assert 'result' == result
-    assert isinstance(context, caches.FreshRegionCache)
-
-    assert 'InvalidationContext' in repr(invalidator_context)
+    # 3nd call, fresh caches
+    with inv_context_manager as invalidation_context:
+        should_invalidate = invalidation_context.should_invalidate()
+        if should_invalidate:
+            result = _dummy_func.refresh('some-key')
+        else:
+            result = _dummy_func('some-key')
 
-    with invalidator_context as context:
-        context.invalidate()
-        result = context.compute()
+        assert isinstance(invalidation_context, rc_cache.FreshRegionCache)
+        assert should_invalidate is True
 
-    assert 'result' == result
-    assert isinstance(context, caches.ActiveRegionCache)
+        assert 'result:2' == result
+
+        # cached again, same result
+        result = _dummy_func('some-key')
+        assert 'result:2' == result
 
 
 def test_invalidation_context_exception_in_compute(baseapp):
-    from rhodecode.model.db import CacheKey
-    from beaker.cache import cache_region
+    repo_id = 888
 
-    @cache_region('long_term')
+    cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
+        repo_id, CacheKey.CACHE_TYPE_README)
+    invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+        repo_id=repo_id)
+    region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
+
+    @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
     def _dummy_func(cache_key):
-        # this causes error since it doesn't get any params
-        raise Exception('ups')
-
-    invalidator_context = CacheKey.repo_context_cache(
-        _dummy_func, 'test_repo_2', 'repo')
+        raise Exception('Error in cache func')
 
     with pytest.raises(Exception):
-        with invalidator_context as context:
-            context.invalidate()
-            context.compute()
+        inv_context_manager = rc_cache.InvalidationContext(
+            uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
+
+        # 1st call, fresh caches
+        with inv_context_manager as invalidation_context:
+            should_invalidate = invalidation_context.should_invalidate()
+            if should_invalidate:
+                _dummy_func.refresh('some-key-2')
+            else:
+                _dummy_func('some-key-2')
 
 
 @pytest.mark.parametrize('execution_number', range(5))
 def test_cache_invalidation_race_condition(execution_number, baseapp):
     import time
-    from beaker.cache import cache_region
-    from rhodecode.model.db import CacheKey
+
+    repo_id = 777
 
-    if CacheKey.metadata.bind.url.get_backend_name() == "mysql":
-        reason = (
-            'Fails on MariaDB due to some locking issues. Investigation'
-            ' needed')
-        pytest.xfail(reason=reason)
+    cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
+        repo_id, CacheKey.CACHE_TYPE_README)
+    invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+        repo_id=repo_id)
+    region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
 
     @run_test_concurrently(25)
     def test_create_and_delete_cache_keys():
         time.sleep(0.2)
 
-        @cache_region('long_term')
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
         def _dummy_func(cache_key):
-            return 'result'
+            val = 'async'
+            return 'result:{}'.format(val)
+
+        inv_context_manager = rc_cache.InvalidationContext(
+            uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
 
-        invalidator_context = CacheKey.repo_context_cache(
-            _dummy_func, 'test_repo_1', 'repo')
+        # 1st call, fresh caches
+        with inv_context_manager as invalidation_context:
+            should_invalidate = invalidation_context.should_invalidate()
+            if should_invalidate:
+                _dummy_func.refresh('some-key-3')
+            else:
+                _dummy_func('some-key-3')
 
-        with invalidator_context as context:
-            context.invalidate()
-            context.compute()
-
-        CacheKey.set_invalidate('test_repo_1', delete=True)
+        # Mark invalidation
+        CacheKey.set_invalidate(invalidation_namespace)
 
     test_create_and_delete_cache_keys()
diff --git a/rhodecode/tests/lib/test_utils.py b/rhodecode/tests/lib/test_utils.py
--- a/rhodecode/tests/lib/test_utils.py
+++ b/rhodecode/tests/lib/test_utils.py
@@ -70,8 +70,7 @@ def disable_hooks(request, hooks):
     ui_settings.invalidate()
 
     ui_settings = session.query(db.RhodeCodeUi).options(
-        caching_query.FromCache(
-            'sql_cache_short', 'get_hook_settings', 'get_hook_settings'))
+        caching_query.FromCache('sql_cache_short', 'get_hook_settings'))
     ui_settings.invalidate()
 
     @request.addfinalizer
diff --git a/rhodecode/tests/models/test_permissions.py b/rhodecode/tests/models/test_permissions.py
--- a/rhodecode/tests/models/test_permissions.py
+++ b/rhodecode/tests/models/test_permissions.py
@@ -140,6 +140,10 @@ class TestPermissions(object):
         assert repo_perms(user)[repo.repo_name] == 'repository.admin'
         repo.user = org_owner
 
+    def test_default_owner_branch_perms(self, user_util, test_user_group):
+        user = user_util.create_user()
+        assert branch_perms(user) == {}
+
     def test_default_owner_repo_group_perms(self, user_util, test_repo_group):
         user = user_util.create_user()
         org_owner = test_repo_group.user
@@ -360,13 +364,15 @@ class TestPermissions(object):
         user_model.revoke_perm(self.u1, 'hg.fork.repository')
         user_model.grant_perm(self.u1, 'hg.fork.none')
 
+        # TODO(marcink): check branch permissions now ?
+
         # make sure inherit flag is turned off
         self.u1.inherit_default_permissions = False
         Session().commit()
 
         # this user will have non inherited permissions from he's
         # explicitly set permissions
-        assert global_perms(self.u1) == set([
+        assert global_perms(self.u1) == {
             'hg.create.none',
             'hg.fork.none',
             'hg.register.manual_activate',
@@ -375,7 +381,8 @@ class TestPermissions(object):
             'repository.read',
             'group.read',
             'usergroup.read',
-            ])
+            'branch.push_force',
+        }
 
     def test_non_inherited_permissions_from_default_on_user_disabled(self):
         user_model = UserModel()
@@ -396,9 +403,11 @@ class TestPermissions(object):
         self.u1.inherit_default_permissions = False
         Session().commit()
 
+        # TODO(marcink): check branch perms
+
         # this user will have non inherited permissions from he's
         # explicitly set permissions
-        assert global_perms(self.u1) == set([
+        assert global_perms(self.u1) == {
             'hg.create.repository',
             'hg.fork.repository',
             'hg.register.manual_activate',
@@ -407,7 +416,8 @@ class TestPermissions(object):
             'repository.read',
             'group.read',
             'usergroup.read',
-            ])
+            'branch.push_force',
+        }
 
     @pytest.mark.parametrize('perm, expected_perm', [
         ('hg.inherit_default_perms.false', 'repository.none', ),
@@ -425,8 +435,10 @@ class TestPermissions(object):
         self.u1.inherit_default_permissions = True
         Session().commit()
 
+        # TODO(marcink): check branch perms
+
         # this user will have inherited permissions from default user
-        assert global_perms(self.u1) == set([
+        assert global_perms(self.u1) == {
             'hg.create.none',
             'hg.fork.none',
             'hg.register.manual_activate',
@@ -435,11 +447,12 @@ class TestPermissions(object):
             'repository.read',
             'group.read',
             'usergroup.read',
+            'branch.push_force',
             'hg.create.write_on_repogroup.true',
             'hg.usergroup.create.false',
             'hg.repogroup.create.false',
-            perm,
-            ])
+            perm
+        }
 
         assert set(repo_perms(self.u1).values()) == set([expected_perm])
 
@@ -693,6 +706,11 @@ def repo_perms(user):
     return auth_user.permissions['repositories']
 
 
+def branch_perms(user):
+    auth_user = AuthUser(user_id=user.user_id)
+    return auth_user.permissions['repository_branches']
+
+
 def group_perms(user):
     auth_user = AuthUser(user_id=user.user_id)
     return auth_user.permissions['repositories_groups']
diff --git a/rhodecode/tests/models/test_pullrequest.py b/rhodecode/tests/models/test_pullrequest.py
--- a/rhodecode/tests/models/test_pullrequest.py
+++ b/rhodecode/tests/models/test_pullrequest.py
@@ -81,6 +81,7 @@ class TestPullRequestModel(object):
         self.source_commit = self.pull_request.source_ref_parts.commit_id
         self.target_commit = self.pull_request.target_ref_parts.commit_id
         self.workspace_id = 'pr-%s' % self.pull_request.pull_request_id
+        self.repo_id = self.pull_request.target_repo.repo_id
 
         @request.addfinalizer
         def cleanup_pull_request():
@@ -135,17 +136,19 @@ class TestPullRequestModel(object):
         assert pr_count == 1
 
     def test_delete_calls_cleanup_merge(self, pull_request):
+        repo_id = pull_request.target_repo.repo_id
         PullRequestModel().delete(pull_request, pull_request.author)
 
         self.workspace_remove_mock.assert_called_once_with(
-            self.workspace_id)
+            repo_id, self.workspace_id)
 
     def test_close_calls_cleanup_and_hook(self, pull_request):
         PullRequestModel().close_pull_request(
             pull_request, pull_request.author)
+        repo_id = pull_request.target_repo.repo_id
 
         self.workspace_remove_mock.assert_called_once_with(
-            self.workspace_id)
+            repo_id, self.workspace_id)
         self.hook_mock.assert_called_with(
             self.pull_request, self.pull_request.author, 'close')
 
@@ -161,9 +164,10 @@ class TestPullRequestModel(object):
         assert status is True
         assert msg.eval() == 'This pull request can be automatically merged.'
         self.merge_mock.assert_called_with(
+            self.repo_id, self.workspace_id,
             pull_request.target_ref_parts,
             pull_request.source_repo.scm_instance(),
-            pull_request.source_ref_parts, self.workspace_id, dry_run=True,
+            pull_request.source_ref_parts, dry_run=True,
             use_rebase=False, close_branch=False)
 
         assert pull_request._last_merge_source_rev == self.source_commit
@@ -190,9 +194,10 @@ class TestPullRequestModel(object):
             msg.eval() ==
             'This pull request cannot be merged because of merge conflicts.')
         self.merge_mock.assert_called_with(
+            self.repo_id, self.workspace_id,
             pull_request.target_ref_parts,
             pull_request.source_repo.scm_instance(),
-            pull_request.source_ref_parts, self.workspace_id, dry_run=True,
+            pull_request.source_ref_parts, dry_run=True,
             use_rebase=False, close_branch=False)
 
         assert pull_request._last_merge_source_rev == self.source_commit
@@ -222,9 +227,10 @@ class TestPullRequestModel(object):
             'This pull request cannot be merged because of an unhandled'
             ' exception.')
         self.merge_mock.assert_called_with(
+            self.repo_id, self.workspace_id,
             pull_request.target_ref_parts,
             pull_request.source_repo.scm_instance(),
-            pull_request.source_ref_parts, self.workspace_id, dry_run=True,
+            pull_request.source_ref_parts, dry_run=True,
             use_rebase=False, close_branch=False)
 
         assert pull_request._last_merge_source_rev is None
@@ -281,7 +287,7 @@ class TestPullRequestModel(object):
             True, True, merge_ref, MergeFailureReason.NONE)
 
         merge_extras['repository'] = pull_request.target_repo.repo_name
-        PullRequestModel().merge(
+        PullRequestModel().merge_repo(
             pull_request, pull_request.author, extras=merge_extras)
 
         message = (
@@ -295,9 +301,10 @@ class TestPullRequestModel(object):
             )
         )
         self.merge_mock.assert_called_with(
+            self.repo_id, self.workspace_id,
             pull_request.target_ref_parts,
             pull_request.source_repo.scm_instance(),
-            pull_request.source_ref_parts, self.workspace_id,
+            pull_request.source_ref_parts,
             user_name=user.username, user_email=user.email, message=message,
             use_rebase=False, close_branch=False
         )
@@ -320,7 +327,7 @@ class TestPullRequestModel(object):
             False, False, merge_ref, MergeFailureReason.MERGE_FAILED)
 
         merge_extras['repository'] = pull_request.target_repo.repo_name
-        PullRequestModel().merge(
+        PullRequestModel().merge_repo(
             pull_request, pull_request.author, extras=merge_extras)
 
         message = (
@@ -334,9 +341,10 @@ class TestPullRequestModel(object):
             )
         )
         self.merge_mock.assert_called_with(
+            self.repo_id, self.workspace_id,
             pull_request.target_ref_parts,
             pull_request.source_repo.scm_instance(),
-            pull_request.source_ref_parts, self.workspace_id,
+            pull_request.source_ref_parts,
             user_name=user.username, user_email=user.email, message=message,
             use_rebase=False, close_branch=False
         )
@@ -392,7 +400,7 @@ class TestIntegrationMerge(object):
         Session().commit()
 
         with mock.patch.dict(rhodecode.CONFIG, extra_config, clear=False):
-            merge_state = PullRequestModel().merge(
+            merge_state = PullRequestModel().merge_repo(
                 pull_request, user_admin, extras=merge_extras)
 
         assert merge_state.executed
@@ -409,7 +417,7 @@ class TestIntegrationMerge(object):
 
         with mock.patch('rhodecode.EXTENSIONS.PRE_PUSH_HOOK') as pre_pull:
             pre_pull.side_effect = RepositoryError("Disallow push!")
-            merge_status = PullRequestModel().merge(
+            merge_status = PullRequestModel().merge_repo(
                 pull_request, user_admin, extras=merge_extras)
 
         assert not merge_status.executed
@@ -429,7 +437,7 @@ class TestIntegrationMerge(object):
         merge_extras['repository'] = pull_request.target_repo.repo_name
         # TODO: johbo: Needed for sqlite, try to find an automatic way for it
         Session().commit()
-        merge_status = PullRequestModel().merge(
+        merge_status = PullRequestModel().merge_repo(
             pull_request, user_regular, extras=merge_extras)
         assert not merge_status.executed
 
diff --git a/rhodecode/tests/models/test_user_group_permissions_on_repo_groups.py b/rhodecode/tests/models/test_user_group_permissions_on_repo_groups.py
--- a/rhodecode/tests/models/test_user_group_permissions_on_repo_groups.py
+++ b/rhodecode/tests/models/test_user_group_permissions_on_repo_groups.py
@@ -48,7 +48,7 @@ def permissions_setup_func_orig(
     repo_group = RepoGroup.get_by_group_name(group_name=group_name)
     if not repo_group:
         raise Exception('Cannot get group %s' % group_name)
-    perm_updates = [[test_u2_gr_id, perm, 'users_group']]
+    perm_updates = [[test_u2_gr_id, perm, 'user_group']]
     RepoGroupModel().update_permissions(repo_group,
                                         perm_updates=perm_updates,
                                         recursive=recursive, check_perms=False)
diff --git a/rhodecode/tests/controllers/test_utils.py b/rhodecode/tests/other/test_views_utils.py
rename from rhodecode/tests/controllers/test_utils.py
rename to rhodecode/tests/other/test_views_utils.py
diff --git a/rhodecode/tests/pylons_plugin.py b/rhodecode/tests/pylons_plugin.py
--- a/rhodecode/tests/pylons_plugin.py
+++ b/rhodecode/tests/pylons_plugin.py
@@ -125,11 +125,6 @@ def vcsserver_factory(tmpdir_factory):
         overrides = list(overrides)
         overrides.append({'server:main': {'port': vcsserver_port}})
 
-        if is_cygwin():
-            platform_override = {'DEFAULT': {
-                'beaker.cache.repo_object.type': 'nocache'}}
-            overrides.append(platform_override)
-
         option_name = 'vcsserver_config_http'
         override_option_name = 'vcsserver_config_override'
         config_file = get_config(
@@ -177,6 +172,7 @@ def ini_config(request, tmpdir_factory, 
             'vcs.server.protocol': 'http',
             'vcs.scm_app_implementation': 'http',
             'vcs.hooks.protocol': 'http',
+            'vcs.hooks.host': '127.0.0.1',
         }},
 
         {'handler_console': {
diff --git a/rhodecode/tests/rhodecode.ini b/rhodecode/tests/rhodecode.ini
--- a/rhodecode/tests/rhodecode.ini
+++ b/rhodecode/tests/rhodecode.ini
@@ -292,44 +292,27 @@ cache_dir = %(here)s/data
 beaker.cache.data_dir = %(here)s/rc/data/cache/beaker_data
 beaker.cache.lock_dir = %(here)s/rc/data/cache/beaker_lock
 
-beaker.cache.regions = super_short_term, short_term, long_term, sql_cache_short, auth_plugins, repo_cache_long
-
-beaker.cache.super_short_term.type = memory
-beaker.cache.super_short_term.expire = 1
-beaker.cache.super_short_term.key_length = 256
-
-beaker.cache.short_term.type = memory
-beaker.cache.short_term.expire = 60
-beaker.cache.short_term.key_length = 256
+beaker.cache.regions = long_term
 
 beaker.cache.long_term.type = memory
 beaker.cache.long_term.expire = 36000
 beaker.cache.long_term.key_length = 256
 
-beaker.cache.sql_cache_short.type = memory
-beaker.cache.sql_cache_short.expire = 1
-beaker.cache.sql_cache_short.key_length = 256
+
+#####################################
+###         DOGPILE CACHE        ####
+#####################################
 
-## default is memory cache, configure only if required
-## using multi-node or multi-worker setup
-#beaker.cache.auth_plugins.type = memory
-#beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
-#beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
-#beaker.cache.auth_plugins.url = mysql://root:secret@127.0.0.1/rhodecode
-#beaker.cache.auth_plugins.sa.pool_recycle = 3600
-#beaker.cache.auth_plugins.sa.pool_size = 10
-#beaker.cache.auth_plugins.sa.max_overflow = 0
+## permission tree cache settings
+rc_cache.cache_perms.backend = dogpile.cache.rc.file_namespace
+rc_cache.cache_perms.expiration_time = 0
+rc_cache.cache_perms.arguments.filename = /tmp/rc_cache_1
 
-beaker.cache.repo_cache_long.type = memorylru_base
-beaker.cache.repo_cache_long.max_items = 4096
-beaker.cache.repo_cache_long.expire = 2592000
 
-## default is memorylru_base cache, configure only if required
-## using multi-node or multi-worker setup
-#beaker.cache.repo_cache_long.type = ext:memcached
-#beaker.cache.repo_cache_long.url = localhost:11211
-#beaker.cache.repo_cache_long.expire = 1209600
-#beaker.cache.repo_cache_long.key_length = 256
+## cache settings for SQL queries
+rc_cache.sql_cache_short.backend = dogpile.cache.rc.memory_lru
+rc_cache.sql_cache_short.expiration_time = 0
+
 
 ####################################
 ###       BEAKER SESSION        ####
@@ -525,6 +508,7 @@ vcs.scm_app_implementation = http
 ## Push/Pull operations hooks protocol, available options are:
 ## `http` - use http-rpc backend (default)
 vcs.hooks.protocol = http
+vcs.hooks.host = 127.0.0.1
 
 vcs.server.log_level = debug
 ## Start VCSServer with this instance as a subprocess, usefull for development
diff --git a/rhodecode/tests/utils.py b/rhodecode/tests/utils.py
--- a/rhodecode/tests/utils.py
+++ b/rhodecode/tests/utils.py
@@ -427,3 +427,32 @@ def commit_change(
             f_path=filename
         )
     return commit
+
+
+def permission_update_data_generator(csrf_token, default=None, grant=None, revoke=None):
+    if not default:
+        raise ValueError('Permission for default user must be given')
+    form_data = [(
+        'csrf_token', csrf_token
+    )]
+    # add default
+    form_data.extend([
+        ('u_perm_1', default)
+    ])
+
+    if grant:
+        for cnt, (obj_id, perm, obj_name, obj_type) in enumerate(grant, 1):
+            form_data.extend([
+                ('perm_new_member_perm_new{}'.format(cnt), perm),
+                ('perm_new_member_id_new{}'.format(cnt), obj_id),
+                ('perm_new_member_name_new{}'.format(cnt), obj_name),
+                ('perm_new_member_type_new{}'.format(cnt), obj_type),
+
+            ])
+    if revoke:
+        for obj_id, obj_type in revoke:
+            form_data.extend([
+                ('perm_del_member_id_{}'.format(obj_id), obj_id),
+                ('perm_del_member_type_{}'.format(obj_id), obj_type),
+            ])
+    return form_data
diff --git a/rhodecode/tests/vcs/test_git.py b/rhodecode/tests/vcs/test_git.py
--- a/rhodecode/tests/vcs/test_git.py
+++ b/rhodecode/tests/vcs/test_git.py
@@ -566,7 +566,7 @@ TODO: To be written...
 
     def test_maybe_prepare_merge_workspace(self):
         workspace = self.repo._maybe_prepare_merge_workspace(
-            'pr2', Reference('branch', 'master', 'unused'),
+            2, 'pr2', Reference('branch', 'master', 'unused'),
             Reference('branch', 'master', 'unused'))
 
         assert os.path.isdir(workspace)
@@ -575,13 +575,13 @@ TODO: To be written...
 
         # Calling it a second time should also succeed
         workspace = self.repo._maybe_prepare_merge_workspace(
-            'pr2', Reference('branch', 'master', 'unused'),
+            2, 'pr2', Reference('branch', 'master', 'unused'),
             Reference('branch', 'master', 'unused'))
         assert os.path.isdir(workspace)
 
     def test_maybe_prepare_merge_workspace_different_refs(self):
         workspace = self.repo._maybe_prepare_merge_workspace(
-            'pr2', Reference('branch', 'master', 'unused'),
+            2, 'pr2', Reference('branch', 'master', 'unused'),
             Reference('branch', 'develop', 'unused'))
 
         assert os.path.isdir(workspace)
@@ -590,22 +590,22 @@ TODO: To be written...
 
         # Calling it a second time should also succeed
         workspace = self.repo._maybe_prepare_merge_workspace(
-            'pr2', Reference('branch', 'master', 'unused'),
+            2, 'pr2', Reference('branch', 'master', 'unused'),
             Reference('branch', 'develop', 'unused'))
         assert os.path.isdir(workspace)
 
     def test_cleanup_merge_workspace(self):
         workspace = self.repo._maybe_prepare_merge_workspace(
-            'pr3', Reference('branch', 'master', 'unused'),
+            2, 'pr3', Reference('branch', 'master', 'unused'),
             Reference('branch', 'master', 'unused'))
-        self.repo.cleanup_merge_workspace('pr3')
+        self.repo.cleanup_merge_workspace(2, 'pr3')
 
         assert not os.path.exists(workspace)
 
     def test_cleanup_merge_workspace_invalid_workspace_id(self):
         # No assert: because in case of an inexistent workspace this function
         # should still succeed.
-        self.repo.cleanup_merge_workspace('pr4')
+        self.repo.cleanup_merge_workspace(1, 'pr4')
 
     def test_set_refs(self):
         test_ref = 'refs/test-refs/abcde'
diff --git a/rhodecode/tests/vcs/test_hg.py b/rhodecode/tests/vcs/test_hg.py
--- a/rhodecode/tests/vcs/test_hg.py
+++ b/rhodecode/tests/vcs/test_hg.py
@@ -31,7 +31,7 @@ from rhodecode.lib.vcs.backends.hg impor
 from rhodecode.lib.vcs.exceptions import (
     RepositoryError, VCSError, NodeDoesNotExistError, CommitDoesNotExistError)
 from rhodecode.lib.vcs.nodes import FileNode, NodeKind, NodeState
-from rhodecode.tests import TEST_HG_REPO, TEST_HG_REPO_CLONE
+from rhodecode.tests import TEST_HG_REPO, TEST_HG_REPO_CLONE, repo_id_generator
 
 
 pytestmark = pytest.mark.backends("hg")
@@ -46,7 +46,6 @@ def repo_path_generator():
         i += 1
         yield '%s-%d' % (TEST_HG_REPO_CLONE, i)
 
-
 REPO_PATH_GENERATOR = repo_path_generator()
 
 
@@ -553,7 +552,7 @@ TODO: To be written...
 
     def test_maybe_prepare_merge_workspace(self):
         workspace = self.repo._maybe_prepare_merge_workspace(
-            'pr2', 'unused', 'unused2')
+            1, 'pr2', 'unused', 'unused2')
 
         assert os.path.isdir(workspace)
         workspace_repo = MercurialRepository(workspace)
@@ -561,20 +560,22 @@ TODO: To be written...
 
         # Calling it a second time should also succeed
         workspace = self.repo._maybe_prepare_merge_workspace(
-            'pr2', 'unused', 'unused2')
+            1, 'pr2', 'unused', 'unused2')
         assert os.path.isdir(workspace)
 
     def test_cleanup_merge_workspace(self):
         workspace = self.repo._maybe_prepare_merge_workspace(
-            'pr3', 'unused', 'unused2')
-        self.repo.cleanup_merge_workspace('pr3')
+            1, 'pr3', 'unused', 'unused2')
+
+        assert os.path.isdir(workspace)
+        self.repo.cleanup_merge_workspace(1, 'pr3')
 
         assert not os.path.exists(workspace)
 
     def test_cleanup_merge_workspace_invalid_workspace_id(self):
         # No assert: because in case of an inexistent workspace this function
         # should still succeed.
-        self.repo.cleanup_merge_workspace('pr4')
+        self.repo.cleanup_merge_workspace(1, 'pr4')
 
     def test_merge_target_is_bookmark(self, vcsbackend_hg):
         target_repo = vcsbackend_hg.create_repo(number_of_commits=1)
@@ -594,10 +595,10 @@ TODO: To be written...
         target_repo.bookmark(bookmark_name)
         target_ref = Reference('book', bookmark_name, target_commit.raw_id)
         source_ref = Reference('branch', default_branch, source_commit.raw_id)
-        workspace = 'test-merge'
-
+        workspace_id = 'test-merge'
+        repo_id = repo_id_generator(target_repo.path)
         merge_response = target_repo.merge(
-            target_ref, source_repo, source_ref, workspace,
+            repo_id, workspace_id, target_ref, source_repo, source_ref,
             'test user', 'test@rhodecode.com', 'merge message 1',
             dry_run=False)
         expected_merge_response = MergeResponse(
@@ -638,10 +639,10 @@ TODO: To be written...
         source_repo._update(default_branch)
         source_repo.bookmark(bookmark_name)
         source_ref = Reference('book', bookmark_name, source_commit.raw_id)
-        workspace = 'test-merge'
-
+        workspace_id = 'test-merge'
+        repo_id = repo_id_generator(target_repo.path)
         merge_response = target_repo.merge(
-            target_ref, source_repo, source_ref, workspace,
+            repo_id, workspace_id, target_ref, source_repo, source_ref,
             'test user', 'test@rhodecode.com', 'merge message 1',
             dry_run=False)
         expected_merge_response = MergeResponse(
@@ -677,14 +678,15 @@ TODO: To be written...
 
         target_ref = Reference('branch', default_branch, target_commit.raw_id)
         source_ref = Reference('branch', default_branch, source_commit.raw_id)
-        workspace = 'test-merge'
+        workspace_id = 'test-merge'
 
         assert len(target_repo._heads(branch='default')) == 2
         expected_merge_response = MergeResponse(
             False, False, None,
             MergeFailureReason.HG_TARGET_HAS_MULTIPLE_HEADS)
+        repo_id = repo_id_generator(target_repo.path)
         merge_response = target_repo.merge(
-            target_ref, source_repo, source_ref, workspace,
+            repo_id, workspace_id, target_ref, source_repo, source_ref,
             'test user', 'test@rhodecode.com', 'merge message 1',
             dry_run=False)
         assert merge_response == expected_merge_response
@@ -711,10 +713,11 @@ TODO: To be written...
 
         target_ref = Reference('branch', default_branch, target_commit.raw_id)
         source_ref = Reference('book', bookmark_name, source_commit.raw_id)
-        workspace = 'test-merge'
+        repo_id = repo_id_generator(target_repo.path)
+        workspace_id = 'test-merge'
 
         merge_response = target_repo.merge(
-            target_ref, source_repo, source_ref, workspace,
+            repo_id, workspace_id, target_ref, source_repo, source_ref,
             'test user', 'test@rhodecode.com', 'merge message 1',
             dry_run=False, use_rebase=True)
 
diff --git a/rhodecode/tests/vcs/test_hg_vcsserver_cache_invalidation.py b/rhodecode/tests/vcs/test_hg_vcsserver_cache_invalidation.py
--- a/rhodecode/tests/vcs/test_hg_vcsserver_cache_invalidation.py
+++ b/rhodecode/tests/vcs/test_hg_vcsserver_cache_invalidation.py
@@ -95,7 +95,7 @@ class TestMercurialRemoteRepoInvalidatio
         references.
         """
         from rhodecode.model.pull_request import PullRequestModel
-
+        repo_id = pull_request.target_repo.repo_id
         target_vcs = pull_request.target_repo.scm_instance()
         target_ref = pull_request.target_ref_parts
         source_ref = pull_request.source_ref_parts
@@ -104,7 +104,7 @@ class TestMercurialRemoteRepoInvalidatio
         pr = PullRequestModel()
         workspace_id = pr._workspace_id(pull_request)
         shadow_repository_path = target_vcs._maybe_prepare_merge_workspace(
-            workspace_id, target_ref, source_ref)
+            repo_id, workspace_id, target_ref, source_ref)
         shadow_repo = target_vcs._get_shadow_instance(shadow_repository_path)
 
         # This will populate the cache of the mercurial repository object
diff --git a/rhodecode/tests/vcs/test_repository.py b/rhodecode/tests/vcs/test_repository.py
--- a/rhodecode/tests/vcs/test_repository.py
+++ b/rhodecode/tests/vcs/test_repository.py
@@ -30,6 +30,7 @@ from rhodecode.lib.vcs.backends.base imp
 from rhodecode.lib.vcs.exceptions import VCSError, RepositoryError
 from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.tests.vcs.conftest import BackendTestMixin
+from rhodecode.tests import repo_id_generator
 
 
 @pytest.mark.usefixtures("vcs_repository_support")
@@ -268,7 +269,7 @@ class TestRepositoryGetCommonAncestor:
 
 
 @pytest.mark.backends("git", "hg")
-class TestRepositoryMerge:
+class TestRepositoryMerge(object):
     def prepare_for_success(self, vcsbackend):
         self.target_repo = vcsbackend.create_repo(number_of_commits=1)
         self.source_repo = vcsbackend.clone_repo(self.target_repo)
@@ -287,7 +288,8 @@ class TestRepositoryMerge:
             'branch', default_branch, self.target_commit.raw_id)
         self.source_ref = Reference(
             'branch', default_branch, self.source_commit.raw_id)
-        self.workspace = 'test-merge'
+        self.workspace_id = 'test-merge'
+        self.repo_id = repo_id_generator(self.target_repo.path)
 
     def prepare_for_conflict(self, vcsbackend):
         self.target_repo = vcsbackend.create_repo(number_of_commits=1)
@@ -302,13 +304,15 @@ class TestRepositoryMerge:
             'branch', default_branch, self.target_commit.raw_id)
         self.source_ref = Reference(
             'branch', default_branch, self.source_commit.raw_id)
-        self.workspace = 'test-merge'
+        self.workspace_id = 'test-merge'
+        self.repo_id = repo_id_generator(self.target_repo.path)
 
     def test_merge_success(self, vcsbackend):
         self.prepare_for_success(vcsbackend)
 
         merge_response = self.target_repo.merge(
-            self.target_ref, self.source_repo, self.source_ref, self.workspace,
+            self.repo_id, self.workspace_id, self.target_ref, self.source_repo,
+            self.source_ref,
             'test user', 'test@rhodecode.com', 'merge message 1',
             dry_run=False)
         expected_merge_response = MergeResponse(
@@ -334,7 +338,7 @@ class TestRepositoryMerge:
             merge_response.merge_ref.commit_id)
 
         merge_response = target_repo.merge(
-            target_ref, self.source_repo, self.source_ref, self.workspace,
+            self.repo_id, self.workspace_id, target_ref, self.source_repo, self.source_ref,
             'test user', 'test@rhodecode.com', 'merge message 2',
             dry_run=False)
         expected_merge_response = MergeResponse(
@@ -353,13 +357,13 @@ class TestRepositoryMerge:
         self.prepare_for_success(vcsbackend)
 
         merge_response = self.target_repo.merge(
-            self.target_ref, self.source_repo, self.source_ref, self.workspace,
-            dry_run=True)
+            self.repo_id, self.workspace_id, self.target_ref, self.source_repo,
+            self.source_ref, dry_run=True)
 
         # We call it twice so to make sure we can handle updates
         merge_response_update = self.target_repo.merge(
-            self.target_ref, self.source_repo, self.source_ref, self.workspace,
-            dry_run=True)
+            self.repo_id, self.workspace_id, self.target_ref, self.source_repo,
+            self.source_ref, dry_run=True)
 
         # Multiple merges may differ in their commit id. Therefore we set the
         # commit id to `None` before comparing the merge responses.
@@ -381,13 +385,15 @@ class TestRepositoryMerge:
             False, False, None, MergeFailureReason.MERGE_FAILED)
 
         merge_response = self.target_repo.merge(
-            self.target_ref, self.source_repo, self.source_ref, self.workspace,
+            self.repo_id,  self.workspace_id, self.target_ref,
+            self.source_repo, self.source_ref,
             'test_user', 'test@rhodecode.com', 'test message', dry_run=dry_run)
         assert merge_response == expected_merge_response
 
         # We call it twice so to make sure we can handle updates
         merge_response = self.target_repo.merge(
-            self.target_ref, self.source_repo, self.source_ref, self.workspace,
+            self.repo_id, self.workspace_id, self.target_ref, self.source_repo,
+            self.source_ref,
             'test_user', 'test@rhodecode.com', 'test message', dry_run=dry_run)
         assert merge_response == expected_merge_response
 
@@ -400,8 +406,8 @@ class TestRepositoryMerge:
             self.target_ref.type, self.target_ref.name, '0' * 40)
 
         merge_response = self.target_repo.merge(
-            target_ref, self.source_repo, self.source_ref, self.workspace,
-            dry_run=True)
+            self.repo_id, self.workspace_id, target_ref, self.source_repo,
+            self.source_ref, dry_run=True)
 
         assert merge_response == expected_merge_response
 
@@ -414,7 +420,8 @@ class TestRepositoryMerge:
             self.source_ref.type, 'not_existing', self.source_ref.commit_id)
 
         merge_response = self.target_repo.merge(
-            self.target_ref, self.source_repo, source_ref, self.workspace,
+            self.repo_id, self.workspace_id, self.target_ref,
+            self.source_repo, source_ref,
             dry_run=True)
 
         assert merge_response == expected_merge_response
@@ -427,29 +434,38 @@ class TestRepositoryMerge:
         with mock.patch.object(self.target_repo, '_merge_repo',
                                side_effect=RepositoryError()):
             merge_response = self.target_repo.merge(
-                self.target_ref, self.source_repo, self.source_ref,
-                self.workspace, dry_run=True)
+                self.repo_id, self.workspace_id, self.target_ref,
+                self.source_repo, self.source_ref,
+                dry_run=True)
 
         assert merge_response == expected_merge_response
 
     def test_merge_invalid_user_name(self, vcsbackend):
         repo = vcsbackend.create_repo(number_of_commits=1)
         ref = Reference('branch', 'master', 'not_used')
+        workspace_id = 'test-errors-in-merge'
+        repo_id = repo_id_generator(workspace_id)
         with pytest.raises(ValueError):
-            repo.merge(ref, self, ref, 'workspace_id')
+            repo.merge(repo_id,  workspace_id, ref, self, ref)
 
     def test_merge_invalid_user_email(self, vcsbackend):
         repo = vcsbackend.create_repo(number_of_commits=1)
         ref = Reference('branch', 'master', 'not_used')
+        workspace_id = 'test-errors-in-merge'
+        repo_id = repo_id_generator(workspace_id)
         with pytest.raises(ValueError):
-            repo.merge(ref, self, ref, 'workspace_id', 'user name')
+            repo.merge(
+                repo_id,  workspace_id, ref, self, ref, 'user name')
 
     def test_merge_invalid_message(self, vcsbackend):
         repo = vcsbackend.create_repo(number_of_commits=1)
         ref = Reference('branch', 'master', 'not_used')
+        workspace_id = 'test-errors-in-merge'
+        repo_id = repo_id_generator(workspace_id)
         with pytest.raises(ValueError):
             repo.merge(
-                ref, self, ref, 'workspace_id', 'user name', 'user@email.com')
+                repo_id, workspace_id, ref, self, ref,
+                'user name', 'user@email.com')
 
 
 @pytest.mark.usefixtures("vcs_repository_support")
@@ -505,7 +521,7 @@ class TestRepositoryStrip(BackendTestMix
 
 
 @pytest.mark.backends('hg', 'git')
-class TestRepositoryPull:
+class TestRepositoryPull(object):
 
     def test_pull(self, vcsbackend):
         source_repo = vcsbackend.repo
diff --git a/rhodecode/tests/vcs/test_tags.py b/rhodecode/tests/vcs/test_tags.py
--- a/rhodecode/tests/vcs/test_tags.py
+++ b/rhodecode/tests/vcs/test_tags.py
@@ -66,5 +66,5 @@ class TestTags(BackendTestMixin):
     def test_name_with_slash(self):
         self.repo.tag('19/10/11', 'joe')
         assert '19/10/11' in self.repo.tags
-        self.repo.tag('11', 'joe')
-        assert '11' in self.repo.tags
+        self.repo.tag('rel.11', 'joe')
+        assert 'rel.11' in self.repo.tags
diff --git a/rhodecode/tests/vcs_operations/__init__.py b/rhodecode/tests/vcs_operations/__init__.py
--- a/rhodecode/tests/vcs_operations/__init__.py
+++ b/rhodecode/tests/vcs_operations/__init__.py
@@ -77,22 +77,18 @@ class Command(object):
         assert self.process.returncode == 0
 
 
-def _add_files_and_push(vcs, dest, clone_url=None, tags=None, **kwargs):
-    """
-    Generate some files, add it to DEST repo and push back
-    vcs is git or hg and defines what VCS we want to make those files for
-    """
-    # commit some stuff into this repo
+def _add_files(vcs, dest, clone_url=None, tags=None, target_branch=None,
+                        new_branch=False, **kwargs):
+    git_ident = "git config user.name {} && git config user.email {}".format(
+            'Marcin Kuźminski', 'me@email.com')
+    cwd = path = jn(dest)
+
     tags = tags or []
-    cwd = path = jn(dest)
     added_file = jn(path, '%ssetup.py' % tempfile._RandomNameSequence().next())
     Command(cwd).execute('touch %s' % added_file)
     Command(cwd).execute('%s add %s' % (vcs, added_file))
     author_str = 'Marcin Kuźminski <me@email.com>'
 
-    git_ident = "git config user.name {} && git config user.email {}".format(
-            'Marcin Kuźminski', 'me@email.com')
-
     for i in range(kwargs.get('files_no', 3)):
         cmd = """echo 'added_line%s' >> %s""" % (i, added_file)
         Command(cwd).execute(cmd)
@@ -107,30 +103,55 @@ def _add_files_and_push(vcs, dest, clone
 
     for tag in tags:
         if vcs == 'hg':
-            stdout, stderr = Command(cwd).execute(
+            Command(cwd).execute(
                 'hg tag', tag['name'])
         elif vcs == 'git':
             if tag['commit']:
                 # annotated tag
-                stdout, stderr = Command(cwd).execute(
+                _stdout, _stderr = Command(cwd).execute(
                     """%s && git tag -a %s -m "%s" """ % (
                         git_ident, tag['name'], tag['commit']))
             else:
                 # lightweight tag
-                stdout, stderr = Command(cwd).execute(
+                _stdout, _stderr = Command(cwd).execute(
                     """%s && git tag %s""" % (
                         git_ident, tag['name']))
 
+
+def _add_files_and_push(vcs, dest, clone_url=None, tags=None, target_branch=None,
+                        new_branch=False, **kwargs):
+    """
+    Generate some files, add it to DEST repo and push back
+    vcs is git or hg and defines what VCS we want to make those files for
+    """
+    git_ident = "git config user.name {} && git config user.email {}".format(
+            'Marcin Kuźminski', 'me@email.com')
+    cwd = path = jn(dest)
+
+    # commit some stuff into this repo
+    _add_files(vcs, dest, clone_url, tags, target_branch, new_branch, **kwargs)
+
+    default_target_branch = {
+        'git': 'master',
+        'hg': 'default'
+    }.get(vcs)
+
+    target_branch = target_branch or default_target_branch
+
     # PUSH it back
     stdout = stderr = None
     if vcs == 'hg':
+        maybe_new_branch = ''
+        if new_branch:
+            maybe_new_branch = '--new-branch'
         stdout, stderr = Command(cwd).execute(
-            'hg push --verbose', clone_url)
+            'hg push --verbose {} -r {} {}'.format(maybe_new_branch, target_branch, clone_url)
+        )
     elif vcs == 'git':
         stdout, stderr = Command(cwd).execute(
-            """%s && 
-            git push --verbose --tags %s master""" % (
-                git_ident, clone_url))
+            """{} && 
+            git push --verbose --tags {} {}""".format(git_ident, clone_url, target_branch)
+        )
 
     return stdout, stderr
 
diff --git a/rhodecode/tests/vcs_operations/conftest.py b/rhodecode/tests/vcs_operations/conftest.py
--- a/rhodecode/tests/vcs_operations/conftest.py
+++ b/rhodecode/tests/vcs_operations/conftest.py
@@ -33,7 +33,8 @@ import textwrap
 import pytest
 
 from rhodecode import events
-from rhodecode.model.db import Integration
+from rhodecode.model.db import Integration, UserRepoToPerm, Permission, \
+    UserToRepoBranchPermission, User
 from rhodecode.model.integration import IntegrationModel
 from rhodecode.model.db import Repository
 from rhodecode.model.meta import Session
@@ -238,13 +239,13 @@ def enable_webhook_push_integration(requ
     Session().add(integration)
 
     settings = dict(
-        url='http://httpbin.org',
+        url='http://httpbin.org/post',
         secret_token='secret',
         username=None,
         password=None,
         custom_header_key=None,
         custom_header_val=None,
-        method_type='get',
+        method_type='post',
         events=[events.RepoPushEvent.name],
         log_data=True
     )
@@ -267,3 +268,74 @@ def enable_webhook_push_integration(requ
         Session().delete(integration)
         Session().commit()
 
+
+@pytest.fixture
+def branch_permission_setter(request):
+    """
+
+    def my_test(branch_permission_setter)
+        branch_permission_setter(repo_name, username, pattern='*', permission='branch.push')
+
+    """
+
+    rule_id = None
+    write_perm_id = None
+
+    def _branch_permissions_setter(
+            repo_name, username, pattern='*', permission='branch.push_force'):
+        global rule_id, write_perm_id
+
+        repo = Repository.get_by_repo_name(repo_name)
+        repo_id = repo.repo_id
+
+        user = User.get_by_username(username)
+        user_id = user.user_id
+
+        rule_perm_obj = Permission.get_by_key(permission)
+
+        write_perm = None
+
+        # add new entry, based on existing perm entry
+        perm = UserRepoToPerm.query() \
+            .filter(UserRepoToPerm.repository_id == repo_id) \
+            .filter(UserRepoToPerm.user_id == user_id) \
+            .first()
+
+        if not perm:
+            # such user isn't defined in Permissions for repository
+            # we now on-the-fly add new permission
+
+            write_perm = UserRepoToPerm()
+            write_perm.permission = Permission.get_by_key('repository.write')
+            write_perm.repository_id = repo_id
+            write_perm.user_id = user_id
+            Session().add(write_perm)
+            Session().flush()
+
+            perm = write_perm
+
+        rule = UserToRepoBranchPermission()
+        rule.rule_to_perm_id = perm.repo_to_perm_id
+        rule.branch_pattern = pattern
+        rule.rule_order = 10
+        rule.permission = rule_perm_obj
+        rule.repository_id = repo_id
+        Session().add(rule)
+        Session().commit()
+
+        global rule, write_perm
+
+        return rule
+
+    @request.addfinalizer
+    def cleanup():
+        if rule:
+            Session().delete(rule)
+            Session().commit()
+        if write_perm:
+            Session().delete(write_perm)
+            Session().commit()
+
+    return _branch_permissions_setter
+
+
diff --git a/rhodecode/tests/vcs_operations/test_vcs_operations.py b/rhodecode/tests/vcs_operations/test_vcs_operations.py
--- a/rhodecode/tests/vcs_operations/test_vcs_operations.py
+++ b/rhodecode/tests/vcs_operations/test_vcs_operations.py
@@ -32,6 +32,7 @@ import time
 
 import pytest
 
+from rhodecode.lib import rc_cache
 from rhodecode.model.auth_token import AuthTokenModel
 from rhodecode.model.db import Repository, UserIpMap, CacheKey
 from rhodecode.model.meta import Session
@@ -217,46 +218,44 @@ class TestVCSOperations(object):
 
         _check_proper_git_push(stdout, stderr)
 
-    def test_push_invalidates_cache_hg(self, rc_web_server, tmpdir):
-        key = CacheKey.query().filter(CacheKey.cache_key == HG_REPO).scalar()
-        if not key:
-            key = CacheKey(HG_REPO, HG_REPO)
+    def test_push_invalidates_cache(self, rc_web_server, tmpdir):
+        hg_repo = Repository.get_by_repo_name(HG_REPO)
+
+        # init cache objects
+        CacheKey.delete_all_cache()
+        cache_namespace_uid = 'cache_push_test.{}'.format(hg_repo.repo_id)
+        invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+            repo_id=hg_repo.repo_id)
 
-        key.cache_active = True
-        Session().add(key)
-        Session().commit()
+        inv_context_manager = rc_cache.InvalidationContext(
+            uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
 
-        clone_url = rc_web_server.repo_clone_url(HG_REPO)
+        with inv_context_manager as invalidation_context:
+            # __enter__ will create and register cache objects
+            pass
+
+        # clone to init cache
+        clone_url = rc_web_server.repo_clone_url(hg_repo.repo_name)
         stdout, stderr = Command('/tmp').execute(
             'hg clone', clone_url, tmpdir.strpath)
 
+        cache_keys = hg_repo.cache_keys
+        assert cache_keys != []
+        for key in cache_keys:
+            assert key.cache_active is True
+
+        # PUSH that should trigger invalidation cache
         stdout, stderr = _add_files_and_push(
             'hg', tmpdir.strpath, clone_url=clone_url, files_no=1)
 
-        key = CacheKey.query().filter(CacheKey.cache_key == HG_REPO).one()
-        assert key.cache_active is False
-
-    def test_push_invalidates_cache_git(self, rc_web_server, tmpdir):
-        key = CacheKey.query().filter(CacheKey.cache_key == GIT_REPO).scalar()
-        if not key:
-            key = CacheKey(GIT_REPO, GIT_REPO)
-
-        key.cache_active = True
-        Session().add(key)
+        # flush...
         Session().commit()
-
-        clone_url = rc_web_server.repo_clone_url(GIT_REPO)
-        stdout, stderr = Command('/tmp').execute(
-            'git clone', clone_url, tmpdir.strpath)
-
-        # commit some stuff into this repo
-        stdout, stderr = _add_files_and_push(
-            'git', tmpdir.strpath, clone_url=clone_url, files_no=1)
-        _check_proper_git_push(stdout, stderr)
-
-        key = CacheKey.query().filter(CacheKey.cache_key == GIT_REPO).one()
-
-        assert key.cache_active is False
+        hg_repo = Repository.get_by_repo_name(HG_REPO)
+        cache_keys = hg_repo.cache_keys
+        assert cache_keys != []
+        for key in cache_keys:
+            # keys should be marked as not active
+            assert key.cache_active is False
 
     def test_push_wrong_credentials_hg(self, rc_web_server, tmpdir):
         clone_url = rc_web_server.repo_clone_url(HG_REPO)
diff --git a/rhodecode/tests/vcs_operations/test_vcs_operations_branch_protection.py b/rhodecode/tests/vcs_operations/test_vcs_operations_branch_protection.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/tests/vcs_operations/test_vcs_operations_branch_protection.py
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import os
+import pytest
+
+from rhodecode.tests import (
+    TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS,
+    TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
+from rhodecode.tests.vcs_operations import (
+    Command, _check_proper_hg_push, _check_proper_git_push, _add_files_and_push)
+
+
+@pytest.mark.usefixtures("disable_anonymous_user")
+class TestVCSOperations(object):
+
+    @pytest.mark.parametrize('username, password', [
+        (TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS),
+        (TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS),
+    ])
+    @pytest.mark.parametrize('branch_perm', [
+        'branch.none',
+        'branch.merge',
+        'branch.push',
+        'branch.push_force',
+    ])
+    def test_push_to_protected_branch_fails_with_message_hg(
+            self, rc_web_server, tmpdir, branch_perm, user_util,
+            branch_permission_setter, username, password):
+        repo = user_util.create_repo(repo_type='hg')
+        repo_name = repo.repo_name
+        branch_permission_setter(repo_name, username, permission=branch_perm)
+
+        clone_url = rc_web_server.repo_clone_url(
+            repo.repo_name, user=username, passwd=password)
+        Command(os.path.dirname(tmpdir.strpath)).execute(
+            'hg clone', clone_url, tmpdir.strpath)
+
+        stdout, stderr = _add_files_and_push(
+            'hg', tmpdir.strpath, clone_url=clone_url)
+        if branch_perm in ['branch.push', 'branch.push_force']:
+            _check_proper_hg_push(stdout, stderr)
+        else:
+            msg = "Branch `default` changes rejected by rule `*`=>{}".format(branch_perm)
+            assert msg in stdout
+            assert "transaction abort" in stdout
+
+    @pytest.mark.parametrize('username, password', [
+        (TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS),
+        (TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS),
+    ])
+    @pytest.mark.parametrize('branch_perm', [
+        'branch.none',
+        'branch.merge',
+        'branch.push',
+        'branch.push_force',
+    ])
+    def test_push_to_protected_branch_fails_with_message_git(
+            self, rc_web_server, tmpdir, branch_perm, user_util,
+            branch_permission_setter, username, password):
+        repo = user_util.create_repo(repo_type='git')
+        repo_name = repo.repo_name
+        branch_permission_setter(repo_name, username, permission=branch_perm)
+
+        clone_url = rc_web_server.repo_clone_url(
+            repo.repo_name, user=username, passwd=password)
+        Command(os.path.dirname(tmpdir.strpath)).execute(
+            'git clone', clone_url, tmpdir.strpath)
+
+        stdout, stderr = _add_files_and_push(
+            'git', tmpdir.strpath, clone_url=clone_url)
+        if branch_perm in ['branch.push', 'branch.push_force']:
+            _check_proper_git_push(stdout, stderr)
+        else:
+            msg = "Branch `master` changes rejected by rule `*`=>{}".format(branch_perm)
+            assert msg in stderr
+            assert "(pre-receive hook declined)" in stderr
diff --git a/rhodecode/tests/vcs_operations/test_vcs_operations_force_push.py b/rhodecode/tests/vcs_operations/test_vcs_operations_force_push.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/tests/vcs_operations/test_vcs_operations_force_push.py
@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+import os
+import pytest
+
+from rhodecode.tests import TEST_USER_ADMIN_LOGIN
+from rhodecode.tests.vcs_operations import (
+    Command, _check_proper_hg_push, _check_proper_git_push,
+    _add_files, _add_files_and_push)
+
+
+@pytest.mark.usefixtures("disable_anonymous_user")
+class TestVCSOperations(object):
+
+    def test_push_force_hg(self, rc_web_server, tmpdir, user_util):
+        repo = user_util.create_repo(repo_type='hg')
+        clone_url = rc_web_server.repo_clone_url(repo.repo_name)
+        Command(os.path.dirname(tmpdir.strpath)).execute(
+            'hg clone', clone_url, tmpdir.strpath)
+
+        stdout, stderr = _add_files_and_push(
+            'hg', tmpdir.strpath, clone_url=clone_url)
+        _check_proper_hg_push(stdout, stderr)
+
+        # rewrite history, and push with force
+        Command(tmpdir.strpath).execute(
+            'hg checkout -r 1 && hg commit -m "starting new head"')
+        _add_files('hg', tmpdir.strpath, clone_url=clone_url)
+
+        stdout, stderr = Command(tmpdir.strpath).execute(
+            'hg push --verbose -f {}'.format(clone_url))
+
+        _check_proper_hg_push(stdout, stderr)
+
+    def test_push_force_git(self, rc_web_server, tmpdir, user_util):
+        repo = user_util.create_repo(repo_type='git')
+        clone_url = rc_web_server.repo_clone_url(repo.repo_name)
+        Command(os.path.dirname(tmpdir.strpath)).execute(
+            'git clone', clone_url, tmpdir.strpath)
+
+        stdout, stderr = _add_files_and_push(
+            'git', tmpdir.strpath, clone_url=clone_url)
+        _check_proper_git_push(stdout, stderr)
+
+        # rewrite history, and push with force
+        Command(tmpdir.strpath).execute(
+            'git reset --hard HEAD~2')
+        stdout, stderr = Command(tmpdir.strpath).execute(
+            'git push -f {} master'.format(clone_url))
+
+        assert '(forced update)' in stderr
+
+    def test_push_force_hg_blocked_by_branch_permissions(
+            self, rc_web_server, tmpdir, user_util, branch_permission_setter):
+        repo = user_util.create_repo(repo_type='hg')
+        repo_name = repo.repo_name
+        username = TEST_USER_ADMIN_LOGIN
+        branch_permission_setter(repo_name, username, permission='branch.push')
+
+        clone_url = rc_web_server.repo_clone_url(repo.repo_name)
+        Command(os.path.dirname(tmpdir.strpath)).execute(
+            'hg clone', clone_url, tmpdir.strpath)
+
+        stdout, stderr = _add_files_and_push(
+            'hg', tmpdir.strpath, clone_url=clone_url)
+        _check_proper_hg_push(stdout, stderr)
+
+        # rewrite history, and push with force
+        Command(tmpdir.strpath).execute(
+            'hg checkout -r 1 && hg commit -m "starting new head"')
+        _add_files('hg', tmpdir.strpath, clone_url=clone_url)
+
+        stdout, stderr = Command(tmpdir.strpath).execute(
+            'hg push --verbose -f {}'.format(clone_url))
+
+        assert "Branch `default` changes rejected by rule `*`=>branch.push" in stdout
+        assert "FORCE PUSH FORBIDDEN" in stdout
+        assert "transaction abort" in stdout
+
+    def test_push_force_git_blocked_by_branch_permissions(
+            self, rc_web_server, tmpdir, user_util, branch_permission_setter):
+        repo = user_util.create_repo(repo_type='git')
+        repo_name = repo.repo_name
+        username = TEST_USER_ADMIN_LOGIN
+        branch_permission_setter(repo_name, username, permission='branch.push')
+
+        clone_url = rc_web_server.repo_clone_url(repo.repo_name)
+        Command(os.path.dirname(tmpdir.strpath)).execute(
+            'git clone', clone_url, tmpdir.strpath)
+
+        stdout, stderr = _add_files_and_push(
+            'git', tmpdir.strpath, clone_url=clone_url)
+        _check_proper_git_push(stdout, stderr)
+
+        # rewrite history, and push with force
+        Command(tmpdir.strpath).execute(
+            'git reset --hard HEAD~2')
+        stdout, stderr = Command(tmpdir.strpath).execute(
+            'git push -f {} master'.format(clone_url))
+
+        assert "Branch `master` changes rejected by rule `*`=>branch.push" in stderr
+        assert "FORCE PUSH FORBIDDEN" in stderr
+        assert "(pre-receive hook declined)" in stderr
diff --git a/rhodecode/tests/vcs_operations/test_vcs_operations_new_branch_push.py b/rhodecode/tests/vcs_operations/test_vcs_operations_new_branch_push.py
new file mode 100644
--- /dev/null
+++ b/rhodecode/tests/vcs_operations/test_vcs_operations_new_branch_push.py
@@ -0,0 +1,115 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2018 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+import os
+import pytest
+
+from rhodecode.tests import TEST_USER_ADMIN_LOGIN
+from rhodecode.tests.vcs_operations import (
+    Command, _check_proper_hg_push, _check_proper_git_push, _add_files_and_push)
+
+
+@pytest.mark.usefixtures("disable_anonymous_user")
+class TestVCSOperations(object):
+
+    def test_push_new_branch_hg(self, rc_web_server, tmpdir, user_util):
+        repo = user_util.create_repo(repo_type='hg')
+        clone_url = rc_web_server.repo_clone_url(repo.repo_name)
+        Command(os.path.dirname(tmpdir.strpath)).execute(
+            'hg clone', clone_url, tmpdir.strpath)
+
+        stdout, stderr = _add_files_and_push(
+            'hg', tmpdir.strpath, clone_url=clone_url)
+        _check_proper_hg_push(stdout, stderr)
+
+        # start new branch, and push file into it
+        Command(tmpdir.strpath).execute(
+            'hg branch dev && hg commit -m "starting dev branch"')
+        stdout, stderr = _add_files_and_push(
+            'hg', tmpdir.strpath, clone_url=clone_url, target_branch='dev',
+            new_branch=True)
+
+        _check_proper_hg_push(stdout, stderr)
+
+    def test_push_new_branch_git(self, rc_web_server, tmpdir, user_util):
+        repo = user_util.create_repo(repo_type='git')
+        clone_url = rc_web_server.repo_clone_url(repo.repo_name)
+        Command(os.path.dirname(tmpdir.strpath)).execute(
+            'git clone', clone_url, tmpdir.strpath)
+
+        stdout, stderr = _add_files_and_push(
+            'git', tmpdir.strpath, clone_url=clone_url)
+        _check_proper_git_push(stdout, stderr)
+
+        # start new branch, and push file into it
+        Command(tmpdir.strpath).execute('git checkout -b dev')
+        stdout, stderr = _add_files_and_push(
+            'git', tmpdir.strpath, clone_url=clone_url, target_branch='dev',
+            new_branch=True)
+
+        _check_proper_git_push(stdout, stderr, branch='dev')
+
+    def test_push_new_branch_hg_with_branch_permissions_no_force_push(
+            self, rc_web_server, tmpdir, user_util, branch_permission_setter):
+        repo = user_util.create_repo(repo_type='hg')
+        repo_name = repo.repo_name
+        username = TEST_USER_ADMIN_LOGIN
+        branch_permission_setter(repo_name, username, permission='branch.push')
+
+        clone_url = rc_web_server.repo_clone_url(repo.repo_name)
+        Command(os.path.dirname(tmpdir.strpath)).execute(
+            'hg clone', clone_url, tmpdir.strpath)
+
+        stdout, stderr = _add_files_and_push(
+            'hg', tmpdir.strpath, clone_url=clone_url)
+        _check_proper_hg_push(stdout, stderr)
+
+        # start new branch, and push file into it
+        Command(tmpdir.strpath).execute(
+            'hg branch dev && hg commit -m "starting dev branch"')
+        stdout, stderr = _add_files_and_push(
+            'hg', tmpdir.strpath, clone_url=clone_url, target_branch='dev',
+            new_branch=True)
+
+        _check_proper_hg_push(stdout, stderr)
+
+    def test_push_new_branch_git_with_branch_permissions_no_force_push(
+            self, rc_web_server, tmpdir, user_util, branch_permission_setter):
+        repo = user_util.create_repo(repo_type='git')
+        repo_name = repo.repo_name
+        username = TEST_USER_ADMIN_LOGIN
+        branch_permission_setter(repo_name, username, permission='branch.push')
+
+        clone_url = rc_web_server.repo_clone_url(repo.repo_name)
+        Command(os.path.dirname(tmpdir.strpath)).execute(
+            'git clone', clone_url, tmpdir.strpath)
+
+        stdout, stderr = _add_files_and_push(
+            'git', tmpdir.strpath, clone_url=clone_url)
+        _check_proper_git_push(stdout, stderr)
+
+        # start new branch, and push file into it
+        Command(tmpdir.strpath).execute('git checkout -b dev')
+        stdout, stderr = _add_files_and_push(
+            'git', tmpdir.strpath, clone_url=clone_url, target_branch='dev',
+            new_branch=True)
+
+        _check_proper_git_push(stdout, stderr, branch='dev')
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -25,11 +25,17 @@ import os
 import sys
 import pkgutil
 import platform
+import codecs
 
-from pip.download import PipSession
-from pip.req import parse_requirements
+try:  # for pip >= 10
+    from pip._internal.req import parse_requirements
+except ImportError:  # for pip <= 9.0.3
+    from pip.req import parse_requirements
 
-from codecs import open
+try:  # for pip >= 10
+    from pip._internal.download import PipSession
+except ImportError:  # for pip <= 9.0.3
+    from pip.download import PipSession
 
 
 if sys.version_info < (2, 7):
@@ -96,8 +102,8 @@ keywords = ' '.join([
 readme_file = 'README.rst'
 changelog_file = 'CHANGES.rst'
 try:
-    long_description = open(readme_file).read() + '\n\n' + \
-        open(changelog_file).read()
+    long_description = codecs.open(readme_file).read() + '\n\n' + \
+                       codecs.open(changelog_file).read()
 except IOError as err:
     sys.stderr.write(
         "[WARNING] Cannot find file specified as long_description (%s)\n "
@@ -113,7 +119,7 @@ setup(
     keywords=keywords,
     license=__license__,
     author=__author__,
-    author_email='marcin@rhodecode.com',
+    author_email='support@rhodecode.com',
     url=__url__,
     setup_requires=setup_requirements,
     install_requires=install_requirements,
@@ -176,8 +182,8 @@ setup(
             'rc-ssh-wrapper=rhodecode.apps.ssh_support.lib.ssh_wrapper:main',
         ],
         'beaker.backends': [
-            'memorylru_base=rhodecode.lib.memory_lru_debug:MemoryLRUNamespaceManagerBase',
-            'memorylru_debug=rhodecode.lib.memory_lru_debug:MemoryLRUNamespaceManagerDebug'
+            'memorylru_base=rhodecode.lib.memory_lru_dict:MemoryLRUNamespaceManagerBase',
+            'memorylru_debug=rhodecode.lib.memory_lru_dict:MemoryLRUNamespaceManagerDebug'
         ]
     },
 )
diff --git a/shell.nix b/shell.nix
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,9 @@
+# This file contains the adjustments which are desired for a development
+# environment.
+
 { pkgs ? (import <nixpkgs> {})
 , pythonPackages ? "python27Packages"
-, doCheck ? true
+, doCheck ? false
 , sourcesOverrides ? {}
 , doDevelopInstall ? true
 }:
@@ -10,7 +13,10 @@ let
   sources = (pkgs.config.rc.sources or {}) // sourcesOverrides;
 
   enterprise-ce = import ./default.nix {
-    inherit pkgs pythonPackages doCheck;
+    inherit
+      pkgs
+      pythonPackages
+      doCheck;
   };
 
   ce-pythonPackages = enterprise-ce.pythonPackages;
@@ -22,14 +28,17 @@ let
     let
       path = pkgs.lib.attrByPath [attributeName] null sources;
       doIt = doDevelopInstall && path != null;
+
     in
-      pkgs.lib.optionalString doIt (
-      builtins.trace "Develop install of ${attributeName} from ${path}" ''
-        echo "Develop install of '${attributeName}' from '${path}' [BEGIN]"
+      # do develop installation with empty hosts to skip any package duplicates to
+      # be replaced. This only pushes the package to be locally available
+      pkgs.lib.optionalString doIt (''
+        echo "[BEGIN] Develop install of '${attributeName}' from '${path}'"
         pushd ${path}
         python setup.py develop --prefix $tmp_path --allow-hosts ""
         popd
-        echo "Develop install of '${attributeName}' from '${path}' [DONE]"
+        echo "[DONE] Develop install of '${attributeName}' from '${path}'"
+        echo ""
       '');
 
   # This method looks up a path from `pkgs.config.rc.sources` and imports the
@@ -38,13 +47,16 @@ let
   optionalDevelopInstallBuildInputs = attributeName:
     let
       path = pkgs.lib.attrByPath [attributeName] null sources;
+      doIt = doDevelopInstall && path != null && pkgs.lib.pathExists "${nixFile}";
       nixFile = "${path}/default.nix";
-      doIt = doDevelopInstall && path != null && pkgs.lib.pathExists "${nixFile}";
+
       derivate = import "${nixFile}" {
         inherit doCheck pkgs pythonPackages;
       };
     in
-      pkgs.lib.lists.optionals doIt derivate.propagatedNativeBuildInputs;
+      pkgs.lib.lists.optionals doIt (
+        derivate.propagatedBuildInputs
+      );
 
   developInstalls = [ "rhodecode-vcsserver" ];
 
@@ -53,31 +65,52 @@ in enterprise-ce.override (attrs: {
   # make development a little bit more convenient.
   src = null;
 
+  # Add dependencies which are useful for the development environment.
   buildInputs =
     attrs.buildInputs ++
-    pkgs.lib.lists.concatMap optionalDevelopInstallBuildInputs developInstalls ++
     (with ce-pythonPackages; [
       bumpversion
       invoke
       ipdb
     ]);
 
-  # Somewhat snappier setup of the development environment
-  # TODO: think of supporting a stable path again, so that multiple shells
-  #       can share it.
-  preShellHook = enterprise-ce.linkNodeAndBowerPackages + ''
+  # place to inject some required libs from develop installs
+  propagatedBuildInputs =
+    attrs.propagatedBuildInputs ++
+    pkgs.lib.lists.concatMap optionalDevelopInstallBuildInputs developInstalls;
+
+
+  # Make sure we execute both hooks
+  shellHook = ''
+    runHook preShellHook
+    runHook postShellHook
+  '';
+
+  preShellHook = ''
+    echo "Entering CE-Shell"
+
     # Custom prompt to distinguish from other dev envs.
     export PS1="\n\[\033[1;32m\][CE-shell:\w]$\[\033[0m\] "
 
+    echo "Building frontend assets"
+    ${enterprise-ce.linkNodeAndBowerPackages}
+
     # Setup a temporary directory.
     tmp_path=$(mktemp -d)
     export PATH="$tmp_path/bin:$PATH"
     export PYTHONPATH="$tmp_path/${ce-pythonPackages.python.sitePackages}:$PYTHONPATH"
     mkdir -p $tmp_path/${ce-pythonPackages.python.sitePackages}
 
-    # Develop installations
+    # Develop installation
+    echo "[BEGIN]: develop install of rhodecode-enterprise-ce"
     python setup.py develop --prefix $tmp_path --allow-hosts ""
-    echo "Additional develop installs"
-  '' + pkgs.lib.strings.concatMapStrings optionalDevelopInstall developInstalls;
+  '';
+
+  postShellHook = ''
+    echo "** Additional develop installs **"
+    '' +
+    pkgs.lib.strings.concatMapStrings optionalDevelopInstall developInstalls
+    + ''
+  '';
 
 })