update camembert installation
update httpd conf for camembert
update currently_reading submodule
update .gitignore
Merge branch 'master' of /home/bitnami/repos/claudinechionh

Conflicts:
	.gitignore
	drupal/includes/bootstrap.inc
	drupal/includes/common.inc
	drupal/includes/stream_wrappers.inc
	drupal/modules/aggregator/aggregator.info
	drupal/modules/aggregator/tests/aggregator_test.info
	drupal/modules/block/block.info
	drupal/modules/block/tests/block_test.info
	drupal/modules/block/tests/themes/block_test_theme/block_test_theme.info
	drupal/modules/blog/blog.info
	drupal/modules/book/book.info
	drupal/modules/color/color.info
	drupal/modules/comment/comment.info
	drupal/modules/contact/contact.info
	drupal/modules/contextual/contextual.info
	drupal/modules/dashboard/dashboard.info
	drupal/modules/dblog/dblog.info
	drupal/modules/field/field.info
	drupal/modules/field/modules/field_sql_storage/field_sql_storage.info
	drupal/modules/field/modules/list/list.info
	drupal/modules/field/modules/list/tests/list_test.info
	drupal/modules/field/modules/number/number.info
	drupal/modules/field/modules/options/options.info
	drupal/modules/field/modules/text/text.info
	drupal/modules/field/tests/field_test.info
	drupal/modules/field_ui/field_ui.info
	drupal/modules/file/file.info
	drupal/modules/file/tests/file_module_test.info
	drupal/modules/filter/filter.info
	drupal/modules/forum/forum.info
	drupal/modules/help/help.info
	drupal/modules/image/image.info
	drupal/modules/image/image.module
	drupal/modules/image/tests/image_module_test.info
	drupal/modules/locale/locale.info
	drupal/modules/locale/tests/locale_test.info
	drupal/modules/menu/menu.info
	drupal/modules/node/node.info
	drupal/modules/node/tests/node_access_test.info
	drupal/modules/node/tests/node_test.info
	drupal/modules/node/tests/node_test_exception.info
	drupal/modules/openid/openid.info
	drupal/modules/openid/tests/openid_test.info
	drupal/modules/overlay/overlay.info
	drupal/modules/path/path.info
	drupal/modules/php/php.info
	drupal/modules/poll/poll.info
	drupal/modules/profile/profile.info
	drupal/modules/rdf/rdf.info
	drupal/modules/rdf/tests/rdf_test.info
	drupal/modules/search/search.info
	drupal/modules/search/tests/search_embedded_form.info
	drupal/modules/search/tests/search_extra_type.info
	drupal/modules/shortcut/shortcut.info
	drupal/modules/simpletest/simpletest.info
	drupal/modules/simpletest/tests/actions_loop_test.info
	drupal/modules/simpletest/tests/ajax_forms_test.info
	drupal/modules/simpletest/tests/ajax_test.info
	drupal/modules/simpletest/tests/batch_test.info
	drupal/modules/simpletest/tests/common_test.info
	drupal/modules/simpletest/tests/common_test_cron_helper.info
	drupal/modules/simpletest/tests/database_test.info
	drupal/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
	drupal/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
	drupal/modules/simpletest/tests/entity_cache_test.info
	drupal/modules/simpletest/tests/entity_cache_test_dependency.info
	drupal/modules/simpletest/tests/entity_crud_hook_test.info
	drupal/modules/simpletest/tests/entity_query_access_test.info
	drupal/modules/simpletest/tests/error_test.info
	drupal/modules/simpletest/tests/file_test.info
	drupal/modules/simpletest/tests/filter_test.info
	drupal/modules/simpletest/tests/form_test.info
	drupal/modules/simpletest/tests/image_test.info
	drupal/modules/simpletest/tests/menu_test.info
	drupal/modules/simpletest/tests/module_test.info
	drupal/modules/simpletest/tests/path_test.info
	drupal/modules/simpletest/tests/psr_0_test/psr_0_test.info
	drupal/modules/simpletest/tests/requirements1_test.info
	drupal/modules/simpletest/tests/requirements2_test.info
	drupal/modules/simpletest/tests/session_test.info
	drupal/modules/simpletest/tests/system_dependencies_test.info
	drupal/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
	drupal/modules/simpletest/tests/system_incompatible_core_version_test.info
	drupal/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
	drupal/modules/simpletest/tests/system_incompatible_module_version_test.info
	drupal/modules/simpletest/tests/system_test.info
	drupal/modules/simpletest/tests/taxonomy_test.info
	drupal/modules/simpletest/tests/theme_test.info
	drupal/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
	drupal/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
	drupal/modules/simpletest/tests/themes/test_theme/test_theme.info
	drupal/modules/simpletest/tests/update_script_test.info
	drupal/modules/simpletest/tests/update_test_1.info
	drupal/modules/simpletest/tests/update_test_2.info
	drupal/modules/simpletest/tests/update_test_3.info
	drupal/modules/simpletest/tests/url_alter_test.info
	drupal/modules/simpletest/tests/xmlrpc_test.info
	drupal/modules/statistics/statistics.info
	drupal/modules/syslog/syslog.info
	drupal/modules/system/system.api.php
	drupal/modules/system/system.info
	drupal/modules/taxonomy/taxonomy.info
	drupal/modules/toolbar/toolbar.info
	drupal/modules/tracker/tracker.info
	drupal/modules/translation/tests/translation_test.info
	drupal/modules/translation/translation.info
	drupal/modules/trigger/tests/trigger_test.info
	drupal/modules/trigger/trigger.info
	drupal/modules/update/tests/aaa_update_test.info
	drupal/modules/update/tests/bbb_update_test.info
	drupal/modules/update/tests/ccc_update_test.info
	drupal/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info
	drupal/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info
	drupal/modules/update/tests/update_test.info
	drupal/modules/update/update.compare.inc
	drupal/modules/update/update.info
	drupal/modules/update/update.module
	drupal/modules/user/tests/user_form_test.info
	drupal/modules/user/user.info
	drupal/profiles/minimal/minimal.info
	drupal/profiles/standard/standard.info
	drupal/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
	drupal/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
	drupal/profiles/testing/testing.info
	drupal/sites/all/modules/features/ofc_contact/ofc_contact.context.inc
	drupal/sites/default/default.settings.php
	drupal/themes/bartik/bartik.info
	drupal/themes/garland/garland.info
	drupal/themes/seven/seven.info
	drupal/themes/stark/stark.info
Merge branch 'master' of camembert:/home/bitnami/repos/claudinechionh

Conflicts:
	drupal/sites/default/default.settings.php
messy
Fix conflicts