merging markusH's commit 0e34116: logo in documentation

Conflicts:
	doc/html/_app_8h_source.html
	doc/html/_button_8h_source.html
	doc/html/_circle_state_8h_source.html
	doc/html/_config_8h_source.html
	doc/html/_credit_state_8h_source.html
	doc/html/_input_manager_8h_source.html
	doc/html/_main_menu_state_8h_source.html
	doc/html/_menu_8h_source.html
	doc/html/_option_state_8h_source.html
	doc/html/_play_state_8h_source.html
	doc/html/_rect_state_8h_source.html
	doc/html/_resource_manager_8h_source.html
	doc/html/_stack_8h_source.html
	doc/html/_startup_state_8h_source.html
	doc/html/_state_8h_source.html
	doc/html/_state_manager_8h_source.html
	doc/html/_tilemap_8h_source.html
	doc/html/_tilemap_object_8h_source.html
	doc/html/annotated.html
	doc/html/class_app-members.html
	doc/html/class_app.html
	doc/html/class_button-members.html
	doc/html/class_button.html
	doc/html/class_circle_state-members.html
	doc/html/class_circle_state.html
	doc/html/class_config-members.html
	doc/html/class_config.html
	doc/html/class_credit_state-members.html
	doc/html/class_credit_state.html
	doc/html/class_input_manager-members.html
	doc/html/class_input_manager.html
	doc/html/class_main_menu_state-members.html
	doc/html/class_main_menu_state.html
	doc/html/class_menu-members.html
	doc/html/class_menu.html
	doc/html/class_option_state-members.html
	doc/html/class_option_state.html
	doc/html/class_play_state-members.html
	doc/html/class_play_state.html
	doc/html/class_rect_state-members.html
	doc/html/class_rect_state.html
	doc/html/class_resource_manager-members.html
	doc/html/class_resource_manager.html
	doc/html/class_stack-members.html
	doc/html/class_stack.html
	doc/html/class_startup_state-members.html
	doc/html/class_startup_state.html
	doc/html/class_state-members.html
	doc/html/class_state.html
	doc/html/class_state_manager-members.html
	doc/html/class_state_manager.html
	doc/html/class_tilemap-members.html
	doc/html/class_tilemap.html
	doc/html/classes.html
	doc/html/dir_0773a9c9045db70512aec2b18d0cd07f.html
	doc/html/dir_4ba45c99503bef42cc26f327d82ab65e.html
	doc/html/files.html
	doc/html/functions.html
	doc/html/functions_func.html
	doc/html/graph_legend.html
	doc/html/hierarchy.html
	doc/html/index.html
	doc/html/inherits.html
	doc/html/math_8h_source.html
	doc/html/sf_helper_8h_source.html
	doc/html/string__op_8h_source.html
	doc/html/struct_tilemap_object-members.html
	doc/html/struct_tilemap_object.html