Pre Pull on R61
Merge branch 'master' of https://github.com/hdemby/workspace

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.history/21/30c894937c72001412f9f8de86678413
	.metadata/.plugins/org.eclipse.core.resources/.history/26/5029737e6472001412f9f8de86678413
	.metadata/.plugins/org.eclipse.core.resources/.history/3/0062987bc77200141680938dac5bbcb8
	.metadata/.plugins/org.eclipse.core.resources/.history/32/50616c62167400141bb0eaaff16162b3
	.metadata/.plugins/org.eclipse.core.resources/.history/57/903a3a9b147400141bb0eaaff16162b3
	.metadata/.plugins/org.eclipse.core.resources/.history/75/60b5d034187300141094bc40e40239ad
	.metadata/.plugins/org.eclipse.core.resources/.history/99/20f8cda2d77200141680938dac5bbcb8
	.metadata/.plugins/org.eclipse.core.resources/.history/bb/2056791ec27100141650b5e3feb772b8
	.metadata/.plugins/org.eclipse.core.resources/.history/e7/b01f635d157400141bb0eaaff16162b3
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/ae/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/de/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/3158648900.index
	.metadata/.plugins/org.eclipse.jdt.core/3515282563.index
	.metadata/.plugins/org.eclipse.jdt.core/3946179868.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	ClassApp2/AndroidManifest.xml
	MeloBellies/bin/AndroidManifest.xml
	MeloBellies/bin/MeloBellies.apk
	MeloBellies/bin/R.txt
	MeloBellies/bin/classes.dex
	MeloBellies/bin/classes/android/support/v7/appcompat/R$bool.class
	MeloBellies/bin/classes/android/support/v7/appcompat/R$color.class
	MeloBellies/bin/classes/android/support/v7/appcompat/R$dimen.class
	MeloBellies/bin/classes/android/support/v7/appcompat/R$id.class
	MeloBellies/bin/classes/android/support/v7/appcompat/R$integer.class
	MeloBellies/bin/classes/com/coursera/melobellies/MainActivity.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$bool.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$color.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$dimen.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$id.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$integer.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$layout.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$menu.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$raw.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$string.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$style.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$styleable.class
	MeloBellies/bin/dexedLibs/android-support-v4-210be17ee8ac3c731c5e39a83f13854a.jar
	MeloBellies/bin/dexedLibs/android-support-v7-appcompat-18d0f5ff657014e751d2b3f9bd190ad9.jar
	MeloBellies/bin/dexedLibs/appcompat_v7-ae42838384561bf99555bbbf3a64cbc5.jar
	MeloBellies/bin/jarlist.cache
	MeloBellies/bin/resources.ap_
	MeloBellies/gen/android/support/v7/appcompat/R.java
	MeloBellies/gen/com/coursera/melobellies/R.java
	TestApp/bin/AndroidManifest.xml
	TestApp/bin/R.txt
	TestApp/bin/classes/android/support/v7/appcompat/R$bool.class
	TestApp/bin/classes/android/support/v7/appcompat/R$color.class
	TestApp/bin/classes/android/support/v7/appcompat/R$dimen.class
	TestApp/bin/classes/android/support/v7/appcompat/R$id.class
	TestApp/bin/classes/android/support/v7/appcompat/R$integer.class
	TestApp/bin/classes/com/coursera/testapp/MainActivity.class
	TestApp/bin/classes/com/coursera/testapp/R$bool.class
	TestApp/bin/classes/com/coursera/testapp/R$color.class
	TestApp/bin/classes/com/coursera/testapp/R$dimen.class
	TestApp/bin/classes/com/coursera/testapp/R$id.class
	TestApp/bin/classes/com/coursera/testapp/R$integer.class
	TestApp/bin/jarlist.cache
	TestApp/gen/android/support/v7/appcompat/R.java
	TestApp/gen/com/coursera/testapp/R.java
	android-support-v7-appcompat/bin/R.txt
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$bool.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$color.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$dimen.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$id.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$integer.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$styleable.class
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_ab_share_pack_holo_dark.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_ab_share_pack_holo_light.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_btn_switch_to_on_mtrl_00001.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_btn_switch_to_on_mtrl_00012.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_cab_background_top_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_focused_holo.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_longpressed_holo.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_pressed_holo_dark.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_pressed_holo_light.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_popup_background_mtrl_mult.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_spinner_mtrl_am_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_switch_track_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_tab_indicator_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_textfield_activated_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_textfield_default_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_textfield_search_activated_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_textfield_search_default_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-ldrtl-hdpi/abc_spinner_mtrl_am_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-ldrtl-mdpi/abc_spinner_mtrl_am_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-ldrtl-xhdpi/abc_spinner_mtrl_am_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-ldrtl-xxhdpi/abc_spinner_mtrl_am_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-ldrtl-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_ab_share_pack_holo_dark.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_ab_share_pack_holo_light.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_btn_switch_to_on_mtrl_00001.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_btn_switch_to_on_mtrl_00012.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_cab_background_top_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_focused_holo.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_longpressed_holo.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_pressed_holo_dark.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_pressed_holo_light.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_popup_background_mtrl_mult.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_spinner_mtrl_am_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_switch_track_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_tab_indicator_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_textfield_activated_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_textfield_default_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_textfield_search_activated_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_textfield_search_default_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_ab_share_pack_holo_dark.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_ab_share_pack_holo_light.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00001.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00012.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_cab_background_top_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_focused_holo.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_longpressed_holo.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_pressed_holo_dark.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_pressed_holo_light.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_popup_background_mtrl_mult.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_spinner_mtrl_am_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_switch_track_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_tab_indicator_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_textfield_activated_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_textfield_default_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_textfield_search_activated_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_textfield_search_default_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_ab_share_pack_holo_dark.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_ab_share_pack_holo_light.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_cab_background_top_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_focused_holo.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_longpressed_holo.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_pressed_holo_dark.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_pressed_holo_light.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_selector_disabled_holo_dark.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_selector_disabled_holo_light.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_popup_background_mtrl_mult.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_spinner_mtrl_am_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_switch_track_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_tab_indicator_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_textfield_activated_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_textfield_default_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_textfield_search_activated_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_textfield_search_default_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxxhdpi/abc_switch_track_mtrl_alpha.9.png
	android-support-v7-appcompat/bin/res/crunch/drawable-xxxhdpi/abc_tab_indicator_mtrl_alpha.9.png
	android-support-v7-appcompat/gen/android/support/v7/appcompat/R.java
	appcompat_v7/bin/R.txt
	appcompat_v7/bin/appcompat_v7.jar
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$bool.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$color.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$dimen.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$id.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$integer.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$styleable.class
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_ab_share_pack_holo_dark.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_ab_share_pack_holo_light.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_btn_switch_to_on_mtrl_00001.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_btn_switch_to_on_mtrl_00012.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_cab_background_top_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_focused_holo.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_longpressed_holo.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_pressed_holo_dark.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_pressed_holo_light.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_popup_background_mtrl_mult.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_spinner_mtrl_am_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_switch_track_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_tab_indicator_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_textfield_activated_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_textfield_default_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_textfield_search_activated_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_textfield_search_default_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-ldrtl-hdpi/abc_spinner_mtrl_am_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-ldrtl-mdpi/abc_spinner_mtrl_am_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-ldrtl-xhdpi/abc_spinner_mtrl_am_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-ldrtl-xxhdpi/abc_spinner_mtrl_am_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-ldrtl-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_ab_share_pack_holo_dark.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_ab_share_pack_holo_light.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_btn_switch_to_on_mtrl_00001.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_btn_switch_to_on_mtrl_00012.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_cab_background_top_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_focused_holo.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_longpressed_holo.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_pressed_holo_dark.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_pressed_holo_light.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_popup_background_mtrl_mult.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_spinner_mtrl_am_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_switch_track_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_tab_indicator_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_textfield_activated_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_textfield_default_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_textfield_search_activated_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_textfield_search_default_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_ab_share_pack_holo_dark.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_ab_share_pack_holo_light.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00001.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00012.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_cab_background_top_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_focused_holo.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_longpressed_holo.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_pressed_holo_dark.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_pressed_holo_light.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_popup_background_mtrl_mult.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_spinner_mtrl_am_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_switch_track_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_tab_indicator_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_textfield_activated_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_textfield_default_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_textfield_search_activated_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_textfield_search_default_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_ab_share_pack_holo_dark.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_ab_share_pack_holo_light.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_cab_background_top_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_focused_holo.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_longpressed_holo.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_pressed_holo_dark.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_pressed_holo_light.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_selector_disabled_holo_dark.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_selector_disabled_holo_light.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_popup_background_mtrl_mult.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_spinner_mtrl_am_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_switch_track_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_tab_indicator_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_textfield_activated_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_textfield_default_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_textfield_search_activated_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_textfield_search_default_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png
	appcompat_v7/bin/res/crunch/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png
	appcompat_v7/bin/res/crunch/drawable-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxxhdpi/abc_switch_track_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxxhdpi/abc_tab_indicator_mtrl_alpha.9.png
	appcompat_v7/gen/android/support/v7/appcompat/R.java
Merge branch 'master' of https://github.com/hdemby/workspace

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log

	.metadata/.plugins/org.eclipse.core.resources/.history/21/30c894937c72001412f9f8de86678413

	.metadata/.plugins/org.eclipse.core.resources/.history/26/5029737e6472001412f9f8de86678413

	.metadata/.plugins/org.eclipse.core.resources/.history/3/0062987bc77200141680938dac5bbcb8

	.metadata/.plugins/org.eclipse.core.resources/.history/32/50616c62167400141bb0eaaff16162b3

	.metadata/.plugins/org.eclipse.core.resources/.history/57/903a3a9b147400141bb0eaaff16162b3

	.metadata/.plugins/org.eclipse.core.resources/.history/75/60b5d034187300141094bc40e40239ad

	.metadata/.plugins/org.eclipse.core.resources/.history/99/20f8cda2d77200141680938dac5bbcb8

	.metadata/.plugins/org.eclipse.core.resources/.history/bb/2056791ec27100141650b5e3feb772b8

	.metadata/.plugins/org.eclipse.core.resources/.history/e7/b01f635d157400141bb0eaaff16162b3

	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/ae/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/d6/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/de/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.indexes/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.indexes/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.indexes/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/3158648900.index
	.metadata/.plugins/org.eclipse.jdt.core/3515282563.index
	.metadata/.plugins/org.eclipse.jdt.core/3946179868.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	ClassApp2/AndroidManifest.xml
	MeloBellies/bin/AndroidManifest.xml
	MeloBellies/bin/MeloBellies.apk
	MeloBellies/bin/R.txt
	MeloBellies/bin/classes.dex
	MeloBellies/bin/classes/android/support/v7/appcompat/R$bool.class
	MeloBellies/bin/classes/android/support/v7/appcompat/R$color.class
	MeloBellies/bin/classes/android/support/v7/appcompat/R$dimen.class
	MeloBellies/bin/classes/android/support/v7/appcompat/R$id.class
	MeloBellies/bin/classes/android/support/v7/appcompat/R$integer.class
	MeloBellies/bin/classes/com/coursera/melobellies/MainActivity.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$bool.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$color.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$dimen.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$id.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$integer.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$layout.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$menu.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$raw.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$string.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$style.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$styleable.class

	MeloBellies/bin/dexedLibs/android-support-v4-210be17ee8ac3c731c5e39a83f13854a.jar

	MeloBellies/bin/dexedLibs/android-support-v7-appcompat-18d0f5ff657014e751d2b3f9bd190ad9.jar

	MeloBellies/bin/dexedLibs/appcompat_v7-ae42838384561bf99555bbbf3a64cbc5.jar
	MeloBellies/bin/jarlist.cache
	MeloBellies/bin/resources.ap_
	MeloBellies/gen/android/support/v7/appcompat/R.java
	MeloBellies/gen/com/coursera/melobellies/R.java
	TestApp/bin/AndroidManifest.xml
	TestApp/bin/R.txt
	TestApp/bin/classes/android/support/v7/appcompat/R$bool.class
	TestApp/bin/classes/android/support/v7/appcompat/R$color.class
	TestApp/bin/classes/android/support/v7/appcompat/R$dimen.class
	TestApp/bin/classes/android/support/v7/appcompat/R$id.class
	TestApp/bin/classes/android/support/v7/appcompat/R$integer.class
	TestApp/bin/classes/com/coursera/testapp/MainActivity.class
	TestApp/bin/classes/com/coursera/testapp/R$bool.class
	TestApp/bin/classes/com/coursera/testapp/R$color.class
	TestApp/bin/classes/com/coursera/testapp/R$dimen.class
	TestApp/bin/classes/com/coursera/testapp/R$id.class
	TestApp/bin/classes/com/coursera/testapp/R$integer.class
	TestApp/bin/jarlist.cache
	TestApp/gen/android/support/v7/appcompat/R.java
	TestApp/gen/com/coursera/testapp/R.java
	android-support-v7-appcompat/bin/R.txt
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar

	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$bool.class

	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$color.class

	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$dimen.class

	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$id.class

	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$integer.class

	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$styleable.class

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_ab_share_pack_holo_dark.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_ab_share_pack_holo_light.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_btn_switch_to_on_mtrl_00001.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_btn_switch_to_on_mtrl_00012.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_cab_background_top_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_focused_holo.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_longpressed_holo.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_pressed_holo_dark.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_pressed_holo_light.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_popup_background_mtrl_mult.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_spinner_mtrl_am_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_switch_track_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_tab_indicator_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_textfield_activated_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_textfield_default_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_textfield_search_activated_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-hdpi/abc_textfield_search_default_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-ldrtl-hdpi/abc_spinner_mtrl_am_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-ldrtl-mdpi/abc_spinner_mtrl_am_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-ldrtl-xhdpi/abc_spinner_mtrl_am_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-ldrtl-xxhdpi/abc_spinner_mtrl_am_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-ldrtl-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_ab_share_pack_holo_dark.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_ab_share_pack_holo_light.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_btn_switch_to_on_mtrl_00001.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_btn_switch_to_on_mtrl_00012.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_cab_background_top_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_focused_holo.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_longpressed_holo.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_pressed_holo_dark.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_pressed_holo_light.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_popup_background_mtrl_mult.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_spinner_mtrl_am_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_switch_track_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_tab_indicator_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_textfield_activated_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_textfield_default_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_textfield_search_activated_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-mdpi/abc_textfield_search_default_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_ab_share_pack_holo_dark.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_ab_share_pack_holo_light.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00001.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00012.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_cab_background_top_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_focused_holo.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_longpressed_holo.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_pressed_holo_dark.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_pressed_holo_light.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_popup_background_mtrl_mult.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_spinner_mtrl_am_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_switch_track_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_tab_indicator_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_textfield_activated_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_textfield_default_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_textfield_search_activated_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xhdpi/abc_textfield_search_default_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_ab_share_pack_holo_dark.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_ab_share_pack_holo_light.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_cab_background_top_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_focused_holo.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_longpressed_holo.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_pressed_holo_dark.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_pressed_holo_light.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_selector_disabled_holo_dark.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_list_selector_disabled_holo_light.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_popup_background_mtrl_mult.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_spinner_mtrl_am_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_switch_track_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_tab_indicator_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_textfield_activated_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_textfield_default_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_textfield_search_activated_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxhdpi/abc_textfield_search_default_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxxhdpi/abc_switch_track_mtrl_alpha.9.png

	android-support-v7-appcompat/bin/res/crunch/drawable-xxxhdpi/abc_tab_indicator_mtrl_alpha.9.png
	android-support-v7-appcompat/gen/android/support/v7/appcompat/R.java
	appcompat_v7/bin/R.txt
	appcompat_v7/bin/appcompat_v7.jar
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$bool.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$color.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$dimen.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$id.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$integer.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$styleable.class

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_ab_share_pack_holo_dark.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_ab_share_pack_holo_light.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_btn_switch_to_on_mtrl_00001.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_btn_switch_to_on_mtrl_00012.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_cab_background_top_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_focused_holo.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_longpressed_holo.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_pressed_holo_dark.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_pressed_holo_light.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_popup_background_mtrl_mult.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_spinner_mtrl_am_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_switch_track_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_tab_indicator_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_textfield_activated_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_textfield_default_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_textfield_search_activated_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-hdpi/abc_textfield_search_default_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-ldrtl-hdpi/abc_spinner_mtrl_am_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-ldrtl-mdpi/abc_spinner_mtrl_am_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-ldrtl-xhdpi/abc_spinner_mtrl_am_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-ldrtl-xxhdpi/abc_spinner_mtrl_am_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-ldrtl-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_ab_share_pack_holo_dark.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_ab_share_pack_holo_light.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_btn_switch_to_on_mtrl_00001.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_btn_switch_to_on_mtrl_00012.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_cab_background_top_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_focused_holo.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_longpressed_holo.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_pressed_holo_dark.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_pressed_holo_light.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_popup_background_mtrl_mult.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_spinner_mtrl_am_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_switch_track_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_tab_indicator_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_textfield_activated_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_textfield_default_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_textfield_search_activated_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-mdpi/abc_textfield_search_default_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_ab_share_pack_holo_dark.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_ab_share_pack_holo_light.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00001.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00012.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_cab_background_top_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_focused_holo.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_longpressed_holo.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_pressed_holo_dark.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_pressed_holo_light.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_popup_background_mtrl_mult.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_spinner_mtrl_am_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_switch_track_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_tab_indicator_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_textfield_activated_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_textfield_default_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_textfield_search_activated_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xhdpi/abc_textfield_search_default_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_ab_share_pack_holo_dark.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_ab_share_pack_holo_light.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_cab_background_top_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png
	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_focused_holo.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_longpressed_holo.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_pressed_holo_dark.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_pressed_holo_light.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_selector_disabled_holo_dark.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_list_selector_disabled_holo_light.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_popup_background_mtrl_mult.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_spinner_mtrl_am_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_switch_track_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_tab_indicator_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_textfield_activated_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_textfield_default_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_textfield_search_activated_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xxhdpi/abc_textfield_search_default_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png

	appcompat_v7/bin/res/crunch/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png

	appcompat_v7/bin/res/crunch/drawable-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xxxhdpi/abc_switch_track_mtrl_alpha.9.png

	appcompat_v7/bin/res/crunch/drawable-xxxhdpi/abc_tab_indicator_mtrl_alpha.9.png
	appcompat_v7/gen/android/support/v7/appcompat/R.java
Merge branch 'master' of https://github.com/hdemby/workspace

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
Changed 'gitignore' to ignore '.metadata/' directory