Refactoring repository
Merge remote-tracking branch 'origin/master'

Conflicts:
	Android/AndroidManifest.xml
	Android/grid/0001.xml
	Android/grid/0002.xml
	Android/grid/0003.xml
	Android/grid/0004.xml
	Android/grid/0005.xml
	Android/grid/0006.xml
	Android/grid/0007.xml
	Android/grid/0008.xml
	Android/grid/0009.xml
	Android/grid/0010.xml
	Android/grid/0011.xml
	Android/grid/0012.xml
	Android/grid/0013.xml
	Android/grid/gator_52.xml
	Android/grid/historique_0001.xml
	Android/grid/historique_0002.xml
	Android/grid/historique_0003.xml
	Android/grid/index.php
	Android/grid/scalion_12.xml
	Android/grid/slam_0001.xml
	Android/grid/slam_0002.xml
	Android/grid/slam_0003.xml
	Android/grid/slam_0004.xml
	Android/grid/slam_0005.xml
	Android/grid/slam_0006.xml
	Android/grid/slam_0007.xml
	Android/grid/todo/mots-croises01.pdf
	Android/grid/todo/mots-croises02.pdf
	Android/grid/todo/mots-croises03.pdf
	Android/grid/todo/mots-croises04.pdf
	Android/grid/todo/mots-croises05.pdf
	Android/grid/todo/mots-croises06.pdf
	Android/grid/todo/mots-croises07.pdf
	Android/grid/todo/mots-croises08.pdf
	Android/grid/todo/mots-croises09.pdf
	Android/grid/todo/mots-croises10.pdf
	Android/grid/todo/mots-croises11.pdf
	Android/grid/todo/mots-croises12.pdf
	Android/grid/todo/mots-croises13.pdf
	Android/grid/todo/mots-croises14.pdf
	Android/grid/todo/mots-croises15.pdf
	Android/grid/todo/mots-croises16.pdf
	Android/grid/todo/mots-croises17.pdf
	Android/grid/todo/mots-croises18.pdf
	Android/grid/todo/mots-croises19.pdf
	Android/grid/todo/mots-croises20.pdf
	Android/lint.xml
	Android/proguard.cfg
	Android/project.properties
	Android/res/anim/keyboard_overlay_fade_in.xml
	Android/res/anim/keyboard_overlay_fade_out.xml
	Android/res/drawable-hdpi/btn_keyboard_delete_pressed.9.png
	Android/res/drawable-hdpi/btn_keyboard_delete_release.9.png
	Android/res/drawable-hdpi/btn_keyboard_draft_pressed_lock.9.png
	Android/res/drawable-hdpi/btn_keyboard_draft_pressed_unlock.9.png
	Android/res/drawable-hdpi/btn_keyboard_draft_release_lock.9.png
	Android/res/drawable-hdpi/btn_keyboard_draft_release_unlock.9.png
	Android/res/drawable-hdpi/btn_keyboard_pressed.9.png
	Android/res/drawable-hdpi/btn_keyboard_release.9.png
	Android/res/drawable-hdpi/ic_menu_check.png
	Android/res/drawable-hdpi/ic_menu_check_enable.png
	Android/res/drawable-hdpi/ic_menu_grid.png
	Android/res/drawable-hdpi/ic_menu_notifications.png
	Android/res/drawable-hdpi/ic_menu_preferences.png
	Android/res/drawable-hdpi/ic_menu_refresh.png
	Android/res/drawable-hdpi/ic_menu_solve.png
	Android/res/drawable-hdpi/ic_menu_solve_enable.png
	Android/res/drawable-hdpi/icon_category.png
	Android/res/drawable-hdpi/icon_crossword.png
	Android/res/drawable-hdpi/icon_horizontal.png
	Android/res/drawable-hdpi/icon_level_1.png
	Android/res/drawable-hdpi/icon_level_2.png
	Android/res/drawable-hdpi/icon_level_3.png
	Android/res/drawable-hdpi/icon_list.png
	Android/res/drawable-hdpi/icon_random.png
	Android/res/drawable-hdpi/icon_search.png
	Android/res/drawable-hdpi/icon_vertical.png
	Android/res/drawable-hdpi/keyboard_delete.png
	Android/res/drawable-hdpi/keyboard_done.png
	Android/res/drawable-hdpi/keyboard_draft.png
	Android/res/drawable-hdpi/keyboard_overlay.9.png
	Android/res/drawable-hdpi/keyboard_return.png
	Android/res/drawable-hdpi/keyboard_shift.png
	Android/res/drawable-hdpi/keyboard_space.png
	Android/res/drawable-hdpi/progress_0.png
	Android/res/drawable-hdpi/progress_1.png
	Android/res/drawable-hdpi/progress_2.png
	Android/res/drawable-hdpi/progress_3.png
	Android/res/drawable-hdpi/progress_4.png
	Android/res/drawable-hdpi/progress_5.png
	Android/res/drawable-hdpi/progress_6.png
	Android/res/drawable-xlarge-mdpi/ic_launcher.png
	Android/res/drawable-xlarge-mdpi/icon_category.png
	Android/res/drawable-xlarge-mdpi/icon_crossword.png
	Android/res/drawable-xlarge-mdpi/icon_level_1.png
	Android/res/drawable-xlarge-mdpi/icon_level_2.png
	Android/res/drawable-xlarge-mdpi/icon_level_3.png
	Android/res/drawable-xlarge-mdpi/icon_list.png
	Android/res/drawable-xlarge-mdpi/icon_search.png
	Android/res/drawable-xlarge-mdpi/keyboard_delete.png
	Android/res/drawable-xlarge-mdpi/keyboard_draft.png
	Android/res/drawable-xlarge-mdpi/progress_0.png
	Android/res/drawable-xlarge-mdpi/progress_1.png
	Android/res/drawable-xlarge-mdpi/progress_2.png
	Android/res/drawable-xlarge-mdpi/progress_3.png
	Android/res/drawable-xlarge-mdpi/progress_4.png
	Android/res/drawable-xlarge-mdpi/progress_5.png
	Android/res/drawable-xlarge-mdpi/progress_6.png
	Android/res/drawable-xlarge-mdpi/sym_keyboard_delete.png
	Android/res/drawable/area_block.9.png
	Android/res/drawable/area_current.9.png
	Android/res/drawable/area_empty.9.png
	Android/res/drawable/area_selected.9.png
	Android/res/drawable/background.jpg
	Android/res/drawable/icon.png
	Android/res/drawable/keyboard_normal.xml
	Android/res/drawable/percent_progress.xml
	Android/res/layout-xlarge/game.xml
	Android/res/layout-xlarge/gridlist_item.xml
	Android/res/layout-xlarge/gridlist_separator.xml
	Android/res/layout-xlarge/keyboard.xml
	Android/res/layout-xlarge/main.xml
	Android/res/layout/category.xml
	Android/res/layout/feedback.xml
	Android/res/layout/game.xml
	Android/res/layout/grid.xml
	Android/res/layout/gridlist.xml
	Android/res/layout/gridlist_item.xml
	Android/res/layout/gridlist_separator.xml
	Android/res/layout/keyboard.xml
	Android/res/layout/main.xml
	Android/res/menu/crossword.xml
	Android/res/menu/gridlist.xml
	Android/res/menu/main.xml
	Android/res/values/colors.xml
	Android/res/values/strings.xml
	Android/res/values/styles.xml
	Android/res/xml/preferences.xml
	Android/src/com/crossword/Crossword.java
	Android/src/com/crossword/CrosswordException.java
	Android/src/com/crossword/DownloadFilesInterface.java
	Android/src/com/crossword/DownloadFilesTask.java
	Android/src/com/crossword/DownloadManager.java
	Android/src/com/crossword/SAXFileHandler.java
	Android/src/com/crossword/activity/CategoryActivity.java
	Android/src/com/crossword/activity/CrosswordParentActivity.java
	Android/src/com/crossword/activity/FeedbackActivity.java
	Android/src/com/crossword/activity/GameActivity.java
	Android/src/com/crossword/activity/GridActivity.java
	Android/src/com/crossword/activity/GridListActivity.java
	Android/src/com/crossword/activity/MainActivity.java
	Android/src/com/crossword/activity/PeferencesActivity.java
	Android/src/com/crossword/adapter/GameGridAdapter.java
	Android/src/com/crossword/adapter/GridListAdapter.java
	Android/src/com/crossword/data/Grid.java
	Android/src/com/crossword/data/Word.java
	Android/src/com/crossword/keyboard/KeyboardView.java
	Android/src/com/crossword/keyboard/KeyboardViewInterface.java
	Android/src/com/crossword/parser/CrosswordParser.java
	Android/src/com/crossword/parser/GridListParser.java
	Android/src/com/crossword/parser/GridParser.java