post format support from twentytwelve theme
this fixes 320press/wordpress-bootstrap#93
Remove non-standard title generation
Changed page titles to include site name & page #

Include page number, also on homepage to include the description of the site.
Merge pull request #1 from DeanMarkTaylor/patch-2

Patch 2
Merge pull request #2 from afrerich/master

nav bug #93 fix
update options-framework to 1.5.2 - fix for WP 3.5
Bugfix for colorpicker and layout
Working with options-framework 1.5.2
added german language file
added german language file

added german language file

removed unneccessary js file
New menu walker supporting up to 3 steps
fixed typo
Merge pull request #4 from fnumatic/master

fix typo in german language files
fix for non-object error on css styling for tag cloud, if tag cloud is based on categories
debug message:
Notice: Trying to get property of non-object in [...]/wp-content/themes/wordpress-bootstrap/functions.php(271) : regexp code on line 1
Merge pull request #5 from fnumatic/master

fix for non-object error on css styling for category based tag cloud
Typo fixes
add support for custom favicons
add support for custom logo
Merge pull request #6 from kaymmm/favicons

add support for custom favicons and logo