Ignore some cruft
Little helper script for development purposes (serve locally)
Merge branch 'master' of github.com:bolt/bolt
Fixed a notice in extension/menu mechanism

As far as I can tell, assigning the result of Extensions::addMenuOption() to
an undefined property of the local extension isn't very useful anyway.
If anything should break, sue me.
Fix bug with sorting in the backend with contenttypes that have a 'grouping' (like "chapters")
Remove the default sorting for 'pages', because it messes with the "grouping" sorting.
Small cron fix
Tabs to spcaes
Add missing listeners for default cron events
Fixed the regex in hackislyParseRegexTemplates()
Flipping the switch for "base-2104" as the default theme.
Force timthumb to resize NOT_FOUND_IMAGE

Timthumb not resizes NOT_FOUND_IMAGE according to request parameters. This patch forces to do it. First it tries to serve it from cache, if it fails we serve the original NOT_FOUND_IMAGE image as fallback.
Fixed an error in TwigExtension::menu() when the menu loaded from the config file is empty
Refactoring
Add an "allowtwig" property to content types.

Sort-of-kind-of-workaround for #1158
Update _sub_editfields.twig

Make Google Maps use HTTPS so that it doesn't kill JavaScript when viewed via SSL.
HTTPS Disqus fix

See issue: #1159
Process route parameters

Use path function if route parameter provided in menu.yml.
Merge pull request #1162 from ntomka/menu_yml_patch

Process route parameters in menu.yml
Merge pull request #1161 from diggersworld/patch-2

HTTPS Disqus fix