Correctie van autocomplete
Correctie van autocomplete
Merge branch 'master' of http://github.com/koenco/bibliothouris

Conflicts:
	.gitignore
	sites/all/modules/bibliothouris_book/bibliotouris_book.module
	sites/all/themes/README.txt
	sites/all/themes/contrib/omega/CHANGELOG.txt
	sites/all/themes/contrib/omega/LICENSE.txt
	sites/all/themes/contrib/omega/README.txt
	sites/all/themes/contrib/omega/UPGRADE.txt
	sites/all/themes/contrib/omega/alpha/alpha.info
	sites/all/themes/contrib/omega/alpha/css/alpha-alpha.css
	sites/all/themes/contrib/omega/alpha/css/alpha-debug.css
	sites/all/themes/contrib/omega/alpha/css/alpha-mobile.css
	sites/all/themes/contrib/omega/alpha/css/alpha-reset.css
	sites/all/themes/contrib/omega/alpha/css/alpha-theme-settings.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12.png
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16.png
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24.png
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/normal/alpha-default-normal-12-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/normal/alpha-default-normal-12.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/normal/alpha-default-normal-12.png
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/normal/alpha-default-normal-16-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/normal/alpha-default-normal-16.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/normal/alpha-default-normal-16.png
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/normal/alpha-default-normal-24-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/normal/alpha-default-normal-24.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/normal/alpha-default-normal-24.png
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/wide/alpha-default-wide-12-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/wide/alpha-default-wide-12.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/wide/alpha-default-wide-12.png
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/wide/alpha-default-wide-16-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/wide/alpha-default-wide-16.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/wide/alpha-default-wide-16.png
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/wide/alpha-default-wide-24-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/wide/alpha-default-wide-24.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_default/wide/alpha-default-wide-24.png
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24-rtl.css
	sites/all/themes/contrib/omega/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24.css
	sites/all/themes/contrib/omega/alpha/images/block-toggle.png
	sites/all/themes/contrib/omega/alpha/images/grid-toggle.png
	sites/all/themes/contrib/omega/alpha/images/resize-handle.png
	sites/all/themes/contrib/omega/alpha/js/alpha-debug.js
	sites/all/themes/contrib/omega/alpha/screenshot.png
	sites/all/themes/contrib/omega/alpha/template.php
	sites/all/themes/contrib/omega/alpha/templates/block.tpl.php
	sites/all/themes/contrib/omega/alpha/templates/html.tpl.php
	sites/all/themes/contrib/omega/alpha/templates/page.tpl.php
	sites/all/themes/contrib/omega/alpha/templates/region.tpl.php
	sites/all/themes/contrib/omega/alpha/templates/section.tpl.php
	sites/all/themes/contrib/omega/alpha/templates/zone.tpl.php
	sites/all/themes/contrib/omega/alpha/theme-settings.php
	sites/all/themes/contrib/omega/omega/css/formalize.css
	sites/all/themes/contrib/omega/omega/css/omega-branding.css
	sites/all/themes/contrib/omega/omega/css/omega-forms.css
	sites/all/themes/contrib/omega/omega/css/omega-menu.css
	sites/all/themes/contrib/omega/omega/css/omega-text.css
	sites/all/themes/contrib/omega/omega/css/omega-visuals.css
	sites/all/themes/contrib/omega/omega/images/button.png
	sites/all/themes/contrib/omega/omega/images/select-arrow.gif
	sites/all/themes/contrib/omega/omega/js/jquery.formalize.js
	sites/all/themes/contrib/omega/omega/js/omega-equalheights.js
	sites/all/themes/contrib/omega/omega/js/omega-mediaqueries.js
	sites/all/themes/contrib/omega/omega/logo.png
	sites/all/themes/contrib/omega/omega/omega.info
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_onecol/omega-12-onecol.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega-12-threecol-4-4-4.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega-12-threecol-4-4-4-stacked.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega-12-twocol-3-9.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega-12-twocol-6-6.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega-12-twocol-6-6-bricks.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega-12-twocol-6-6-stacked.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_8_4_stacked.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega-12-twocol-9-3.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_10_2.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_12/omega_panels_admin_12.css
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_onecol/omega-16-onecol.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega-16-threecol-5-6-5.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega-16-threecol-5-6-5-stacked.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega-16-twocol-12-4.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega-16-twocol-4-12.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega-16-twocol-8-8.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega-16-twocol-8-8-bricks.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega-16-twocol-8-8-stacked.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_16/omega_panels_admin_16.css
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_onecol/omega-24-onecol.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega-24-threecol-8-8-8.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega-24-threecol-8-8-8-stacked.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega-24-twocol-12-12.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega-24-twocol-12-12-bricks.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega-24-twocol-12-12-stacked.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega-24-twocol-18-6.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega-24-twocol-6-18.tpl.php
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.inc
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.png
	sites/all/themes/contrib/omega/omega/panels/layouts/omega_24/omega_panels_admin_24.css
	sites/all/themes/contrib/omega/omega/screenshot.png
	sites/all/themes/contrib/omega/omega/template.php
	sites/all/themes/contrib/omega/omega/templates/block.tpl.php
	sites/all/themes/contrib/omega/omega/templates/comment.tpl.php
	sites/all/themes/contrib/omega/omega/templates/html.tpl.php
	sites/all/themes/contrib/omega/omega/templates/node.tpl.php
	sites/all/themes/contrib/omega/omega/templates/region--branding.tpl.php
	sites/all/themes/contrib/omega/omega/templates/region--content.tpl.php
	sites/all/themes/contrib/omega/omega/templates/region--menu.tpl.php
	sites/all/themes/contrib/omega/omega/templates/region--sidebar_first.tpl.php
	sites/all/themes/contrib/omega/omega/templates/region--sidebar_second.tpl.php
	sites/all/themes/contrib/omega/omega/templates/region.tpl.php
	sites/all/themes/contrib/omega/omega/templates/section--footer.tpl.php
	sites/all/themes/contrib/omega/omega/templates/section--header.tpl.php
	sites/all/themes/contrib/omega/omega/templates/section.tpl.php
	sites/all/themes/contrib/omega/omega/templates/zone--content.tpl.php
	sites/all/themes/contrib/omega/omega/theme-settings.php
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/css/README.txt
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-narrow.css
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-normal.css
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-wide.css
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default.css
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/css/global.css
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/logo.png
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/preprocess/README.txt
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/process/README.txt
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/screenshot.png
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/starterkit_alpha_xhtml.info
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/template.php
	sites/all/themes/contrib/omega/starterkits/alpha-xhtml/templates/README.txt
	sites/all/themes/contrib/omega/starterkits/omega-html5/css/README.txt
	sites/all/themes/contrib/omega/starterkits/omega-html5/css/YOURTHEME-alpha-default-narrow.css
	sites/all/themes/contrib/omega/starterkits/omega-html5/css/YOURTHEME-alpha-default-normal.css
	sites/all/themes/contrib/omega/starterkits/omega-html5/css/YOURTHEME-alpha-default-wide.css
	sites/all/themes/contrib/omega/starterkits/omega-html5/css/YOURTHEME-alpha-default.css
	sites/all/themes/contrib/omega/starterkits/omega-html5/css/global.css
	sites/all/themes/contrib/omega/starterkits/omega-html5/logo.png
	sites/all/themes/contrib/omega/starterkits/omega-html5/preprocess/README.txt
	sites/all/themes/contrib/omega/starterkits/omega-html5/process/README.txt
	sites/all/themes/contrib/omega/starterkits/omega-html5/screenshot.png
	sites/all/themes/contrib/omega/starterkits/omega-html5/starterkit_omega_html5.info
	sites/all/themes/contrib/omega/starterkits/omega-html5/template.php
	sites/all/themes/contrib/omega/starterkits/omega-html5/templates/README.txt
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/css/README.txt
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-narrow.css
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-normal.css
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-wide.css
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/css/YOURTHEME-alpha-default.css
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/css/global.css
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/logo.png
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/preprocess/README.txt
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/process/README.txt
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/screenshot.png
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/starterkit_omega_xhtml.info
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/template.php
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/templates/README.txt
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/templates/block.tpl.php
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/templates/comment.tpl.php
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/templates/html.tpl.php
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/templates/node.tpl.php
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/templates/region--branding.tpl.php
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/templates/region--menu.tpl.php
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/templates/region--sidebar_first.tpl.php
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/templates/region--sidebar_second.tpl.php
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/templates/section--footer.tpl.php
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/templates/section--header.tpl.php
	sites/all/themes/contrib/omega/starterkits/omega-xhtml/templates/section.tpl.php
Merge branch 'master' of http://github.com/koenco/bibliothouris

Conflicts:
	sites/all/modules/bibliothouris_book/bibliotouris_book.module
	sites/all/modules/bibliothouris_book/bibliotouris_book.module~
Merge branch 'master' of http://github.com/koenco/bibliothouris

Conflicts:
	sites/all/modules/bibliothouris_book/bibliotouris_book.module
	sites/all/modules/bibliothouris_book/bibliotouris_book.module.orig
	sites/all/modules/bibliothouris_book/bibliotouris_book.module~.orig
Deleted orig files
Resolved conflicts
Merge branch 'master' of http://github.com/koenco/bibliothouris