pre upstream merge
Merge branch 'master' of github.com:DandyDev/pelican-bootstrap3

Conflicts:
	templates/base.html
Merge remote-tracking branch 'upstream/master'
hardcoded url and tag link
changed categories and tags url, and added default value
changed categories and tags url, and added default value

Conflicts:
	templates/includes/sidebar.html
changed categories and tags url, and added default value

Conflicts:
	templates/includes/sidebar.html
Merge branch 'sidebarurl' of github.com:ingwinlu/pelican-bootstrap3 into sidebarurl

Conflicts:
	templates/includes/sidebar.html
added *_SAVE_AS = False case
Merge branch 'sidebarurl'

Conflicts:
	templates/includes/sidebar.html
Revert "changed categories and tags url, and added default value"

This reverts commit 813960fb080b33a457f22368169b3102256306a9.

Conflicts:
	templates/includes/sidebar.html
Merge branch 'sidebarurl'
added CATEGORIES_SAVES_AS and TAGS_SAVE_AS according to pelican development documentation
wrap content in panels
fixes
Merge branch 'master' into content_as_panels

Conflicts:
	static/css/style.css
redesign panel border
more remodeling
Merge branch 'new_pager_pull' into content_as_panels

Conflicts:
	templates/includes/pagination.html
Merge remote-tracking branch 'upstream/master'